45fc8713bd
Make distutils error messages more helpful ( #11599 ).
...
When running external programs such as a C compiler and getting an
error code, distutils only prints the program name. With this change,
one can get the full command line by setting the DISTUTILS_DEBUG
environment variable.
This should have no compatibility issues, unless there are tools
that depend on the exact format of distutils debug messages.
2014-03-13 04:55:35 -04:00
f1e8c70cf0
Merge 3.3 ( #11599 )
2014-03-13 05:59:31 -04:00
a0fe1f74f9
Merge 3.3 ( #4931 )
2014-03-12 04:10:51 -04:00
fc773a2d4b
Avoid “error: None” messages from distutils ( #4931 ).
...
Thanks to Amaury Forgeot d’Arc and Philip J. Eby.
2014-03-12 03:34:02 -04:00
fbd7518a41
Bump to 3.3.5 final.
2014-03-09 09:37:14 +01:00
d5c59763ad
Version bump for 3.4.0rc3.
2014-03-09 04:13:05 -07:00
c186b23799
Bump to 3.3.5rc2.
2014-03-02 09:19:03 +01:00
e12675a0f2
Bump to 3.3.5rc1.
2014-02-23 08:30:06 +01:00
e9f73ac1fd
Python 3.4.0rc1: Version bump.
2014-02-10 14:45:05 -08:00
8f9c20b8ff
merge with 3.3.4 releasing repo
2014-02-10 22:04:20 +01:00
f34177a6f9
Version bump for Python 3.4.0rc2.
2014-02-23 02:18:24 -06:00
a26b3f183d
Issue #20363 . Fixed BytesWarning triggerred by test suite.
...
Patch by Berker Peksag.
2014-02-06 22:52:23 +02:00
bc27a050a7
Issue #20363 . Fixed BytesWarning triggerred by test suite.
...
Patch by Berker Peksag.
2014-02-06 22:49:45 +02:00
c81402527a
Bump to 3.3.4 final
2014-02-09 08:43:05 +01:00
748f40d162
Issue #9709 : Revert 97fb852c5c26. Many extensions are not using PyMODINIT_FUNC.
2014-01-28 15:04:40 +01:00
2d8e1e4f07
Version bump for 3.4.0b3.
2014-01-26 00:48:23 -08:00
18f2ce9e7d
Bump to 3.3.4rc1.
2014-01-25 09:19:50 +01:00
a6c55232ab
Bump version number for 3.4.0b2.
2014-01-05 04:40:25 -08:00
bfd488c51f
Issue #19544 , #6516 : check ZLIB_SUPPORT, not zlib (which might not be bound)
2013-12-30 15:09:20 -06:00
2ee2c95595
Issue #19544 , #6516 : check ZLIB_SUPPORT, not zlib (which might not be bound)
2013-12-30 14:39:46 -06:00
5bf8c3477d
Fix bootstrap issue by importing the cgi module lazily
2013-12-22 19:41:31 +01:00
e62a40401d
Fix bootstrap issue by importing the cgi module lazily
2013-12-22 19:37:17 +01:00
20d5adea6a
Fix TypeError on "setup.py upload --show-response".
2013-12-22 18:14:56 +01:00
335a5128e5
Fix TypeError on "setup.py upload --show-response".
2013-12-22 18:13:51 +01:00
e8d07a9885
Issue #12226 : HTTPS is now used by default when connecting to PyPI.
2013-12-22 01:45:42 +01:00
f60b7df9f8
Issue #12226 : HTTPS is now used by default when connecting to PyPI.
2013-12-22 01:35:53 +01:00
23b8cd963d
Fix urllib.request.build_opener mocking in test_distutils (should fix some random buildbot failures)
2013-12-22 00:44:28 +01:00
6783487757
Fix urllib.request.build_opener mocking in test_distutils (should fix some random buildbot failures)
2013-12-22 00:44:01 +01:00
29fd05f900
Issue #20045 : Fix "setup.py register --list-classifiers".
2013-12-21 22:59:06 +01:00
716b7222e9
Issue #20045 : Fix "setup.py register --list-classifiers".
2013-12-21 22:57:56 +01:00
492b9893e1
Fix DeprecationWarnings in test suite
2013-12-21 22:19:46 +01:00
3f5f436680
Issue #19492 : Silently skipped distutils tests now reported as skipped.
2013-12-18 16:45:24 +02:00
3c02ecefba
Issue #19492 : Silently skipped distutils tests now reported as skipped.
2013-12-18 16:41:01 +02:00
5aa08ca375
Issue #9709 : Stop adding PyInit_" + module_name' to export_symbols. This is
...
already done by PyMODINIT_FUNC.
2013-12-03 13:55:20 +01:00
eaec3597dd
Issue #19760 : Silence sysconfig's 'SO' key deprecation warnings in tests.
...
Change stacklevel in warnings.warn() for 'SO' key to 2.
2013-11-26 17:08:24 +02:00
7e611dab4a
Bump version number to 3.4.0b1.
2013-11-24 06:59:35 -08:00
9121f8d94b
Issue 19555 for distutils, plus a little clean up (pyflakes, line lengths).
2013-11-22 15:31:35 -05:00
497b3943a3
merge with 3.3.3 release clone
2013-11-17 09:17:18 +01:00
9e2043a561
Bump to 3.3.3 final.
2013-11-17 07:58:22 +01:00
932c6160b5
Issue #19600 : Use specific asserts in distutils tests.
2013-11-17 00:20:12 +02:00
39989157ad
Issue #19600 : Use specific asserts in distutils tests.
2013-11-17 00:17:46 +02:00
b41c2547e0
Correct long line
2013-11-16 10:47:17 -05:00
9d78e416f5
Issue #19586 : Update remaining deprecated assertions to their preferred usage.
2013-11-16 10:35:46 -05:00
6f87a08aa7
Update more usage of assertEqual
2013-11-15 19:41:57 -05:00
e9f0311a0f
Use preferred assertEqual
2013-11-15 19:38:51 -05:00
75c40aed55
Use preferred assertEqual form. Correct indentation.
2013-11-15 19:35:05 -05:00
cb37641bb4
Issue #7408 : Forward port limited test from Python 2.7, fixing failing buildbot tests on BSD-based platforms.
2013-11-15 19:24:07 -05:00
4cf9b2047d
Bump to 3.3.3rc2.
2013-11-11 06:13:54 +01:00
a2ebfd0256
Issue #19544 and Issue #6286 : Restore use of urllib over http allowing use of http_proxy for Distutils upload command, a feature accidentally lost in the rollback of distutils2.
2013-11-10 18:50:10 -05:00
3492e39b44
Issue 19544 and Issue #7457 : Restore the read_pkg_file method to distutils.dist.DistributionMetadata accidentally removed in the undo of distutils2.
2013-11-10 18:15:03 -05:00
2a1838b9df
Issue #19544 and Issue #1180 : Restore global option to ignore ~/.pydistutils.cfg in Distutils, accidentally removed in backout of distutils2 changes.
2013-11-10 18:11:00 -05:00
aa32779632
Issue #19544 , #6516 : no need to catch AttributeError on import pwd/grp
2013-11-15 23:13:17 +01:00
06afed07d1
Issue #19544 and Issue #6516 : quick workaround for failing builds
2013-11-15 23:08:21 +01:00
5e2d45672c
Issue #19544 and Issue #6516 : Restore support for --user and --group parameters to sdist command as found in Python 2.7 and originally slated for Python 3.2 but accidentally rolled back as part of the distutils2 rollback. Closes Issue #6516 .
2013-11-15 13:01:52 -05:00
77796e4f7a
Fix failing test incorrectly merged in b1244046f37a
2013-11-10 20:28:18 -05:00
0048ae0cc6
Merge with 3.3 for Issue #19544 and Issue #6286 . Merge is untested. I was unable to test due to bab0cbf86835.
2013-11-10 18:59:44 -05:00
375dc9b8b4
Merge with 3.3 for Issue #19544 and Issue #7457
2013-11-10 18:21:49 -05:00
7b5d6adb28
Backout 265d369ad3b9.
2013-11-04 07:43:41 +01:00
7ec3e56bb8
Backout d80207d15294.
2013-11-04 07:43:32 +01:00
e71fb28519
Merge with 3.3 for Issue #19286 .
2013-11-02 13:04:51 -04:00
ca9242f4f9
Merge with 3.2 for Issue #19286 .
2013-11-02 13:01:46 -04:00
bd26d86d74
Issue #19286 : [distutils] Only match files in build_py.find_data_files.
2013-11-02 11:07:35 -04:00
93912b9e54
Issue #19286 : Adding test demonstrating the failure when a directory is found in the package_data globs.
2013-11-02 11:29:33 -04:00
2d34f41bee
Bump to 3.3.3rc1.
2013-10-27 09:22:59 +01:00
bd61c3ae1f
Version bump for 3.4.0a4.
2013-10-20 02:01:29 -07:00
6a9c0e50a9
Issue #12641 : Avoid passing "-mno-cygwin" to the mingw32 compiler, except when necessary.
...
Patch by Oscar Benjamin.
2013-09-30 22:29:48 +02:00
3c678c33a7
Issue #12641 : Avoid passing "-mno-cygwin" to the mingw32 compiler, except when necessary.
...
Patch by Oscar Benjamin.
2013-09-30 22:28:10 +02:00
d92af0f1d9
Merge 3.4.0a3 release changes.
2013-09-30 01:13:32 +01:00
5395d211f9
merge 3.3 ( #19114 )
2013-09-29 11:13:50 -04:00
56b143d758
condense two tests with the same name ( closes #19114 )
2013-09-29 11:13:27 -04:00
61e10a5efe
Issue #4366 : Fix building extensions on all platforms when --enable-shared is used.
2013-09-29 01:49:07 +02:00
643238eb53
Issue #4366 : Fix building extensions on all platforms when --enable-shared is used.
2013-09-29 01:48:40 +02:00
44719a7717
Version bump to 3.4.0a3.
2013-09-28 23:51:00 +01:00
3a2d18b7d7
Version number bump for Python 3.4.0a2.
2013-09-07 23:42:07 +12:00
e0c69161bc
#18741 : merge with 3.3.
2013-08-17 16:13:22 +03:00
b5bc353b88
#18741 : fix more typos. Patch by Févry Thibault.
2013-08-17 16:11:40 +03:00
1f08c772f5
Bumped version to 3.4.0a1.
2013-08-03 12:58:12 -07:00
cd171c8e92
Issue #18200 : Back out usage of ModuleNotFoundError (8d28d44f3a9a)
2013-07-04 17:43:24 -04:00
61c3556c14
Issue #17177 : Stop using imp in distutils
2013-06-15 12:59:53 -04:00
0a140668fa
Issue #18200 : Update the stdlib (except tests) to use
...
ModuleNotFoundError.
2013-06-13 20:57:26 -04:00
97345680dc
Issue #18080 : When building a C extension module on OS X, if the compiler
...
is overriden with the CC environment variable, use the new compiler as
the default for linking if LDSHARED is not also overriden. This restores
Distutils behavior introduced in 3.2.3 and inadvertently dropped in 3.3.0.
2013-05-28 16:35:30 -07:00
6750282007
Issue #18080 : merge from 3.3
2013-05-28 16:45:06 -07:00
88f4dd6451
bump to 3.3.2
2013-05-12 12:51:38 +02:00
7025349aa8
merge with 3.3
2013-05-12 12:37:12 +02:00
521ed52131
Closes issue #17732 : ignore install-directory specific options in
...
distutils.cfg when a venv is active.
2013-05-12 12:36:07 +02:00
bfe36ec1f5
Bump to version 3.2.5.
2013-05-12 12:28:20 +02:00
f7520dc0d7
Fix uploadTestCase to work even when HTTPSConnection is not available.
2013-04-19 04:23:09 +03:00
9aa23c5671
Bump to 3.3.1.
2013-04-06 09:40:02 +02:00
8bc7e31529
Bump to 3.2.4.
2013-04-06 09:36:20 +02:00
d08d0b1c69
Bump to 3.3.1rc1.
2013-03-23 16:05:12 +01:00
b673d99698
Bump to 3.2.4rc1.
2013-03-23 16:02:08 +01:00
6d3d0fe0b2
- Issue #16754 : Fix the incorrect shared library extension on linux. Introduce
...
two makefile macros SHLIB_SUFFIX and EXT_SUFFIX. SO now has the value of
SHLIB_SUFFIX again (as in 2.x and 3.1). The SO macro is removed in 3.4.
2013-03-21 13:39:52 -07:00
1621d77fc8
- Issue #16754 : Fix the incorrect shared library extension on linux. Introduce
...
two makefile macros SHLIB_SUFFIX and EXT_SUFFIX. SO now has the value of
SHLIB_SUFFIX again (as in 2.x and 3.1). The SO macro is removed in 3.4.
2013-03-21 13:31:41 -07:00
d5537d071c
- Issue #16754 : Fix the incorrect shared library extension on linux. Introduce
...
two makefile macros SHLIB_SUFFIX and EXT_SUFFIX. SO now has the value of
SHLIB_SUFFIX again (as in 2.x and 3.1). The SO macro is removed in 3.4.
2013-03-21 13:21:49 -07:00
45c9704b73
use the HTTPS for pypi upload
2013-03-18 15:20:56 -07:00
469da97c1e
#11420 : merge with 3.3.
2013-03-16 21:50:04 +02:00
e5e7a7cbf4
#11420 : merge with 3.2.
2013-03-16 21:49:20 +02:00
c28f6fa505
#11420 : make test suite pass with -B/DONTWRITEBYTECODE set. Initial patch by Thomas Wouters.
2013-03-16 19:48:51 +02:00
16b5c13668
Merge 3.3, issue #17047 : remove doubled words found in 2.7 to
...
3.4 Lib/*, as reported by Serhiy Storchaka and Matthew Barnett.
2013-03-11 17:59:07 -04:00
98472b8396
Merge 3.2, issue #17047 : remove doubled words found in 2.7 to
...
3.4 Lib/*, as reported by Serhiy Storchaka and Matthew Barnett.
2013-03-11 17:58:27 -04:00
c30b7b16ea
Issue #17047 : remove doubled words found in 2.7 to 3.4 Lib/*,
...
as reported by Serhiy Storchaka and Matthew Barnett.
2013-03-11 17:57:08 -04:00
f011881d7d
Issue #17041 : Fix testing when Python is configured with the
...
--without-doc-strings.
2013-01-27 20:04:26 +02:00
26f1166510
Issue #17041 : Fix testing when Python is configured with the
...
--without-doc-strings.
2013-01-27 20:03:39 +02:00
9d0add0c7e
Issue #17041 : Fix testing when Python is configured with the
...
--without-doc-strings.
2013-01-27 19:47:45 +02:00
981eec3ad4
- Issue #15484 : Fix _PYTHON_PROJECT_BASE for srcdir != builddir builds;
...
use _PYTHON_PROJECT_BASE in distutils/sysconfig.py.
2013-01-25 14:35:44 +01:00
9731330d6f
- Issue #15484 : Fix _PYTHON_PROJECT_BASE for srcdir != builddir builds;
...
use _PYTHON_PROJECT_BASE in distutils/sysconfig.py.
2013-01-25 14:33:33 +01:00
f7a17b48d7
Replace IOError with OSError ( #16715 )
2012-12-25 16:47:37 +02:00
0832af6628
Issue #16717 : get rid of socket.error, replace with OSError
2012-12-18 23:10:48 +02:00
ad28c7f9da
Issue #16706 : get rid of os.error
2012-12-18 22:02:39 +02:00
a191959849
Issue #16714 : use 'raise' exceptions, don't 'throw'.
...
Patch by Serhiy Storchaka.
2012-12-18 21:27:16 +02:00
5b89840d9c
Issue #16714 : use 'raise' exceptions, don't 'throw'.
...
Patch by Serhiy Storchaka.
2012-12-18 21:26:36 +02:00
737fb89dd1
Issue #16714 : use 'raise' exceptions, don't 'throw'.
...
Patch by Serhiy Storchaka.
2012-12-18 21:14:22 +02:00
bb7da03f6e
Merge fixes for #13614 , #13512 and #7719 from 3.3
2012-12-08 22:57:08 -05:00
3f7c0e4036
Merge fixes for #13614 , #13512 and #7719 from 3.2
2012-12-08 22:53:43 -05:00
8b503c0a4e
Fix setup.py register failure with invalid rst in description ( #13614 ).
...
Original patch by Julien Courteau and Pierre Paul Lefebvre.
2012-12-08 22:41:11 -05:00
d61926e6be
Create ~/.pypirc securely ( #13512 ).
...
There was a window between the write and the chmod where the user’s
password would be exposed, depending on default permissions. Philip
Jenvey’s patch fixes it.
2012-12-08 14:51:47 -05:00
3e4a3dcb23
Ignore .nfs* files in distutils ( #7719 ).
...
These files are created by some NFS clients a file is edited and removed
concurrently (see added link in doc for more info). If such a file is
removed between distutils calls listdir and copy, it will get confused.
Other special files are ignored in sdist (namely VCS directories), but
this has to be filtered out earlier.
2012-12-08 14:21:51 -05:00
998b105c68
Closes #16116 : Merged fix from 3.3.
2012-10-23 20:27:43 +01:00
e87acc1f38
Issue #16116 : Now uses corrected include and library paths when building C extensions in a venv.
2012-10-23 20:26:14 +01:00
d17833d360
Closes #16135 : Removal of OS/2 support (distutils)
2012-10-11 01:20:12 +02:00
08a9012352
Bump version to 3.4.0 alpha 0.
2012-09-29 09:34:13 +02:00
c7dcd50e4e
Bump version to 3.3.0 final.
2012-09-29 09:04:54 +02:00
8506d3591c
Bump to 3.3.0rc3.
2012-09-23 17:15:21 +02:00
02f66cbe87
Bump to 3.3.0rc2.
2012-09-09 08:56:46 +02:00
4ab4ec258c
Bump to 3.3.0rc1.
2012-08-25 12:16:37 +02:00
1b94ab79a9
Bump to 3.3b2.
2012-08-11 08:49:20 +02:00
6c779ea553
Issue #15364 : Fix test_srcdir for the installed case.
2012-07-27 23:37:04 -07:00
46874ad367
Issue #15364 : Fix sysconfig.get_config_var('srcdir') to be an absolute path.
2012-07-27 12:06:55 +01:00
c7a5a76b1e
Issue #15184 : Some config variables in test_sysconfig_module
...
may differ between sysconfig and distutils.sysconfig due to
compiler customizations on OS X. For now, move those vars
into a separate test and skip if the customization has taken
place in distutils. The long-term solution is to eliminate
having two sysconfig modules.
2012-07-22 02:56:36 -07:00
df8aa2b325
Issue #15184 : Ensure consistent results of OS X configuration
...
tailoring for universal builds by factoring out common OS X-specific
customizations from sysconfig, distutils.sysconfig, distutils.util,
and distutils.unixccompiler into a new module _osx_support that can
eventually also be used by packaging.
2012-07-21 05:36:30 -07:00
8cffdd9ca2
Closes #15367 : Corrected computation of include locations for source builds on Windows. Thanks to Richard Oudkerk for the bug report and patch.
2012-07-16 18:30:03 +01:00
048b063780
Closes #15366 : Corrected computation of include location for source builds. Thanks to Richard Oudkerk for the bug report and patch.
2012-07-16 18:24:55 +01:00
274717757d
Issue #13590 : Improve support for OS X Xcode 4:
...
- fix test_distutils and test_sysconfig test failures by
aligning sysconfig and distutils.sysconfig tailoring of
configure variables (as in 2.7)
2012-07-15 21:30:03 -07:00
fc20d77b40
Issue #13590 : OS X Xcode 4 - improve support for universal extension modules
...
In particular, fix extension module build failures when trying to use
32-bit-only installer Pythons on systems with Xcode 4 (currently
OS X 10.8, 10.7, and optionally 10.6).
* Backport 3.3.0 fixes to 3.2 branch (for release in 3.2.4)
* Since Xcode 4 removes ppc support, extension module builds now
check for ppc compiler support and by default remove ppc and
ppc64 archs when they are not available.
* Extension module builds now revert to using system installed
headers and libs (/usr and /System/Library) if the SDK used
to build the interpreter is not installed or has moved.
* Try to avoid building extension modules with deprecated
and problematic Apple llvm-gcc compiler. If original compiler
is not available, use clang instead by default.
2013-01-31 01:28:23 -08:00
7d30b80a4e
Issue #15315 : Support VS 2010 in distutils cygwincompiler.
2012-07-10 07:07:06 +02:00
1abe1c5fe1
- Issue #14330 : For cross builds, don't use host python, use host search paths
...
for host compiler.
2012-06-30 20:42:45 +02:00
c92448beba
Issue #10571 : Fix the "--sign" option of distutils' upload command.
...
Patch by Jakub Wilk.
2012-06-29 01:06:51 +02:00
24319ac407
Issue #10571 : Fix the "--sign" option of distutils' upload command.
...
Patch by Jakub Wilk.
2012-06-29 01:05:26 +02:00
b83719287d
Issue #14443 : ensure that brp-python-bytecompile is invoked with the correct
...
python executable
The __os_install_macro defines some post-processing activities during an rpm
build; one of the scripts it calls is brp-python-bytecompile, which can take
an argument: the python executable with which to byte-compile .py files in the
package payload.
In some older versions of rpm (e.g. in RHEL 6), this invocation doesn't pass
in an argument, and brp-python-bytecompile defaults to using /usr/bin/python,
which can lead to the .py files being byte-compiled for the wrong version of
python. This has been fixed in later versions of rpm by passing in
%{__python} as an argument to brp-python-bytecompile.
Workaround this by detecting if __os_install_post has a 0-argument invocation
of brp-python-bytecompile, and if so generating an equivalent macro that has
the argument, and explicitly provide the new definition within the specfile.
2012-06-26 14:06:23 -04:00
d08cec6d62
Bump version to 3.3.0b1.
2012-06-26 09:43:40 +02:00
555bfc7ed0
Issue #14443 : ensure that brp-python-bytecompile is invoked with the correct
...
python executable
The __os_install_macro defines some post-processing activities during an rpm
build; one of the scripts it calls is brp-python-bytecompile, which can take
an argument: the python executable with which to byte-compile .py files in the
package payload.
In some older versions of rpm (e.g. in RHEL 6), this invocation doesn't pass
in an argument, and brp-python-bytecompile defaults to using /usr/bin/python,
which can lead to the .py files being byte-compiled for the wrong version of
python. This has been fixed in later versions of rpm by passing in
%{__python} as an argument to brp-python-bytecompile.
Workaround this by detecting if __os_install_post has a 0-argument invocation
of brp-python-bytecompile, and if so generating an equivalent macro that has
the argument, and explicitly provide the new definition within the specfile.
2012-06-25 15:52:24 -04:00
cbfb9a56e6
Issue #13590 : Improve support for OS X Xcode 4:
...
- Try to avoid building Python or extension modules with problematic
llvm-gcc compiler.
- Since Xcode 4 removes ppc support, extension module builds now
check for ppc compiler support and automatically remove ppc and
ppc64 archs when not available.
- Since Xcode 4 no longer install SDKs in default locations,
extension module builds now revert to using installed headers
and libs if the SDK used to build the interpreter is not
available.
- Update ./configure to use better defaults for universal builds;
in particular, --enable-universalsdk=yes uses the Xcode default
SDK and --with-universal-archs now defaults to "intel" if ppc
not available.
2012-06-23 16:02:19 -07:00
f0397b9953
Bump version to 3.3.0a4.
2012-05-30 22:04:31 +02:00
ab45e689be
Merge from 3.2
2012-05-28 22:36:07 +10:00
4b6045c30f
Issue #14443 : Tell rpmbuild to use the correct version of Python
2012-05-28 22:34:46 +10:00
7e203498d1
Fixed _sys_home computation and added diagnostics for Windows buildbot failures.
2012-05-27 17:30:09 +01:00
42211426eb
Addressed some buildbot errors and comments on the checkin by Antoine on python-dev.
2012-05-26 20:36:12 +01:00
7ded1f0f69
Implemented PEP 405 (Python virtual environments).
2012-05-26 03:45:29 +01:00
401f9f3d32
Fix #13210 . Port the Windows build from VS2008 to VS2010.
2012-05-13 11:19:23 -05:00
ab0ef20663
Bump to 3.3.0a3.
2012-05-01 09:35:18 +02:00
Éric Araujo
Georg Brandl
Larry Hastings
Serhiy Storchaka
Stefan Krah
Zachary Ware
Antoine Pitrou
Barry Warsaw
Jason R. Coombs
Andrew Kuchling
Victor Stinner
Christian Heimes
Benjamin Peterson
Ezio Melotti
Brett Cannon
Ned Deily
doko@ubuntu.com
Terry Jan Reedy
doko@python.org
Andrew Svetlov
Éric Araujo
Vinay Sajip
Jesus Cea
Richard Oudkerk
Martin v. Löwis
David Malcolm
Nick Coghlan
Brian Curtin