Commit Graph

211 Commits

Author SHA1 Message Date
Éric Araujo
dfd232898d Minor code reorganization in one packaging test file 2011-11-03 00:20:03 +01:00
Éric Araujo
9ad81a3591 Fix typo “seperate” 2011-11-03 00:13:05 +01:00
Florent Xicluna
aabbda5354 Merge 3.2 2011-10-28 14:52:29 +02:00
Éric Araujo
89d3a69d83 Add tests for packaging.tests.support (#12659).
Thanks to Francisco Martín Brugué for the patch.
2011-10-21 07:56:32 +02:00
Éric Araujo
f89ebdc358 Fix missing imports in setup scripts generated by packaging (#13205).
I’ve made more edits than the bug report suggested to make sure the
generated setup script is compatible with many Python versions; a
comment in the source explains that in detail.

The cfg_to_args function uses old 2.x idioms like codecs.open and
RawConfigParser.readfp because I want the setup.py generated by packaging and
distutils2 to be the same.  Most users won’t see the deprecation warning and I
ignore it in the test suite.

Thanks to David Barnett for the report and original patch.
2011-10-21 06:27:06 +02:00
Éric Araujo
3bb8be6d78 Branch merge 2011-10-19 21:32:39 +02:00
Éric Araujo
784cd4cc54 Make one function in packaging.metadata simpler 2011-10-19 08:50:49 +02:00
Éric Araujo
f3f283a1cb Clean up some idioms in packaging tests.
- Use os.makedirs (I had forgotten about it!)
- Let TempdirManager.write_file call os.path.join for us
- Remove custom command added by test_dist
- Use a skip instead of hiding a method with an underscore
- Address pyflakes warnings
2011-10-19 08:49:20 +02:00
Éric Araujo
382067b3cf Change signature of packaging.tests.support.LoggingCatcher.get_logs.
I need this for some tests, and it makes code clearer.  This commit also
changes some assertEqual calls to use (actual, expected) order and fix
some pyflakes warnings.
2011-10-19 08:37:22 +02:00
Éric Araujo
4b5a5f7bd5 More fixes for PEP 3147 compliance in packaging (#11254) 2011-10-19 08:18:05 +02:00
Éric Araujo
8ccd18fff3 Expand tests and fix bugs in packaging.util.resolve_name.
The code is still ugly, but at least it works better now.  Patches to
make it easier to read are welcome, as well as support in #12915.
2011-10-19 06:46:13 +02:00
Łukasz Langa
318909b297 A ricochet from fixing #10680: http://http://example.com/ no longer reports
'nonnumeric port'. It parses to a host name of "http:" which is equivalent to
http:80.
2011-10-19 02:40:48 +02:00
Éric Araujo
8022314fc2 Cleanup in packaging: super considered super 2011-10-14 17:04:39 +02:00
Éric Araujo
d139b99426 Fix writing of the RESOURCES file by packaging (#12386) 2011-10-14 16:58:23 +02:00
Éric Araujo
aa2cb3a530 Increase test coverage for packaging.manifest (#11751).
Patch by Justin Love.
2011-10-11 03:06:16 +02:00
Éric Araujo
30cc65460e Add tests for Unicode handling in packaging’ check and register (#13114) 2011-10-11 02:18:12 +02:00
Éric Araujo
a29e4f64c1 Fix packaging byte-compilation to comply with PEP 3147 (#11254).
I want to replace custom byte-compiling function with calls to
compileall before 3.3b1, but in the short term it’s good to have this
fixed.

Adapted from the distutils patch by Jeff Ramnani.  I tested with -B, -O
and -OO; test_util and test_mixin2to3 fail in -O mode because lib2to3
doesn’t support it.
2011-10-08 04:09:15 +02:00
Éric Araujo
73b1e7dd20 Make C code in one packaging test comply with ISO C (#10359).
Patch by Hallvard B Furuseth.
2011-10-08 02:58:50 +02:00
Éric Araujo
6fd287e6c2 Fix return code of “pysetup run COMMAND” (closes #12222) 2011-10-06 05:28:56 +02:00
Éric Araujo
8ed34a130e Minor: improve one test name, address pyflakes warnings 2011-10-06 05:18:41 +02:00
Éric Araujo
fa23cc842c Add test that was promised in a comment but not actually written 2011-10-06 05:15:09 +02:00
Éric Araujo
9556a5bab2 Fix incorrect test.
The packaging.install.remove function (a.k.a. the uninstall feature)
takes a path argument to allow client code to use custom directories
instead of sys.path.  The test used to give self.root_dir as path, which
corresponds to a prefix option, but prefix is not on sys.path, it’s only
the base directory used to compute the stdlib and site-packages
directory paths.  The test now gives a valid site-packages path to the
function.
2011-10-06 05:10:09 +02:00
Éric Araujo
2c30e3999c Change one name in packaging’s test_uninstall to avoid confusion.
install_lib may be the name of a module, a command or an option, so I
find it clearer to use site_packages to refer to a string object
containing the path of the site-packages directory created in a
temporary directory during tests.
2011-10-06 04:59:41 +02:00
Éric Araujo
c4637714b0 Cosmetic fixes for whitespace and a regex in packaging.
The goal of the regex is to catch a (alpha), b (beta), c or rc
(release candidate), so the existing pattern puzzled me. Tests were
OK before and after the change.
2011-10-05 01:46:37 +02:00
Éric Araujo
763cc6eaee Add tests for comparing candidate and final versions in packaging (#11841).
This used to be buggy; Filip Gruszczyński contributed tests and a code
patch but the latter is not needed.
2011-10-05 01:41:14 +02:00
Éric Araujo
dd2d55c8a1 Remove two unneeded attributes in packaging 2011-09-21 16:28:03 +02:00
Éric Araujo
4c0b7070ce Squash last tempdir leak in packaging tests.
Sweet taste of victory!  Alexis, you can fix the threads leaks :)
2011-09-19 20:57:52 +02:00
Éric Araujo
1cbd2ab404 Avoid matching '' or 'yn' when asking for 'y' or 'n' in interactive code 2011-09-19 16:21:37 +02:00
Éric Araujo
505f0ebf88 Final bag of small changes coming from distutils2.
- minor cleanup in Metadata
- trigger creation of the sysconfig._CONFIG_VARS dict
- home_page is used over home-page: it’s not a compound word, it’s an
  escaped space

Distutils2 is now synchronized with Packaging.
2011-09-19 15:12:23 +02:00
Éric Araujo
c1b7e7f8bb A few style changes originally done in the distutils2 repo 2011-09-18 23:12:30 +02:00
Éric Araujo
f30b5ae6fd Replace cmp function with key function 2011-09-18 21:03:24 +02:00
Éric Araujo
cc06ad187d Fix typo and wording 2011-09-18 20:36:19 +02:00
Éric Araujo
cc95dd81f3 Branch merge 2011-09-18 20:24:27 +02:00
Éric Araujo
229011d949 Make a number of small changes to ease the backport to distutils2 2011-09-18 20:11:48 +02:00
Éric Araujo
41479450ec Fix fallback base class when tests run without threading 2011-09-18 17:00:38 +02:00
Éric Araujo
7724a6c10c Packaging cleanup: remove conditionals for < 2.6 support.
PEP 370 features and sys.dont_write_bytecode are always available
in 3.3; the distutils2 backport still has the conditionals.

I also renamed an internal misnamed method and fixed a few things
(“packaging2” name, stray print, unused import, fd leak).
2011-09-17 03:31:51 +02:00
Ned Deily
e30186bf4b Issue #12765: Fix packaging.test.test_database failures on OS X due
to unwarranted assumption about absolute paths: on OS X /var is a
symlink to /private/var.  (Also true for /etc and /tmp).
2011-09-15 15:09:23 -07:00
Éric Araujo
37ccd6f794 Fix packaging.database.Distribution.list_distinfo_files (#12785).
This method was supposed to return only the file under the dist-info
directory, but it actually returned all installed files.

The tests didn’t catch this because they were flawed; I updated them.
Thanks to Nadeem Vawda and Jeremy Kloth for testing.

As a bonus, the removal of os.path.relpath use should also fix the
Windows buildbots.
2011-09-15 18:18:51 +02:00
Jeremy Kloth
3ac4f59a82 The value is the dotted module name to the command class. 2011-09-13 08:26:25 -06:00
Jeremy Kloth
aa2b442bdc Factor out the distribution file-system safe name functions from install_distinfo to allow all metadata consumers access to them. 2011-09-12 11:12:42 -06:00
Éric Araujo
cde6576820 Remove unneeded --all option of “pysetup list”.
The command without arguments already prints all installed distributions
found.

In addition, change “releases” for “projects” in the description of the
list action.  Strictly speaking, one installed distribution satisfies
the requirement for a release (i.e. version) of a project, but as
currently only one release per project can be installed at a time, the
two are somewhat equivalent, and “project” is more understandable in
help texts (which call their argument “dist”, by the way..)
2011-09-12 16:45:38 +02:00
Éric Araujo
fb7d24492f Remove obsolete comment (yes, build_ext supports C++) 2011-09-10 18:22:31 +02:00
Éric Araujo
1f2bcd35bb Don’t let invalid line in setup.cfg pass silently 2011-09-10 18:22:04 +02:00
Éric Araujo
c6d52eddaa Fix usage of bytes in packaging's bdist_wininst.
This is copied from the namesake distutils command; there is no
automated test, so buildbots won’t call for my head this time, but it
should be okay as Python 3 users have tested the distutils command.
2011-09-10 18:14:08 +02:00
Éric Araujo
030cfe26a3 Use bytes regex instead of decoding whole pages 2011-09-10 18:10:58 +02:00
Éric Araujo
c8f9c81cfa Fix usage of dry-run in packaging bdist_wininst and install_distinfo.
In dry-run mode, packaging commands should log the same info as in real
operation and should collect the same files in self.outputs, so that
users can run a command in verbose and dry-run mode to see exactly what
operations will be done in the real run.
2011-09-10 18:10:23 +02:00
Éric Araujo
e6db7a3a29 Fix determination of Metadata version in packaging (#8933).
Original patch by Filip Gruszczyński.
2011-09-10 05:22:48 +02:00
Éric Araujo
6bbd775377 Consolidate tests for packaging.metadata.
New tests were added in test_metadata and old tests inherited from
distutils were still in test_dist, so I moved them into test_metadata
(except for one which was more at home in test_run) and merged
duplicates.

I also added some skips to lure contributors <wink>, optimized the
Metadata.update method a trifle, and added notes about a number of
issues.

A note: The tests in test_dist used to dump the Metadata objects to a
file in the METADATA format and look for strings in its contents; I
updated them to use the mapping API of Metadata instead.  For some
fields with special writing rules, I have added tests to ensure my
conversion did not lose anything.
2011-09-10 05:18:20 +02:00
Victor Stinner
d4d8ae5a42 Issue #9561: packaging now writes egg-info files using UTF-8
instead of the locale encoding
2011-09-06 00:11:13 +02:00
Éric Araujo
ae5af15e41 Minor: tweak docstrings and __all__ in packaging.tests.support 2011-09-01 23:48:13 +02:00