Commit graph

1649 commits

Author SHA1 Message Date
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
Éric Araujo
459b452b98 Merge ABC and distutils touch-ups from 3.2.
I have removed the reST target I added in 38cdca2cc253: it is not necessary, as
people can link to the glossary entry or the abc module without it.

Two indentation fixes from 3.2 collections.rst have been ported to 3.3
collections.abc.rst.
2011-06-04 21:16:42 +02:00
Éric Araujo
70798be6f6 Remove unneeded executable bit on two distutils files 2011-06-04 20:47:26 +02:00
Éric Araujo
601aba6f15 Merge touch-ups and fixes for #9831 (+port fix to packaging) and #9223 from 3.2 2011-05-29 00:56:39 +02:00
Éric Araujo
c5069e0070 Merge doc touch-ups and fixes for #9831 and #9223 from 3.1 2011-05-29 00:29:56 +02:00
Éric Araujo
489c8ff26b Fix test_build_py when sys.dont_write_bytecode is true (#9831).
The tests now pass all combinations of -O/-OO and -B.  See also #7071
and #6292 for previous variations on the same theme.

test_versionpredicate needs a skip when sys.flags.optimize is true, but
I don’t know how to make that work with a DocTestSuite.
2011-05-28 23:32:50 +02:00
Tarek Ziade
3517369894 Issue 12132 - skip the test_buil_ext test if the xx module is not found 2011-05-22 22:09:55 +02:00
Tarek Ziade
ebbb14c1a1 Issue #12120, Issue #12119: tests were missing a sys.dont_write_bytecode check 2011-05-19 19:56:12 +02: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
Georg Brandl
5673e27e72 Bump to 3.2.1rc1. 2011-05-15 17:52:42 +02:00