Commit Graph

431 Commits

Author SHA1 Message Date
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 375dc9b8b4 Merge with 3.3 for Issue #19544 and Issue #7457 2013-11-10 18:21:49 -05:00
Georg Brandl 7ec3e56bb8 Backout d80207d15294. 2013-11-04 07:43:32 +01: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 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
Benjamin Peterson 5395d211f9 merge 3.3 (#19114) 2013-09-29 11:13:50 -04:00
Benjamin Peterson 56b143d758 condense two tests with the same name (closes #19114) 2013-09-29 11:13:27 -04: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
Ned Deily 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
Ned Deily 6750282007 Issue #18080: merge from 3.3 2013-05-28 16:45:06 -07:00
Georg Brandl 7025349aa8 merge with 3.3 2013-05-12 12:37:12 +02:00
Georg Brandl 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
Ezio Melotti f7520dc0d7 Fix uploadTestCase to work even when HTTPSConnection is not available. 2013-04-19 04:23:09 +03: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
Benjamin Peterson 45c9704b73 use the HTTPS for pypi upload 2013-03-18 15:20:56 -07:00
Ezio Melotti 469da97c1e #11420: merge with 3.3. 2013-03-16 21:50:04 +02:00
Ezio Melotti e5e7a7cbf4 #11420: merge with 3.2. 2013-03-16 21:49:20 +02:00
Ezio Melotti c28f6fa505 #11420: make test suite pass with -B/DONTWRITEBYTECODE set. Initial patch by Thomas Wouters. 2013-03-16 19:48:51 +02: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
Serhiy Storchaka f011881d7d Issue #17041: Fix testing when Python is configured with the
--without-doc-strings.
2013-01-27 20:04:26 +02:00
Serhiy Storchaka 26f1166510 Issue #17041: Fix testing when Python is configured with the
--without-doc-strings.
2013-01-27 20:03:39 +02:00
Serhiy Storchaka 9d0add0c7e Issue #17041: Fix testing when Python is configured with the
--without-doc-strings.
2013-01-27 19:47:45 +02:00
Andrew Svetlov a191959849 Issue #16714: use 'raise' exceptions, don't 'throw'.
Patch by Serhiy Storchaka.
2012-12-18 21:27:16 +02:00
Andrew Svetlov 5b89840d9c Issue #16714: use 'raise' exceptions, don't 'throw'.
Patch by Serhiy Storchaka.
2012-12-18 21:26:36 +02:00
Andrew Svetlov 737fb89dd1 Issue #16714: use 'raise' exceptions, don't 'throw'.
Patch by Serhiy Storchaka.
2012-12-18 21:14:22 +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
Éric Araujo 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
Jesus Cea d17833d360 Closes #16135: Removal of OS/2 support (distutils) 2012-10-11 01:20:12 +02:00
Ned Deily 6c779ea553 Issue #15364: Fix test_srcdir for the installed case. 2012-07-27 23:37:04 -07:00
Richard Oudkerk 46874ad367 Issue #15364: Fix sysconfig.get_config_var('srcdir') to be an absolute path. 2012-07-27 12:06:55 +01:00
Ned Deily 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
Ned Deily 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
Ned Deily 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
É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 c53d624235 Merge 3.2 2012-03-05 17:04:20 +01:00
Éric Araujo c3705d3ac4 Fix NameError from #13719 fix 2012-03-05 17:02:31 +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 408026c7e8 Merge 3.2 2012-02-26 04:07:37 +01:00
Éric Araujo 845a77205f Set archive format explicitly in one distutils test 2012-02-26 02:14:33 +01:00
Éric Araujo c071a613df Merge 3.2 2012-02-25 16:32:18 +01:00
Éric Araujo 2e0a0e1640 Fix long-standing bugs with MANIFEST.in parsing on Windows (#6884).
These regex changes fix a number of issues for distutils on Windows:
- #6884: impossible to include a file starting with 'build'
- #9691 and #14004: sdist includes too many files
- #13193: test_filelist failures

This commit replaces the incorrect changes done in 0a94e2f807c7 and
90b30d62caf2 to fix #13193; we were too eager to fix the test failures
and I did not study the code enough before greenlighting patches.  This
time we have unit tests from the problems reported by users to be sure
we have the right fix.

Thanks to Nadeem Vawda for his help.
2012-02-25 16:28:05 +01:00
Éric Araujo a76eff7db0 Merge fix from 3.2 2012-02-15 18:13:00 +01:00
Éric Araujo 2a57a36368 Fix test failure for shared builds caused by #1326113 fix 2012-02-15 18:12:12 +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 cd2a6033ac Branch merge 2012-02-05 13:41:47 +01:00
Ned Deily f9b0255db3 merge 2012-02-03 02:45:05 +01:00
Ned Deily cf550dcff8 Issue #13901: Prevent test_distutils failures on OS X with --enable-shared. 2012-02-03 02:42:16 +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
Jason R. Coombs bbb0803924 Limit test scope to those platforms that can save the target filenames. Reference #11638. 2011-12-28 10:45:08 -05:00
Jason R. Coombs e7437a7cb3 Ported some test cases from 2.7 for #11638 2011-12-26 12:17:01 -05: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
Éric Araujo af2ffd75cf Cleanups in distutils tests.
- Actually check the contents of the file created by bdist_dumb.
- Don’t use “RECORD” as filename for non-PEP 376 record file
- Don’t start method name with “_test”, it smells like a disabled test
  method instead of an helper method
- Fix some idioms (assertIn, addCleanup)
2011-11-02 18:05:41 +01:00
Mark Hammond 6c58b28f2f Issue #7833: Ext. modules built using distutils on Windows no longer get a manifest 2011-10-17 11:05:57 +11:00
Mark Hammond a9efb6fdd8 Issue #7833: Ext. modules built using distutils on Windows no longer get a manifest 2011-10-17 11:28:09 +11:00
Éric Araujo c822f08c71 Merge #11751 from 3.2 2011-10-11 02:46:59 +02:00
Éric Araujo 2336c8553c Increase test coverage for distutils.filelist (#11751).
Patch by Justin Love.
2011-10-11 02:45:51 +02:00
Éric Araujo 67df285a33 Merge 3.2 2011-10-09 08:58:16 +02:00
Éric Araujo 5819dcc0d2 Add tests for Unicode handling in distutils’ check and register (#13114) 2011-10-09 07:25:33 +02:00
Éric Araujo 6ebea15e0b Merge fixes for #10526, #10359, #11254, #9100 and the bug without number 2011-10-08 02:57:45 +02:00
Éric Araujo 47a4521ece Fix distutils byte-compilation to comply with PEP 3147 (#11254).
Patch by Jeff Ramnani.  Tested with -B, -O and -OO.
2011-10-08 00:34:13 +02:00
Éric Araujo db95c7a60c Make C code in one distutils test comply with ISO C (#10359).
Patch by Hallvard B Furuseth.
2011-10-07 23:13:45 +02:00
Éric Araujo 92ffc500d1 Merge fix for #8933 from 3.2 2011-09-10 04:56:44 +02:00
Éric Araujo 13e8c8e721 Fix determination of Metadata version (#8933). Patch by Filip Gruszczyński. 2011-09-10 01:51:40 +02:00
Éric Araujo fce67fcd84 Slight cleanup in distutils test_dist.
I have tests to add in this file and it’s always nice to start from a
clean base.
2011-09-10 01:34:44 +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 32e2915da5 Enable catching WARN-level logging messages in distutils' test_sdist 2011-09-03 00:28:43 +02:00
Éric Araujo 793c47a88a Merge doc changes from 3.2 (#10454, #12298) 2011-09-02 00:03:20 +02:00
Éric Araujo 024de54fc2 Fix typo (was build) and remove redundancy in docstring 2011-09-01 23:37:56 +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
Éric Araujo 3577c3cfb8 Branch merge 2011-08-26 16:30:57 +02:00
Éric Araujo 2f24fda195 Branch merge 2011-08-26 16:30:22 +02:00
Éric Araujo 8d9dcd185c Merge from 3.2 (#9302 fix and other changes) 2011-08-26 01:17:56 +02:00
Éric Araujo c686167298 Turn two ifs into one in the code I commited a few days ago 2011-08-26 00:03:22 +02:00
Antoine Pitrou bcf147cb72 Issue #12333: fix test_distutils failures under Solaris and derivatives 2011-08-25 18:32:54 +02:00
Antoine Pitrou 4fc80b62ba Issue #12333: fix test_distutils failures under Solaris and derivatives 2011-08-25 18:32:02 +02:00
Éric Araujo 09ab4f86e8 Merge distutils bug fix from 3.2 2011-08-24 01:58:59 +02:00
Éric Araujo 175eb995d3 Fix distutils tests on Windows (#12678).
- First, support.fixup_build_ext (already used to set proper
  library_dirs value under Unix shared builds) gains the ability to
  correctly set the debug attribute under Windows debug builds.

- Second, the filename for the extension module gets a _d suffix under
  debug builds.

- Third, the test code properly puts our customized build_ext object
  into an internal dictionary to make sure that the install command will
  later use our object instead of re-creating one.  That’s the downside
  of using low-level APIs in our test code: we have to manually push
  knobs and turn handles that would otherwise be handled behind the
  scenes.

Thanks to Nadeem for the testing.
2011-08-24 01:29:10 +02:00
Nadeem Vawda 3d3bc81219 Issue #12678: Fix distutils sdist test on Windows.
Patch by Jeremy Kloth.
2011-08-21 22:35:41 +02:00
Éric Araujo 006b485511 Merge build_ext fix from 3.2 2011-08-21 17:10:50 +02:00
Éric Araujo 8c973189b5 Fix distutils test_install for shared CPython builds 2011-08-21 17:03:19 +02:00
Éric Araujo 6e3ad8736e Factor out the build_ext fixup for shared Python builds.
I need this to fix the failing test_install.
2011-08-21 17:02:07 +02:00
Éric Araujo 24d1df79ba Merge 3.2 2011-08-21 12:54:06 +02:00
Éric Araujo 52b201f0df Add missing closing paren in docstring (thanks Ezio) 2011-08-21 12:53:37 +02:00
Éric Araujo 87f58d828a Merge 3.2 2011-08-20 20:02:04 +02:00