diff options
| author | Éric Araujo <merwok@netwok.org> | 2011-07-31 16:33:00 (GMT) |
|---|---|---|
| committer | Éric Araujo <merwok@netwok.org> | 2011-07-31 16:33:00 (GMT) |
| commit | ad548b8534645ebb7590eb557c04d86814bde203 (patch) | |
| tree | 054e0527512d7c6fcd59283d0a26a2b2173ef0ee /Doc/distutils | |
| parent | 052c83cf058c0511810d96253d0d4c391d11be0a (diff) | |
| parent | 548c054fb70c504150ec8bafa4503d6b4e74e535 (diff) | |
| download | cpython-ad548b8534645ebb7590eb557c04d86814bde203.zip cpython-ad548b8534645ebb7590eb557c04d86814bde203.tar.gz cpython-ad548b8534645ebb7590eb557c04d86814bde203.tar.bz2 | |
Merge fixes for #9860, #11104/#8688 and #12331 from 3.2
Diffstat (limited to 'Doc/distutils')
| -rw-r--r-- | Doc/distutils/sourcedist.rst | 25 |
1 files changed, 17 insertions, 8 deletions
diff --git a/Doc/distutils/sourcedist.rst b/Doc/distutils/sourcedist.rst index 15d0baf..1666436 100644 --- a/Doc/distutils/sourcedist.rst +++ b/Doc/distutils/sourcedist.rst @@ -103,10 +103,20 @@ per line, regular files (or symlinks to them) only. If you do supply your own :file:`MANIFEST`, you must specify everything: the default set of files described above does not apply in this case. -.. versionadded:: 3.1 +.. versionchanged:: 3.1 + An existing generated :file:`MANIFEST` will be regenerated without + :command:`sdist` comparing its modification time to the one of + :file:`MANIFEST.in` or :file:`setup.py`. + +.. versionchanged:: 3.1.3 :file:`MANIFEST` files start with a comment indicating they are generated. Files without this comment are not overwritten or removed. +.. versionchanged:: 3.2.2 + :command:`sdist` will read a :file:`MANIFEST` file if no :file:`MANIFEST.in` + exists, like it used to do. + + The manifest template has one command per line, where each command specifies a set of files to include or exclude from the source distribution. For an example, again we turn to the Distutils' own manifest template:: @@ -185,8 +195,12 @@ Manifest-related options The normal course of operations for the :command:`sdist` command is as follows: -* if the manifest file, :file:`MANIFEST` doesn't exist, read :file:`MANIFEST.in` - and create the manifest +* if the manifest file (:file:`MANIFEST` by default) exists and the first line + does not have a comment indicating it is generated from :file:`MANIFEST.in`, + then it is used as is, unaltered + +* if the manifest file doesn't exist or has been previously automatically + generated, read :file:`MANIFEST.in` and create the manifest * if neither :file:`MANIFEST` nor :file:`MANIFEST.in` exist, create a manifest with just the default file set @@ -204,8 +218,3 @@ distribution:: python setup.py sdist --manifest-only :option:`-o` is a shortcut for :option:`--manifest-only`. - -.. versionchanged:: 3.1 - An existing generated :file:`MANIFEST` will be regenerated without - :command:`sdist` comparing its modification time to the one of - :file:`MANIFEST.in` or :file:`setup.py`. |