Commit Graph

1708 Commits

Author SHA1 Message Date
Éric Araujo a9d2b64206 Merge fixes for #13193 and FAQ from 3.2 2012-02-12 04:58:46 +01:00
Éric Araujo 9ce366a5a6 Fix distutils.filelist.FileList under Windows (#13193).
The code used to call os.path.join to build a regex but without escaping
the backslash, which lead to test failures on Windows.  Antoine Pitrou
fixed it in 0a94e2f807c7 by enhancing the code to accept both / and \,
with proper escaping, but in my opinion this goes against the distutils
feature freeze, hence this change.
2012-02-12 04:52:21 +01:00
Ned Deily 7347df1504 Issue #13590: merge 2012-02-10 13:08:44 +01:00
Ned Deily 9937748f0c Issue #13590: On OS X 10.7 and 10.6 with Xcode 4.2, building
Distutils-based packages with C extension modules may fail because
Apple has removed gcc-4.2, the version used to build python.org
64-bit/32-bit Pythons.  If the user does not explicitly override
the default C compiler by setting the CC environment variable,
Distutils will now attempt to compile extension modules with clang
if gcc-4.2 is required but not found. Also as a convenience, if
the user does explicitly set CC, substitute its value as the default
compiler in the Distutils LDSHARED configuration variable for OS X.
(Note, the python.org 32-bit-only Pythons use gcc-4.0 and the 10.4u
SDK, neither of which are available in Xcode 4.  This change does not
attempt to override settings to support their use with Xcode 4.)
2012-02-10 13:01:08 +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
Jesus Cea 5c1d814e6f MERGE: And yet another emergency fix for #13803 bootstrap issue: Under Solaris, distutils doesn't include bitness in the directory name 2012-01-18 05:05:41 +01:00
Jesus Cea 031605ad99 And yet another emergency fix for #13803 bootstrap issue: Under Solaris, distutils doesn't include bitness in the directory name 2012-01-18 05:04:49 +01:00
Jesus Cea 2c5b688081 MERGE: Emergency fix for #13803 bootstrap issue: Under Solaris, distutils doesn't include bitness in the directory name 2012-01-18 04:28:05 +01:00
Jesus Cea 6e35d417f7 Emergency fix for #13803 bootstrap issue: Under Solaris, distutils doesn't include bitness in the directory name 2012-01-18 04:27:37 +01:00
Jesus Cea 44acda4c97 MERGE: Closes #13803: Under Solaris, distutils doesn't include bitness in the directory name 2012-01-18 04:01:24 +01:00
Jesus Cea 8874fd6bb0 Closes #13803: Under Solaris, distutils doesn't include bitness in the directory name 2012-01-18 03:58:42 +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
Antoine Pitrou 61093c0ced Issue #13193: Fix distutils.filelist.FileList and
packaging.manifest.Manifest under Windows.  The "recursive-include"
directive now recognizes both legal path separators.
2011-11-12 01:27:19 +01:00
Antoine Pitrou 8f0ffe587b Issue #13193: fix distutils.filelist.FileList under Windows 2011-11-12 01:20:45 +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
É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
Florent Xicluna 5d1155c08e Closes #13258: Use callable() built-in in the standard library. 2011-10-28 14:45:05 +02:00
Mark Hammond 53e4a9a763 normalize whitespace in Lib/distutils/msvc9compiler.py 2011-10-17 11:35:31 +11: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
Florent Xicluna aabbda5354 Merge 3.2 2011-10-28 14:52:29 +02:00
Mark Hammond f813080736 normalize whitespace in Lib/distutils/msvc9compiler.py 2011-10-17 11:36:49 +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 04ea9533c1 Fix docstring of distutils.util.byte_compile (followup for #11254) 2011-10-08 03:02:37 +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 fea2d04bb9 Fix distutils.sysconfig.get_makefile_filename when prefix != exec-prefix 2011-10-08 01:56:52 +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
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 bcf99ac665 Branch merge 2011-09-05 17:44:07 +02:00
Georg Brandl 3484a8771c Merge with release clone. 2011-09-04 08:35:54 +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 08e544e27b Issue #12333: fix test_distutils failures under Solaris and derivatives 2011-08-25 18:32:02 +02:00
Georg Brandl b0993bc78d Bump to 3.2.2. 2011-09-03 11:17:55 +02:00
Éric Araujo d5a9811dbe Make bdist_* commands respect --skip-build passed to bdist (#10946) 2011-08-29 21:48:39 +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 c3085aa77b 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
É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 ce9da2ffa6 Issue #12678: Fix distutils sdist test on Windows.
Patch by Jeremy Kloth.
2011-08-21 22:35:41 +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 a031abc166 Fix distutils test_install for shared CPython builds 2011-08-21 17:03:19 +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
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 87f58d828a Merge 3.2 2011-08-20 20:02:04 +02:00
Éric Araujo 19ffe600e9 Fix sdist test on Windows (#12678). Patch by Jeremy Kloth. 2011-08-20 19:52:07 +02:00
Éric Araujo e1e1331a49 Dedent example in docstring 2011-08-20 07:25:39 +02:00
Éric Araujo c9322aabaa Merge 3.2 2011-08-20 07:10:54 +02:00
Éric Araujo 6b32ecff20 Add a test for extension modules in the distutils record file.
I made a note a month ago that install --record wrote incorrect entries
for extension modules (I think the problem was that the first character
of the file was stripped), so I’m now adding a test to try to reproduce
that in the current versions.
2011-08-20 07:08:51 +02:00
Éric Araujo 1772541085 Add a test for extension modules in the distutils record file.
I made a note a month ago that install --record wrote incorrect entries
for extension modules (I think the problem was that the first character
of the file was stripped), so I’m now adding a test to try to reproduce
that in the current versions.
2011-08-20 07:08:51 +02:00
Éric Araujo 3c2ec8e52b Rework test_record a bit to make the test more exact 2011-08-20 07:00:41 +02:00
Éric Araujo e74e3cf1e1 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 9358bfdaff Rework test_record a bit to make the test more exact 2011-08-20 07:00:41 +02:00
Éric Araujo fba5a94342 Refactor the copying of xxmodule.c in distutils tests (#12141).
I need to copy this file in another test too, so I moved the support
code to distutils.tests.support and improved it:

- don’t skip when run from the Lib/distutils/tests directory
- use proper skip machinery instead of custom print/return/test suite
  fiddling.
2011-08-20 06:27:18 +02:00
Éric Araujo def15dafda Refactor the copying of xxmodule.c in distutils tests (#12141).
I need to copy this file in another test too, so I moved the support
code to distutils.tests.support and improved it:

- don’t skip when run from the Lib/distutils/tests directory
- use proper skip machinery instead of custom print/return/test suite
  fiddling.
2011-08-20 06:27:18 +02:00
Victor Stinner 9c3de4a883 Issue #12326: don't test the major version of sys.platform
Use startswith, instead of ==, when testing sys.platform to support
new platforms like Linux 3 or OpenBSD 5.
2011-08-17 20:49:41 +02:00
Georg Brandl b3f0ce4d1e Bump version to 3.2.2rc1. 2011-08-13 11:34:58 +02:00
Éric Araujo 25785e9ca5 Revert cosmetic change.
A reminder: distutils only gets bug fixes.  Cosmetic changes, especially
in tests, are not worth the time spent, and can even make future merges
of bugfixes a bit less easy.
2011-08-10 02:46:33 +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
Georg Brandl cd0dc16fdc Bump version to 3.2.1. 2011-07-09 08:56:21 +02:00
Georg Brandl d4fa7ed8db Bump to 3.2.1rc2. 2011-07-03 09:41:27 +02:00
Victor Stinner bf816223df Issue #12451: Add support.create_empty_file()
We don't need to create a temporary buffered binary or text file object just to
create an empty file.

Replace also os.fdopen(handle).close() by os.close(handle).
2011-06-30 23:25:47 +02:00
Victor Stinner 0b5e049ea0 (merge 3.2) Issue #12451: distutils now opens the setup script in binary mode
to read the encoding cookie, instead of opening it in UTF-8.
2011-06-30 15:41:56 +02:00
Victor Stinner dc9b1ea02e Issue #12451: distutils now opens the setup script in binary mode to read the
encoding cookie, instead of opening it in UTF-8.
2011-06-30 15:40:22 +02:00
Ned Deily 8c86d308a1 Issue #9516: Merge Distutils changes from 3.2 2011-06-28 20:01:52 -07:00
Ned Deily a8f8b50bd7 Issue #9516: Change distutils to no longer globally attempt to check and
set the MACOSX_DEPLOYMENT_TARGET env variable for the interpreter process
on OS X.  This could cause failures in non-distutils subprocesses and was
unreliable since tests or user programs could modify the interpreter
environment after distutils set it.  Instead, have distutils set the
the deployment target only in the environment of each build subprocess.

Continue to use the previous algorithm for deriving the deployment target
value:
    if MACOSX_DEPLOYMENT_TARGET is not set in the interpreter's env:
        use the interpreter build configure MACOSX_DEPLOYMENT_TARGET
    elif the MACOSX_DEPLOYMENT_TARGET env value >= configure value:
        use the env MACOSX_DEPLOYMENT_TARGET
    else: # env value less than interpreter build configure value
        raise exception
This allows building extensions that can only run on newer versions of
the OS than the version python was built for, for example with a python
built for 10.3 or later and an extension that needs to be built for 10.5.
2011-06-28 19:44:24 -07:00
Ned Deily d13007fa11 Issue #9516: Correct and expand OS X deployment target tests in distutils
test_build_ext.
2011-06-28 19:43:15 -07:00
Ned Deily 4a1ec12999 Issue #12141: Install copies of template C module file so that
test_build_ext of test_distutils and test_command_build_ext of
test_packaging are no longer silently skipped when
run outside of a build directory.
2011-06-28 00:53:54 -07:00
Ned Deily 58f27b203c Issue #12141: Install a copy of template C module file so that
test_build_ext of test_distutils is no longer silently skipped when
run outside of a build directory.
2011-06-28 00:42:50 -07:00