Commit Graph

49 Commits

Author SHA1 Message Date
Éric Araujo 4575afcb53 Fix parsing of packaging’s build_ext --libraries option (#1326113) 2012-02-15 17:25:25 +01:00
Éric Araujo 9f90a731eb Use sys.version_info instead of sys.version in packaging.
The contents of this attribute are an implementation detail, as
documented for #9442, so we should not parse it, to support non-CPython
VMs with distutils2 in the future.

Unfortunately, one use comes directly from PEP 345, so an edit will have
to be agreed before fixing the code (see comment in p7g.markers).

Other remaining uses are found in p7g.compiler and could be replaced by
the platform module (which also parses sys.version, but then it wouldn’t
be my fault :)
2012-02-10 05:20:53 +01:00
Éric Araujo 5c69b66086 Group commands by topic in “pysetup run --list-commands” output.
This fixes a regression from distutils, where “setup.py --help-commands”
prints out commands grouped by topic (i.e. building vs. installing),
which is more useful than using sorted.
2012-02-09 14:29:11 +01:00
Éric Araujo 4d15546504 Remove obsolete verbose arguments from packaging.
Logging replaces verbose arguments.  I haven’t fixed the example in
Doc/install/install.rst because I have major fixes and changes to the
oc under way and will fix or remove that example as part of that task.
2011-11-15 11:43:20 +01:00
Éric Araujo f8361623f0 Clean up byte-compilation code in packaging (#11254 followup).
- Don't use keyword arguments for debug_override; I find it more
  readable to have a comment explaining that True makes pyc and False
  pyo than to write out the non-obvious (when you haven’t read the doc)
  argument name

- Move duplicate code from build_py and install_lib into cmd

- Remove obsolete verbose argument of util.byte_compile

- Remove obsolete passing of -O/-OO to the Python process spawned by
  util.byte_compile (I’ll remove the whole spawning later, after I write
  more tests to check the contents of pyc and pyo files; now that
  byte_compile does not depend on the value of __debug__ in the calling
  Python, we can call py_compile or compileall directly)
2011-11-14 18:10:19 +01:00
Éric Araujo 438f21a406 Use more standard name for one option of packaging’s install_distinfo 2011-11-06 11:52:30 +01:00
Éric Araujo a963e0d917 Undo potentially confusing name change in packaging.
This method was named reinitialize_command in distutils and accompanied
by a comment suggesting to change it to get_reinitialized_command.
Following that, I did the change for distutils2, but it proved
confusing: The Distribution object has an internal cache of command
objects, to make sure only one instance is ever used, and the name
get_reinitialized_command could suggest that the object returned was
independent of that cache, which it was not.  I’m reverting the name
change to make code clearer.
2011-11-06 06:54:05 +01:00
Éric Araujo 880801501b Improve byte-compilation in packaging to be independent of -O or -B.
The code I fixed to comply with PEP 3147 still had one bug: When run
under python -O, some paths for pyc files would be pyo, because I called
imp.cache_from_source without explicit debug_override argument in some
places, and under -O that would return .pyo (this is well explained in
the imp docs).  Now all code (util.byte_compile, build_py, install_lib)
can create .pyo files according to options given by users,
without interference from the calling Python’s own optimize mode.

On a related topic, I also removed the code that prevented byte
compilation under python -B.  The rationale is that packaging gives
control over the creation of pyc files to the user with its own explicit
option, and the behavior should not be changed if the calling Python
happens to run with -B for whatever reason.  I will argue that this is a
bug fix and ask to be allowed to backport this change to distutils.

Finally, I moved one nugget of information about the --compile and
--optimize options from the source into the doc.  It clears up a
misunderstanding that I (and maybe other people) had.
2011-11-03 05:08:28 +01:00
Éric Araujo 9ad81a3591 Fix typo “seperate” 2011-11-03 00:13:05 +01:00
Éric Araujo 4b5a5f7bd5 More fixes for PEP 3147 compliance in packaging (#11254) 2011-10-19 08:18:05 +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 dd2d55c8a1 Remove two unneeded attributes in packaging 2011-09-21 16:28:03 +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 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 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
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 fb7d24492f Remove obsolete comment (yes, build_ext supports C++) 2011-09-10 18:22:31 +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 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 95fc53f2b3 Clean up packaging.util: add __all__, remove some unused functions.
This huge module is the heir of six distutils modules, and contains
a number of miscellaneous functions.  I have attempted to help readers
of the source code with an annoted __all__.  Removed or deprecated
functions have been removed from the documentation; I’m working on
another patch to document the remaining public functions.

For the curious:

The unzip_file and untar_file were used by (or intended to be used by)
“pysetup install path/to/archive.tar.gz”, but the code presently used
shutil.unpack_archive and an helper function, so I just deleted them.
They’re still in the repository if we need them in the future.

The find_packages function is not used anymore but I want to discuss
module and package auto-discovery (in “pysetup create”) again before
removing it.

subst_vars now lives in sysconfig; rfc822_escape is inlined in
packaging.metadata.  Other functions are for internal use only, or
deprecated; I have left them out of __all__ and sprinkled TODO notes
for future cleanups.
2011-09-01 05:11:29 +02:00
Éric Araujo 5bb7345132 Fix packaging command registry to let Windows machines find bdist_msi 2011-08-31 16:12:31 +02:00
Éric Araujo 61543b1afc Fix typo I introduced in f93acf8844ec 2011-08-30 22:13:21 +02:00
Éric Araujo b9fe54cccc Make bdist_* commands respect --skip-build passed to bdist (#10946).
There was already a test for this, but it was complicated and had a
subtle bug (custom command objects need to be put in dist.command_obj so
that other command objects may see them) that rendered it moot.
2011-08-30 01:42:50 +02:00
Éric Araujo 83ab3f319b Remove obsolete mentions of the compress program and .Z archives.
Packaging uses the shutil.make_archive function copied from distutils,
which does not support compress.  There is no test to check that
“bdist --format whatever” works, so this slipped by.
2011-08-30 01:19:02 +02:00
Éric Araujo acddb38602 Cleanup: move code out of a try block 2011-08-30 00:45:59 +02:00
Éric Araujo b741313ca8 Cleanup: use sys.version_info instead of convoluted hexversion lshifts 2011-08-29 21:43:48 +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 ba9b2689be Minor cleanup
- Rename an attribute and create it in initialize_options instead of
  finalize_options to match the other install_* classes
- Remove unnecessary method call in tests
2011-08-20 09:19:25 +02:00
Éric Araujo 7b0908a8e4 Make TypeError message from Command.__init__ more useful 2011-07-29 02:32:41 +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
É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 7373fccd50 Fix sdist to always include setup.cfg (#11092), to comply with the spec 2011-06-06 21:55:43 +02:00
Éric Araujo 8c86ecdab5 Fix format of warnings from the packaging check command 2011-06-02 14:54:44 +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
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 76ad4f0ec9 fixed the export symbols for the win32 linker 2011-05-21 21:48:04 +02:00
Tarek Ziade be20be1345 use the same line terminator everywhere 2011-05-21 19:45:48 +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
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 1231a4e097 initial import of the packaging package in the standard library 2011-05-19 13:07:25 +02:00