Commit Graph

832 Commits

Author SHA1 Message Date
Berker Peksag fddf12198f Issue #21776: Merge from 3.5 2016-06-02 13:47:23 -07:00
Berker Peksag 6a8e626a60 Issue #21776: distutils.upload now correctly handles HTTPError
Initial patch by Claudiu Popa.
2016-06-02 13:45:53 -07:00
Serhiy Storchaka ccd047ea4b Removed unused imports. 2016-04-25 00:12:32 +03:00
Serhiy Storchaka 885bdc4946 Issue #25985: sys.version_info is now used instead of sys.version
to format short Python version.
2016-02-11 13:10:36 +02:00
Steve Dower 332334f1ab Issue #26071: bdist_wininst created binaries fail to start and find 32bit Python 2016-01-16 13:54:53 -08:00
Steve Dower cedef652fa Rebuild wininst-14.0[-amd64].exe with updated tools. 2015-08-05 11:48:14 -07:00
Steve Dower c70908558d Issue #23970: Fixes bdist_wininst not working on non-Windows platform. 2015-05-23 12:15:57 -07:00
Steve Dower fd3664be00 Issue #23970: Adds distutils._msvccompiler for new Visual Studio versions. 2015-05-23 09:02:50 -07:00
Serhiy Storchaka b9cec6a30f Issue #16314: Added support for the LZMA compression in distutils. 2015-05-16 22:13:27 +03:00
Brett Cannon f299abdafa Issue #23731: Implement PEP 488.
The concept of .pyo files no longer exists. Now .pyc files have an
optional `opt-` tag which specifies if any extra optimizations beyond
the peepholer were applied.
2015-04-13 14:21:02 -04:00
Steve Dower 17be514d0a Closes #23437: Make user scripts directory versioned on Windows (patch by pmoore) 2015-02-14 09:50:59 -08:00
Benjamin Peterson 71f1c5c496 merge 3.4 (#23063) 2015-01-15 00:00:16 -05:00
Benjamin Peterson 562b7cbff9 fix parsing reST with code or code-block directives (closes #23063)
Patch by Marc Abramowitz.
2015-01-14 23:56:35 -05:00
Steve Dower 09bd9ec9b3 Fixes distutils adding/expecting too many _d suffixes. 2014-12-15 20:45:23 -08:00
Steve Dower 1f6c29a914 Removes bdist_wininst dependency on MFC. 2014-12-15 15:03:44 -08:00
Steve Dower 65e4cb10d9 Issue #22919: Windows build updated to support VC 14.0 (Visual Studio 2015), which will be used for the official 3.5 release. 2014-11-22 12:54:57 -08:00
doko@ubuntu.com 9816619c5b - Issue #17219: Add library build dir for Python extension cross-builds. 2014-10-02 02:12:34 +02:00
doko@ubuntu.com cef3bdc01d - Issue #17219: Add library build dir for Python extension cross-builds. 2014-10-02 02:10:47 +02:00
Antoine Pitrou afa3153b27 Remove pointless "vile hack" that can cause the build step to fail when some extension modules can't be imported.
See issue #5309 for the build failures, issue #458343 for the original motivation.
2014-09-30 14:58:22 +02:00
R David Murray c081262be6 #10510: Fix bug in forward port of 2.7 distutils patch.
Pointed out by Arfrever.
2014-09-28 11:01:42 -04:00
R David Murray 623ae29469 #10510: Fix bug in forward port of 2.7 distutils patch.
Pointed out by Arfrever.
2014-09-28 11:01:11 -04:00
R David Murray 3a54c3e3aa Merge: #10510: make distuitls upload/register use HTML standards compliant CRLF. 2014-09-27 16:57:51 -04:00
R David Murray 9ce69672f3 #10510: make distuitls upload/register use HTML standards compliant CRLF.
Patch by Ian Cordasco, approved by Éric Araujo.
2014-09-27 16:56:15 -04:00
Antoine Pitrou 2c0a916061 Issue #5309: distutils' build and build_ext commands now accept a ``-j``
option to enable parallel building of extension modules.
2014-09-26 23:31:59 +02:00
Benjamin Peterson 238f5aa6a5 merge 3.4 (#22349) 2014-09-06 17:24:35 -04:00
Benjamin Peterson df0eb95b57 remove various dead version checks (closes #22349)
Patch from Thomas Kluyver.
2014-09-06 17:24:12 -04:00
Benjamin Peterson c5847414f9 merge 3.4 (closes #22200) 2014-08-17 23:01:33 -05:00
Benjamin Peterson 0c56bb97ea remove 2.2 and 2.6 compat code (closes #22200)
Patch from Thomas Kluyver.
2014-08-17 23:00:42 -05:00
Antoine Pitrou 41dcf35c26 Issue #21722: The distutils "upload" command now exits with a non-zero return code when uploading fails.
Patch by Martin Dengler.
2014-06-18 23:09:11 -04:00
Antoine Pitrou 2e4d3b133a Issue #21722: The distutils "upload" command now exits with a non-zero return code when uploading fails.
Patch by Martin Dengler.
2014-06-18 23:07:46 -04:00
Jason R. Coombs 09122f84fc Reindent long line 2014-05-10 13:24:58 -04:00
Jason R. Coombs 0375653371 Replace overly-aggressive comparison for type equality with an isinstance check. 2014-05-10 13:24:18 -04:00
Jason R. Coombs a384652d6d Drop support for Python 2.4 in upload command. 2014-05-10 13:22:43 -04:00
Jason R. Coombs 6f71726ecd Replace import * with explicit import 2014-05-10 13:21:02 -04:00
Jason R. Coombs 7ae0fde001 Clean up style in distutils upload command 2014-05-10 13:20:28 -04:00
Serhiy Storchaka a26b3f183d Issue #20363. Fixed BytesWarning triggerred by test suite.
Patch by Berker Peksag.
2014-02-06 22:52:23 +02:00
Serhiy Storchaka bc27a050a7 Issue #20363. Fixed BytesWarning triggerred by test suite.
Patch by Berker Peksag.
2014-02-06 22:49:45 +02:00
Stefan Krah 748f40d162 Issue #9709: Revert 97fb852c5c26. Many extensions are not using PyMODINIT_FUNC. 2014-01-28 15:04:40 +01:00
Antoine Pitrou 20d5adea6a Fix TypeError on "setup.py upload --show-response". 2013-12-22 18:14:56 +01:00
Antoine Pitrou 335a5128e5 Fix TypeError on "setup.py upload --show-response". 2013-12-22 18:13:51 +01:00
Antoine Pitrou 29fd05f900 Issue #20045: Fix "setup.py register --list-classifiers". 2013-12-21 22:59:06 +01:00
Antoine Pitrou 716b7222e9 Issue #20045: Fix "setup.py register --list-classifiers". 2013-12-21 22:57:56 +01:00
Stefan Krah 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
Jason R. Coombs 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
Andrew Kuchling 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
Jason R. Coombs 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
Jason R. Coombs e71fb28519 Merge with 3.3 for Issue #19286. 2013-11-02 13:04:51 -04:00
Jason R. Coombs ca9242f4f9 Merge with 3.2 for Issue #19286. 2013-11-02 13:01:46 -04:00
Jason R. Coombs bd26d86d74 Issue #19286: [distutils] Only match files in build_py.find_data_files. 2013-11-02 11:07:35 -04:00
Antoine Pitrou 61e10a5efe Issue #4366: Fix building extensions on all platforms when --enable-shared is used. 2013-09-29 01:49:07 +02:00
Antoine Pitrou 643238eb53 Issue #4366: Fix building extensions on all platforms when --enable-shared is used. 2013-09-29 01:48:40 +02:00
Ezio Melotti e0c69161bc #18741: merge with 3.3. 2013-08-17 16:13:22 +03:00
Ezio Melotti b5bc353b88 #18741: fix more typos. Patch by Févry Thibault. 2013-08-17 16:11:40 +03:00
Brett Cannon 61c3556c14 Issue #17177: Stop using imp in distutils 2013-06-15 12:59:53 -04:00
doko@ubuntu.com 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
doko@ubuntu.com 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
doko@ubuntu.com 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
Terry Jan Reedy 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
Terry Jan Reedy 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
Terry Jan Reedy 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
Andrew Svetlov f7a17b48d7 Replace IOError with OSError (#16715) 2012-12-25 16:47:37 +02:00
Andrew Svetlov 0832af6628 Issue #16717: get rid of socket.error, replace with OSError 2012-12-18 23:10:48 +02:00
Éric Araujo bb7da03f6e Merge fixes for #13614, #13512 and #7719 from 3.3 2012-12-08 22:57:08 -05:00
Éric Araujo 3f7c0e4036 Merge fixes for #13614, #13512 and #7719 from 3.2 2012-12-08 22:53:43 -05:00
Éric Araujo 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
Vinay Sajip 998b105c68 Closes #16116: Merged fix from 3.3. 2012-10-23 20:27:43 +01:00
Vinay Sajip 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
Jesus Cea d17833d360 Closes #16135: Removal of OS/2 support (distutils) 2012-10-11 01:20:12 +02:00
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
Éric Araujo ad548b8534 Merge fixes for #9860, #11104/#8688 and #12331 from 3.2 2011-07-31 18:33:00 +02:00
Éric Araujo ab7c1b3f11 Fix regression with distutils MANIFEST handing (#11104, #8688).
The changed behavior of sdist in 3.1 broke packaging for projects that
wanted to use a manually-maintained MANIFEST file (instead of having a
MANIFEST.in template and letting distutils generate the MANIFEST).

The fixes that were committed for #8688 (76643c286b9f by Tarek and
d54da9248ed9 by me) did not fix all issues exposed in the bug report,
and also added one problem: the MANIFEST file format gained comments,
but the read_manifest method was not updated to handle (i.e. ignore)
them.  This changeset should fix everything; the tests have been
expanded and I successfully tested the 2.7 version with Mercurial, which
suffered from this regression.

I have grouped the versionchanged directives for these bugs in one place
and added micro version numbers to help users know the quirks of the
exact version they’re using.

Initial report, thorough diagnosis and patch by John Dennis, further
work on the patch by Stephen Thorne, and a few edits and additions by
me.
2011-07-31 04:06:12 +02:00
Senthil Kumaran a2250e61db merge from 3.2 - Fix closes Issue11439 Remove the SVN keywords from the code as it is no longer applicable in hg. Patch Contributed by Neil Muller. 2011-07-28 23:39:08 +08:00
Senthil Kumaran 7c9719cf74 Fix closes Issue11439 Remove the SVN keywords from the code as it is no longer applicable in hg. Patch Contributed by Neil Muller. 2011-07-28 22:32:49 +08:00
Victor Stinner cfd365b937 Issue #10419, issue #6011: port 6ad356525381 fix from distutils to packaging
build_scripts command of packaging now handles correctly non-ASCII path (path
to the Python executable). Open and write the script in binary mode, but ensure
that the shebang is decodable from UTF-8 and from the encoding of the script.
2011-05-19 15:18:36 +02:00
Victor Stinner 1eb4f28c6d Close #10419, issue #6011: build_scripts command of distutils handles correctly
non-ASCII path (path to the Python executable). Open and write the script in
binary mode, but ensure that the shebang is decodable from UTF-8 and from the
encoding of the script.
2011-05-11 00:14:28 +02:00
Victor Stinner 1947477072 Close #10419, issue #6011: build_scripts command of distutils handles correctly
non-ASCII path (path to the Python executable). Open and write the script in
binary mode, but ensure that the shebang is decodable from UTF-8 and from the
encoding of the script.
2011-05-11 00:14:28 +02:00