Commit Graph

714 Commits

Author SHA1 Message Date
Vinay Sajip
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
Antoine Pitrou
c92448beba Issue #10571: Fix the "--sign" option of distutils' upload command.
Patch by Jakub Wilk.
2012-06-29 01:06:51 +02:00
Antoine Pitrou
24319ac407 Issue #10571: Fix the "--sign" option of distutils' upload command.
Patch by Jakub Wilk.
2012-06-29 01:05:26 +02:00
David Malcolm
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
David Malcolm
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
Nick Coghlan
ab45e689be Merge from 3.2 2012-05-28 22:36:07 +10:00
Nick Coghlan
4b6045c30f Issue #14443: Tell rpmbuild to use the correct version of Python 2012-05-28 22:34:46 +10:00
Brian Curtin
401f9f3d32 Fix #13210. Port the Windows build from VS2008 to VS2010. 2012-05-13 11:19:23 -05:00
Éric Araujo
00b41fc828 Merge 3.2 2012-03-07 20:50:06 +01:00
Éric Araujo
a420c820fe Backout buggy patch committed for #13719 2012-03-07 20:48:55 +01:00
Éric Araujo
6a59b70cba Merge 3.2 2012-03-05 16:24:07 +01:00
Éric Araujo
e413c06f35 Make distutils’ upload command work with bdist_msi products (#13719).
Patch by Ralf Schmitt.
2012-03-05 16:09:29 +01:00
Éric Araujo
1d175f7768 Merge fixes for #1326113 and #12297 from 3.2 2012-02-15 17:13:26 +01:00
Éric Araujo
b2f5c0a4c4 Fix parsing of build_ext --libraries option (#1326113) 2012-02-15 16:44:37 +01:00
Éric Araujo
cd0d951a70 Merge edits from 3.2 (#13716, #1040439, #2945, #13770, #6715) 2012-02-05 13:49:59 +01:00
Éric Araujo
73cec21af2 Stop ignoring RPMs in distutils' upload command (#2945).
Bug reported by Hartmut Goebel and patch contributed by Carl Robben.
Carl tested the fix and we have a buildbot with rpm installed, so I’m
committing even though I could not run this test (but I do understand
the changed code :)
2012-01-15 02:48:55 +01:00
Éric Araujo
e64052176d Merge follow-up for #11254 and other changes from 3.2 2011-11-03 05:17:11 +01:00
Éric Araujo
c465b2f843 More fixes for PEP 3147 compliance in distutils (#11254) 2011-11-03 03:45:33 +01:00
Victor Stinner
e01aa53ea6 Merge 3.2: Issue #9561: distutils now reads and writes egg-info files using UTF-8
instead of the locale encoding.
2011-09-05 23:46:05 +02:00
Victor Stinner
a1bea6e10c Issue #9561: distutils now reads and writes egg-info files using UTF-8
instead of the locale encoding.
2011-09-05 23:44:56 +02:00
Éric Araujo
564fbac7cd Merge fix for #8286 from 3.2 2011-09-03 00:48:17 +02:00
Éric Araujo
cfbd630a27 Warn instead of crashing because of invalid path in MANIFEST.in (#8286).
sdist used to crash with a full traceback dump instead of printing a
nice warning with the faulty line number.
2011-09-03 00:42:04 +02:00
Éric Araujo
ff29ff8831 Merge fix for #10946 from 3.2 2011-08-30 01:01:45 +02:00
Éric Araujo
fbe37dfffe Make bdist_* commands respect --skip-build passed to bdist (#10946) 2011-08-29 21:48:39 +02:00
Victor Stinner
e67474725b Issue #12326: refactor usage of sys.platform
* Use str.startswith(tuple): I didn't know this Python feature, Python rocks!
 * Replace sometimes sys.platform.startswith('linux') with
   sys.platform == 'linux'
 * sys.platform doesn't contain the major version on Cygwin on Mac OS X
   (it's just 'cygwin' and 'darwin')
2011-08-21 00:39:18 +02:00