Commit Graph

232 Commits

Author SHA1 Message Date
Éric Araujo 55b9fe232d Remove class that was only useful with Sphinx autodoc 2011-08-19 00:53:04 +02:00
Éric Araujo 4460abea64 Use our existing drop-in, no-op decorator instead of redefining it.
Patch by Francisco Martin Brugue.
2011-08-12 00:15:41 +02:00
Éric Araujo 29f6297605 Fix wrong use of root logger in packaging (also a NameError) 2011-08-04 17:17:07 +02:00
Éric Araujo b85b966de6 Stop trying to write into the stdlib during packaging tests (#12331).
This prevents tests from failing when run from a Python installed in a
read-only directory.  The code is a bit uglier; shutil.copytree calls
copystat on directories behind our back, so I had to add an os.walk
with os.chmod (*and* os.path.join!) calls.  shutil, I am disappoint.

This changeset is dedicated to the hundreds of neurons that were lost
while I was debugging this on an otherwise fine afternoon.
2011-07-31 20:47:47 +02:00
Éric Araujo bab50cb124 Minor packaging cleanup.
- Use shortcut dist.version instead of going through metadata;
- Use %r throughout to display project names and paths.
2011-07-29 02:37:21 +02:00
Éric Araujo 7b0908a8e4 Make TypeError message from Command.__init__ more useful 2011-07-29 02:32:41 +02:00
Éric Araujo 943006bf68 Let all pysetup actions return a meaningful 0 or 1 exit code (#12222).
This will help scripts calling pysetup know if a command failed.
Printing/logging was also made more consistent, and a few things were
cleaned up.  In particular, the error/Ctrl-C handling was moved from the
_run function up to the main function.

The run action is not fixed yet; it returns the dist.Distribution
instance, which is needed by test_uninstall and not trivial to fix.
2011-07-29 02:31:39 +02:00
Éric Araujo 73c175f5a0 Let pysetup list exit with a non-zero code when no result is found (#11409).
“pysetup list” or “pysetup list --all” will continue to return 0 if no
distribution is found (it’s not an error), but “pysetup list
some.project” will now exit with 1 if no matching installed distribution
is found.  Based on a patch by Kelsey Hightower.
2011-07-29 02:20:39 +02:00
Antoine Pitrou db535957cd test_packaging should clean up after itself (but it doesn't really) 2011-07-15 23:26:19 +02:00
Éric Araujo eb39294101 Silence 2to3 warnings in packaging tests 2011-07-15 17:49:20 +02:00
Éric Araujo fe95848c16 Clear packaging.database caches in place 2011-07-15 17:47:46 +02:00
Éric Araujo 4468e55d4b Close file handles in a timely manner in packaging.database (#12504).
This fixes a bug with the remove (uninstall) feature on Windows.  Patch
by Thomas Holmes.
2011-07-08 17:22:19 +02:00
Éric Araujo ce5fe83878 Factor out code used by packaging commands for HTTP requests (#12169).
We now have one function to prepare multipart POST requests, and we use
CRLF, as recommended by the HTTP spec (#10150).  Initial patch by John
Edmonds.
2011-07-08 16:27:12 +02:00
Vinay Sajip 0bec35d2d0 Closes #12391: temporary files are now cleaned up. 2011-07-07 12:59:31 +01:00
Ned Deily fceb4120fc Issue #9516: Port the revised deployment target processing for OSX from
distutils to packaging.
2011-06-28 20:04:24 -07:00
Ned Deily 5c727cb978 Issue #9516: Port OS X deployment target tests from distutils to packaging
test_command_build_ext.
2011-06-28 20:03:17 -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
Éric Araujo 3e425ac64b packaging: Add the project directory to sys.path to support local setup hooks.
Original patch by Vinay Sajip on #11637.
2011-06-19 21:23:43 +02:00
Éric Araujo 348c572dcf Fix typo 2011-06-19 18:53:31 +02:00
Éric Araujo 3c8ca089b1 Make decorators used in packaging preserve docstrings 2011-06-17 21:10:21 +02:00
Éric Araujo 74d68135ad Brange merge 2011-06-17 19:38:38 +02:00
Éric Araujo ed5d2f1310 Minor tweaks to packaging tests.
- Move a tearDown method right after setUp
- Use assertRaises instead of reinventing it
- Skip a test instead of commenting it out, as a reminder
2011-06-17 15:47:41 +02:00
Éric Araujo c06f46f74c Packaging tests: don’t let an internal cache grow indefinitely.
Victor Stinner diagnosed on #12167 that some reference leaks came from
util._path_created, a set used for caching; there are two tests that
cause additions to this set, so now they clear it in tearDown, avoiding
17 refleaks.  (My tests show that it’s necessary to clear the set in
only one test, clearing it in both does not stop more refleaks, but
there’s no harm in doing it.)
2011-06-17 15:43:18 +02:00
Victor Stinner 723993983a Issue #12333: run tests on the new module in a subprocess
It is not possible to unload a module written in C, so use a subprocess to run
the tests on the module compiled by test_build_ext(). Using a subprocess, we
don't have to unload the module, save/restore sys.path, and the test can be run
more than once.

This commit fixes also an access error on rmtree() on Windows: because the
module was not really unloaded, it was not possible to remove the temporary
directory (it is not possible to remove a directory on Windows if it still
contains an open file).
2011-06-17 13:52:56 +02:00
Victor Stinner 0f270b2c37 Issue #12333: close files before removing the directory
packaging.tests.support.TempdirManager: rmtree() fails on Windows if there are
still open files in the directory.
2011-06-17 13:25:53 +02:00
Éric Araujo d2c7e3fe96 Minor tweaks in packaging’s test_dist.
- Use different Metadata objects to write and read a PKG-INFO (METADATA)
  file, to make sure the tested values come from the file

- No need to restore methods on an instance after monkey-patching them:
  the methods are still the same on the class

- Harmonize dedent calls
2011-06-17 13:24:33 +02:00
Victor Stinner ac6602bdc1 Issue #12333: restore the previous dir before removing the current directory
packaging.tests.support.TempdirManager: removing the current directory is not
allowed on Windows or Solaris. Store the current directory and restore it
before removing the temporary directory (which is used as the working directory
during the tests).
2011-06-17 12:20:46 +02:00
Éric Araujo 3e85e54274 Remove unused code in packaging.pypi.dist 2011-06-16 23:50:17 +02:00
Éric Araujo 6f67765389 Stop binding sys.path as default parameter value in packaging.
The two public functions in database default to sys.path if the given
*paths* argument is None; the private functions don’t have default
values for their arguments anymore, which is fine as the public
functions that call them pass their arguments down.  Likewise in
install, the functions will pass down their *paths* arguments down to
database functions.

A one-line unneeded function in install was removed instead of being
changed, and the few remaining tests that used brute-force restoration
of sys.path have been cleaned up to use sys.path.remove.
2011-06-16 23:43:15 +02:00
Éric Araujo b6be20ca33 Packaging: remove last mentions and uses of setup.py in the code.
Now only the compatibility layer (in create, util and install) talk
about setup.py.
2011-06-16 23:34:55 +02:00
Éric Araujo 434812d569 Clean up packaging.tests.test_mixin2to3 2011-06-16 23:21:01 +02:00
Victor Stinner 4e97abce2d Issue #12167: Fix a reafleak in packaging.tests.PyPIServer constructor
Don't modify mutable default arguments...
2011-06-15 23:58:57 +02:00
Éric Araujo 8d233f2cb0 Also specify encoding when reading setup.cfg (#12320) 2011-06-12 23:02:57 +02:00
Éric Araujo 043f5ae697 Specify the encoding of the setup.cfg in one packaging test (#12320) 2011-06-12 22:04:58 +02:00
Éric Araujo 6280606a57 Adjust logging in packaging.util.spawn (related to #11599) 2011-06-11 09:46:07 +02:00
Éric Araujo 643cb7345f Allow multiple setup hooks in packaging’s setup.cfg files (#12240).
Original patch by Erik Bray.
2011-06-11 00:33:38 +02:00
Éric Araujo 8474f2901b setup.cfg: Document that description-file can contain more than one file 2011-06-11 00:21:18 +02:00
Éric Araujo 3605030c9b Fix assorted bugs in packaging.util.cfg_to_args (#11595).
Original patch by Erik Bray.
2011-06-10 23:52:26 +02:00
Éric Araujo 1c1d9a5026 Move useful function to packaging.util.
Original patch by Erik Bray as part of #11595, changed by me to improve
readability.
2011-06-10 23:26:31 +02:00
Éric Araujo fa6cfbc4f7 Don’t try to install something when running from uninstalled source (#12246).
Original patch by Tshepang Lekhonkhobe.
2011-06-10 18:31:40 +02:00
Éric Araujo 2b612220e4 Clean up extra environment variable after packaging tests.
packaging.util.check_environ will define HOME and PLAT if they don’t exist; for
some reason, it does not define PLAT when running the tests from a checkout (so
no regrtest warning) but does when running from an installed Python.

Cleaning up the envvar in test_dist fixes the warning on my machine, but I
suspect that a test runner using a different order to run files or running them
in parallel may have PLAT defined in its environment because of another test.
Quite a lot of code ends up calling check_environ; maybe we should just clean
up PLAT in every test.  For now I’m doing this simple fix, we’ll see if we get
bug reports.
2011-06-10 04:29:43 +02:00
Éric Araujo f53cd89006 Fix omission in test for packaging install_distinfo command.
The code does not write checksum or file length for .pyc and .pyo in the RECORD
file, in compliance with PEP 376, but the test forgot to take .pyo into
account.  This was not caught because there were no .pyo in the checkout, but
after installing there are .pyo files created by compileall, and the test picks
them up.
2011-06-10 03:53:49 +02:00
Éric Araujo 5c6684f314 Packaging: use repr to display projects name (3ebabfbf6fe3 followup) 2011-06-10 03:10:53 +02:00
Éric Araujo 0a975f957d Fix example in packaging test_config.
The example C extension used the “three.fast_taunt” name, but no “three” parent
was defined in the setup.cfg.  This did not cause a failure nor even print a
warning, we may want to change that.
2011-06-09 07:47:25 +02:00
Éric Araujo df8ef02488 Style change in packaging: use “not in” over “not x in”.
Such tests are IMO easier to read if both operators are grouped.
2011-06-08 04:47:13 +02:00
Éric Araujo 46bdcf7d4b Packaging: always use repr to display project names.
This helps debugging in case of trailing blanks and such things.
2011-06-08 04:40:13 +02:00
Éric Araujo ea888e038b Fix misunderstanding of how booleans work 2011-06-08 04:31:18 +02:00
Éric Araujo 3cab2f150c Packaging cleanup: normalize print calls.
Namely: use default arguments instead of explicit empty string; use multiple
arguments instead of building strings.
2011-06-08 04:10:57 +02:00
Éric Araujo 04fc999c05 Packaging cleanup: remove use of script_name where obsolete 2011-06-08 04:06:50 +02:00
Éric Araujo 69cdf9294f Fix UnboundLocalError in a finally block of one packaging test 2011-06-06 22:24:19 +02:00
Éric Araujo 7373fccd50 Fix sdist to always include setup.cfg (#11092), to comply with the spec 2011-06-06 21:55:43 +02:00
Éric Araujo 078368fe4d Use strings instead of sets of lines in packaging.create tests.
Using sets in tests did not check whether the values were written in the right
section or with the right key.
2011-06-06 20:59:56 +02:00
Éric Araujo de7563bd3c Fix comment 2011-06-06 20:28:13 +02:00
Éric Araujo d5d831b74d Update doctring now that Python has real booleans 2011-06-06 01:13:48 +02:00
Éric Araujo 4559383664 Improve consistency in questions asked by packaging.create.
I reworded “wizard” because it is a Windows-specific term.
2011-06-04 22:37:57 +02:00
Éric Araujo 8f66f61e55 Clean up packaging.create and add TODO notes for future cleanups 2011-06-04 22:36:40 +02:00
Éric Araujo 18efecf30a Make help messages in packaging.run more consistent 2011-06-04 22:33:59 +02:00
Éric Araujo 2ef747cb77 Cleanup in packaging: don’t unnecessarily instantiate exceptions 2011-06-04 22:33:16 +02:00
Éric Araujo 35a4d01a92 Improve a few docstrings in packaging.
Also beautify import lists.  Having them grouped by lenght makes it slightly
easier to look for a module.
2011-06-04 22:24:59 +02:00
Éric Araujo 088025fc5b Use list constructor or built-in method instead of copy module 2011-06-04 18:45:40 +02:00
Éric Araujo 5d5bde1df2 Document autoflushing in packaging.test.support.LoggingCatcher.get_logs.
I’m afraid my docstring is not as clear as it should be, but I can’t
find a concise way of describing what the code does.  Suggestions for
improvements welcome.
2011-06-03 17:28:23 +02:00
Éric Araujo acf71b89ff Merge packaging doc fix 2011-06-02 16:43:25 +02:00
Éric Araujo 8c86ecdab5 Fix format of warnings from the packaging check command 2011-06-02 14:54:44 +02:00
Éric Araujo 78af7d8392 Make packaging.tests.support.LoggingCatcher.get_logs flush the log handler.
This removes the need to call flush manually in each test, except when
testing code that creates warning without checking them.
2011-06-02 14:53:59 +02:00
Tarek Ziade 721ccd0ce1 added the generate-setup action 2011-06-02 12:00:44 +02:00
Éric Araujo 98b6592266 Branch merge 2011-06-01 19:47:06 +02:00
Éric Araujo 25987d0c4b The compiler class for EMX was removed 2011-06-01 15:20:44 +02:00
Éric Araujo 25d5737f15 Fix typos in class names 2011-06-01 14:41:11 +02:00
Éric Araujo 1256a6864e Re-add line that was mistakenly removed alongside RPM support.
This reveals the need for bdist* tests.
2011-05-31 22:38:41 +02:00
Éric Araujo 9deedf696e Re-apply distutils2 changes lost before the merge of packaging.
wrap_text was removed in favor of standard textwrap but the removal of the
function was lost in a bad merge; a change in sdist mysteriously disappeared.
2011-05-31 18:04:32 +02:00
Éric Araujo a94bdee2e4 Fix nonsensical name.
The code used “long” to refer to a long option (e.g. --quiet), which was
probably changed by 2to3 and not caught by the human operator, and then
changed to “integer” by me to avoid shadowing without seeing the real
obvious fix.
2011-05-31 15:05:38 +02:00
Éric Araujo b4fefc8fa2 Fix test name in debug message 2011-05-31 14:33:32 +02:00
Tarek Ziade e2655974cf code cleanup in packaging.run 2011-05-31 12:15:42 +02:00
Tarek Ziade 5a5ce388ed make sure we check for write access before starting the install, and add correct exit code 2011-05-31 12:09:34 +02:00
Tarek Ziade 441531f6e6 improved pysetup list UI 2011-05-31 09:18:24 +02:00
Tarek Ziade f47fa58b62 better UI when the user does not have the perms to remove the project 2011-05-30 23:26:51 +02:00
Tarek Ziade 1cc9bbd751 fixed the test_uninstall patch 2011-05-30 19:16:49 +02:00
Tarek Ziade b9c09878ab displaying the faulty project name is a good idea 2011-05-30 12:25:38 +02:00
Tarek Ziade 2da756592b removed spurious output 2011-05-30 12:25:21 +02:00
Tarek Ziade b1b6e1384c Cleaned up the installer output behavior.
This change also makes sure the logger handlers are not alterated after an
installation. That also fixes the remaining environment alteration issue in
test_packaging.
2011-05-30 12:07:49 +02:00
Tarek Ziade 43f289ad88 cleanup packaging.database 2011-05-30 11:07:54 +02:00
Tarek Ziade a17d8883fd a resource module for 2 functions is overkill. database is the right place for those 2011-05-30 10:57:44 +02:00
Éric Araujo 7f9b37be45 Port r86353 to packaging (#10359: “;” after function definition is invalid in ISO C) 2011-05-29 02:59:52 +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
Tarek Ziade 5eb555990a Issue #12180: Fixed a few remaining errors in test_packaging when no threading. 2011-05-25 23:46:09 +02:00
Victor Stinner 9bcfacd4fc Issue #12167: packaging.tests.test_dist unloads the temporary module
Fix a reference leak.
2011-05-24 14:01:39 +02:00
Victor Stinner 79d1b1ce3f Issue #12167: packaging.tests.support, LoggingCatcher restores correctly the
log level. Avoid also calls to .addCleanup() in setUp().
2011-05-24 13:59:21 +02:00
Tarek Ziade e1177d9d17 Issue #12125: fixed the failures under Solaris due to improper test cleanup. 2011-05-23 19:07:56 +02:00
Tarek Ziade fabc30833f fixed the cwd cleanup in packaging test_util 2011-05-23 18:47:27 +02:00
Tarek Ziade eb64b61bf5 make sure the cwd is restored on tearDown 2011-05-23 18:31:20 +02:00
Tarek Ziade a1ae533ac9 make sure build_dir.build_lib is synced to the faked build location 2011-05-23 17:35:20 +02:00
Tarek Ziade e5f9cbdaae skip more tests in packaging if threading is not supported 2011-05-23 00:41:27 +02:00
Tarek Ziade a3c1545a2e not using a server name anymore as the 127.0.0.1 <> localhost symmetry is not true under Windows 7 2011-05-22 23:25:48 +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 2bc55e482e Issue 10126 - backported distutils fix for the enable-share mode into packaging 2011-05-22 21:21:44 +02:00
Tarek Ziade 2c40f60c32 added the Content-Length header. that fixes the weird packaging.pypi.errors.HashDoesNotMatch errors 2011-05-21 23:59:09 +02:00
Tarek Ziade 99d4623850 deactivating one test under win32 for now 2011-05-21 23:05:19 +02:00
Tarek Ziade cc243cc808 make sure the crawler can browse file-based indexes under win32 2011-05-21 22:47:40 +02:00
Tarek Ziade 76ad4f0ec9 fixed the export symbols for the win32 linker 2011-05-21 21:48:04 +02:00
Tarek Ziade 5edc31ecaf skip the pypi upload doc test via https, if ssl is not available 2011-05-21 19:53:45 +02:00
Tarek Ziade be20be1345 use the same line terminator everywhere 2011-05-21 19:45:48 +02:00
Tarek Ziade 4bdd9f36a0 fixed the move api in packaging.install, and closing the handle left by mkstemp() in its test module 2011-05-21 15:12:10 +02:00
Tarek Ziade 2db5674a95 we want to generate /-separated paths setup.cfg files even under win32 2011-05-21 14:24:14 +02:00
Tarek Ziade 91f0e346cc fixed the way the cfg file markers values are split under win32 2011-05-21 12:00:10 +02:00
Tarek Ziade ec9b76d282 fixed the separator issues in packaging/resources+config 2011-05-21 11:48:16 +02:00
Tarek Ziade 94449616da fixed a few mocking/cleanup issues in packaging test_util for win32 2011-05-21 10:37:58 +02:00
Victor Stinner 9904b22b78 Close #12114: fix a potential deadlock in packaging.util._find_exe_version()
Avoid also zombi processes: Popen.communicate() calls its wait() method.
2011-05-21 02:20:36 +02:00
Ezio Melotti bb00976fbf Fix another ResourceWarning in test_packaging. 2011-05-20 20:27:54 +03:00
Ezio Melotti 2177ac9c41 Fix more ResourceWarnings in test_packaging moving the join() and server_close() in the stop method. 2011-05-20 19:35:58 +03:00
Ezio Melotti 86c54f0955 Fix several ResourceWarnings in test_packaging. 2011-05-20 14:13:58 +03:00
Victor Stinner 4050c69f78 packaging.tests.test_command_install_data: restore correctly sysconfig._SCHEMES 2011-05-20 01:56:42 +02:00
Victor Stinner e1e3b12979 fix packaging tests on Windows: use os.path.join() in glob patterns 2011-05-20 00:33:39 +02:00
Victor Stinner f966803c08 packaging: fix the constructor of FakePopen
packaging.util requires the env keyword.
2011-05-20 00:12:10 +02:00
Victor Stinner 8914fed842 fix packaging.compiler.msvc9compiler: os.environ['path'] value is also a str
Don't encode the path list
2011-05-20 00:05:58 +02:00
Victor Stinner 9999185447 fix packaging.compiler.msvc9compiler: os.environ values are str, not bytes 2011-05-19 23:46:03 +02:00
Victor Stinner 9cf6d13141 Issue #12112: fix the encoding of setup.py in the packaging module
* read: use tokenize.detect_encoding()
 * write: use 'utf-8'
2011-05-19 21:42:47 +02:00
Ezio Melotti 975077a889 Refactor a few tests to use the new requires_zlib decorator. 2011-05-19 22:03:22 +03:00
Ezio Melotti cad648cbc9 Skip tests that require zlib in the packaging tests. Also add a requires_zlib decorator to test.support. 2011-05-19 21:25:10 +03: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
Tarek Ziade 2db2d3beeb removed unused method in packaging.create 2011-05-19 19:07:06 +02:00
Victor Stinner c3364529b8 Issue #12112: packaging reads/writes metadata using UTF-8 2011-05-19 18:49:56 +02:00
Victor Stinner dd13dd4bcc Issue #12112: packaging reads and writes setup.cfg using UTF-8 2011-05-19 18:45:32 +02:00
Victor Stinner 4c9706bd27 package: replace open(fn, 'w').close() by open(fn, 'wb').close()
We don't need to open the files in text mode just to create them (or update
their modification time).
2011-05-19 15:52:59 +02:00
Victor Stinner 21a9c748aa packaging: use with open() instead of try/finally: close 2011-05-19 15:51:27 +02:00
Tarek Ziade 0e3f3a7076 fixed the path splitting 2011-05-19 15:51:54 +02:00
Tarek Ziade fd88318ac4 Issue #12115: skipping all tests that need threading under a threadless environment 2011-05-19 15:26:59 +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
Victor Stinner 35de5ac44d packaging: don't use locale encoding to compute MD5 checksums
Open the file in binary mode or use UTF-8 encoding.
2011-05-19 15:09:57 +02:00
Tarek Ziade cd0f7bfd32 Issue #12113: make sure generated module is not reused on a second run 2011-05-19 14:46:10 +02:00
Tarek Ziade 311a2d1bc9 make sure split() is called before the encoding 2011-05-19 13:59:45 +02:00
Tarek Ziade 3b1a22a6df Issue #12109 fixing typo in packaging's test_command_upload_docs 2011-05-19 13:46:41 +02:00
Tarek Ziade 1231a4e097 initial import of the packaging package in the standard library 2011-05-19 13:07:25 +02:00