Hello community,
here is the log from the commit of package python3-setuptools for
openSUSE:Factory checked in at 2016-04-07 13:34:57
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python3-setuptools (Old)
and /work/SRC/openSUSE:Factory/.python3-setuptools.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python3-setuptools"
Changes:
--------
--- /work/SRC/openSUSE:Factory/python3-setuptools/python3-setuptools.changes
2016-03-26 15:08:43.000000000 +0100
+++
/work/SRC/openSUSE:Factory/.python3-setuptools.new/python3-setuptools.changes
2016-04-07 13:34:58.000000000 +0200
@@ -1,0 +2,37 @@
+Thu Mar 31 16:41:20 UTC 2016 - [email protected]
+
+- update to version 20.6.7:
+ * Issue #523: Disabled support for environment markers introduced in
+ v20.5.
+
+- changes from version 20.6.6:
+ * Issue #503: Restore support for PEP 345 environment markers by
+ updating to Packaging 16.6.
+
+- changes from version 20.6.0:
+ * New release process that relies on `bumpversion
+ <https://github.com/peritus/bumpversion>`_ and Travis CI for
+ continuous deployment.
+ * Project versioning semantics now follow `semver
+ <https://semver.org>`_ precisely. The 'v' prefix on version
+ numbers now also allows version numbers to be referenced in the
+ changelog,
+ e.g. https://pythonhosted.org/setuptools/history.html#v20-6-0.
+
+- changes from version 20.5:
+ * BB Pull Request #185: Add support for environment markers in
+ requirements in install_requires, setup_requires, tests_require as
+ well as adding a test for the existing extra_requires machinery.
+
+- changes from version 20.4:
+ * Issue #422: Moved hosting to `Github
+ <https://github.com/pypa/setuptools>`_ from `Bitbucket
+ <https://bitbucket.org/pypa/setuptools>`_. Issues have been
+ migrated, though all issues and comments are attributed to
+ bb-migration. So if you have a particular issue or issues to which
+ you've been subscribed, you will want to "watch" the equivalent
+ issue in Github. The Bitbucket project will be retained for the
+ indefinite future, but Github now hosts the canonical project
+ repository.
+
+-------------------------------------------------------------------
Old:
----
setuptools-20.3.1.tar.gz
New:
----
setuptools-20.6.7.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python3-setuptools.spec ++++++
--- /var/tmp/diff_new_pack.NOeGJO/_old 2016-04-07 13:34:59.000000000 +0200
+++ /var/tmp/diff_new_pack.NOeGJO/_new 2016-04-07 13:34:59.000000000 +0200
@@ -17,7 +17,7 @@
Name: python3-setuptools
-Version: 20.3.1
+Version: 20.6.7
Release: 0
Url: http://pypi.python.org/pypi/setuptools
Summary: Easily download, build, install, upgrade, and uninstall Python
packages
++++++ setuptools-20.3.1.tar.gz -> setuptools-20.6.7.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/setuptools-20.3.1/CHANGES.txt
new/setuptools-20.6.7/CHANGES.txt
--- old/setuptools-20.3.1/CHANGES.txt 2016-03-18 15:48:53.000000000 +0100
+++ new/setuptools-20.6.7/CHANGES.txt 2016-03-31 16:48:15.000000000 +0200
@@ -2,22 +2,67 @@
CHANGES
=======
+v20.6.7
+-------
+
+* Issue #523: Disabled support for environment markers
+ introduced in v20.5.
+
+v20.6.6
+-------
+
+* Issue #503: Restore support for PEP 345 environment
+ markers by updating to Packaging 16.6.
+
+v20.6.0
+-------
+
+* New release process that relies on
+ `bumpversion <https://github.com/peritus/bumpversion>`_
+ and Travis CI for continuous deployment.
+* Project versioning semantics now follow
+ `semver <https://semver.org>`_ precisely.
+ The 'v' prefix on version numbers now also allows
+ version numbers to be referenced in the changelog,
+ e.g. https://pythonhosted.org/setuptools/history.html#v20-6-0.
+
+20.5
+----
+
+* BB Pull Request #185: Add support for environment markers
+ in requirements in install_requires, setup_requires,
+ tests_require as well as adding a test for the existing
+ extra_requires machinery.
+
+20.4
+----
+
+* Issue #422: Moved hosting to
+ `Github <https://github.com/pypa/setuptools>`_
+ from `Bitbucket <https://bitbucket.org/pypa/setuptools>`_.
+ Issues have been migrated, though all issues and comments
+ are attributed to bb-migration. So if you have a particular
+ issue or issues to which you've been subscribed, you will
+ want to "watch" the equivalent issue in Github.
+ The Bitbucket project will be retained for the indefinite
+ future, but Github now hosts the canonical project repository.
+
20.3.1
------
* Issue #519: Remove import hook when reloading the
``pkg_resources`` module.
-* Pull Request #184: Update documentation in ``pkg_resources``
+* BB Pull Request #184: Update documentation in ``pkg_resources``
around new ``Requirement`` implementation.
20.3
----
-* Pull Request #179: ``pkg_resources.Requirement`` objects are
+* BB Pull Request #179: ``pkg_resources.Requirement`` objects are
now a subclass of ``packaging.requirements.Requirement``,
allowing any environment markers and url (if any) to be
affiliated with the requirement
-* Pull Request #179: Restore use of RequirementParseError
+* BB Pull Request #179: Restore use of RequirementParseError
exception unintentionally dropped in 20.2.
20.2.2
@@ -36,11 +81,12 @@
----
* Changelog now includes release dates and links to PEPs.
-* Pull Request #173: Replace dual PEP 345 _markerlib implementation
+* BB Pull Request #173: Replace dual PEP 345 _markerlib implementation
and PEP 426 implementation of environment marker support from
packaging 16.1 and PEP 508. Fixes Issue #122.
- See also Pull Request #175, Pull Request #168, and
- Pull Request #164. Additionally:
+ See also BB Pull Request #175, BB Pull Request #168, and
+ BB Pull Request #164. Additionally:
+
- ``Requirement.parse`` no longer retains the order of extras.
- ``parse_requirements`` now requires that all versions be
PEP-440 compliant, as revealed in #499. Packages released
@@ -115,7 +161,7 @@
* Issue #486: Correct TypeError when getfilesystemencoding
returns None.
* Issue #139: Clarified the license as MIT.
-* Pull Request #169: Removed special handling of command
+* BB Pull Request #169: Removed special handling of command
spec in scripts for Jython.
19.4.1
@@ -131,7 +177,7 @@
* Issue #341: Correct error in path handling of package data
files in ``build_py`` command when package is empty.
* Distribute #323, Issue #141, Issue #207, and
- Pull Request #167: Another implementation of
+ BB Pull Request #167: Another implementation of
``pkg_resources.WorkingSet`` and ``pkg_resources.Distribution``
that supports replacing an extant package with a new one,
allowing for setup_requires dependencies to supersede installed
@@ -147,8 +193,8 @@
19.2
----
-* Pull Request #163: Add get_command_list method to Distribution.
-* Pull Request #162: Add missing whitespace to multiline string
+* BB Pull Request #163: Add get_command_list method to Distribution.
+* BB Pull Request #162: Add missing whitespace to multiline string
literals.
19.1.1
@@ -204,15 +250,15 @@
----
* Update dependency on certify.
-* Pull Request #160: Improve detection of gui script in
+* BB Pull Request #160: Improve detection of gui script in
``easy_install._adjust_header``.
* Made ``test.test_args`` a non-data property; alternate fix
- for the issue reported in Pull Request #155.
+ for the issue reported in BB Pull Request #155.
* Issue #453: In ``ez_setup`` bootstrap module, unload all
``pkg_resources`` modules following download.
-* Pull Request #158: Honor PEP-488 when excluding
+* BB Pull Request #158: Honor PEP-488 when excluding
files for namespace packages.
-* Issue #419 and Pull Request #144: Add experimental support for
+* Issue #419 and BB Pull Request #144: Add experimental support for
reading the version info from distutils-installed metadata rather
than using the version in the filename.
@@ -314,7 +360,7 @@
However, for systems with this build of setuptools, Cython will be
downloaded on demand.
* Issue #396: Fixed test failure on OS X.
-* Pull Request #136: Remove excessive quoting from shebang headers
+* BB Pull Request #136: Remove excessive quoting from shebang headers
for Jython.
17.1.1
@@ -341,11 +387,11 @@
16.0
----
-* Pull Request #130: Better error messages for errors in
+* BB Pull Request #130: Better error messages for errors in
parsed requirements.
-* Pull Request #133: Removed ``setuptools.tests`` from the
+* BB Pull Request #133: Removed ``setuptools.tests`` from the
installed packages.
-* Pull Request #129: Address deprecation warning due to usage
+* BB Pull Request #129: Address deprecation warning due to usage
of imp module.
15.2
@@ -364,7 +410,7 @@
15.0
----
-* Pull Request #126: DistributionNotFound message now lists the package or
+* BB Pull Request #126: DistributionNotFound message now lists the package or
packages that required it. E.g.::
pkg_resources.DistributionNotFound: The 'colorama>=0.3.1' distribution
was not found and is required by smlib.log.
@@ -405,7 +451,7 @@
14.1
----
-* Pull Request #125: Add ``__ne__`` to Requirement class.
+* BB Pull Request #125: Add ``__ne__`` to Requirement class.
* Various refactoring of easy_install.
14.0
@@ -413,7 +459,7 @@
* Bootstrap script now accepts ``--to-dir`` to customize save directory or
allow for re-use of existing repository of setuptools versions. See
- Pull Request #112 for background.
+ BB Pull Request #112 for background.
* Issue #285: ``easy_install`` no longer will default to installing
packages to the "user site packages" directory if it is itself installed
there. Instead, the user must pass ``--user`` in all cases to install
@@ -438,7 +484,7 @@
13.0
----
-* Issue #356: Back out Pull Request #119 as it requires Setuptools 10 or later
+* Issue #356: Back out BB Pull Request #119 as it requires Setuptools 10 or
later
as the source during an upgrade.
* Removed build_py class from setup.py. According to 892f439d216e, this
functionality was added to support upgrades from old Distribute versions,
@@ -447,7 +493,7 @@
12.4
----
-* Pull Request #119: Restore writing of ``setup_requires`` to metadata
+* BB Pull Request #119: Restore writing of ``setup_requires`` to metadata
(previously added in 8.4 and removed in 9.0).
12.3
@@ -472,7 +518,7 @@
12.1
----
-* Pull Request #118: Soften warning for non-normalized versions in
+* BB Pull Request #118: Soften warning for non-normalized versions in
Distribution.
12.0.5
@@ -613,7 +659,7 @@
8.4
---
-* Pull Request #106: Now write ``setup_requires`` metadata.
+* BB Pull Request #106: Now write ``setup_requires`` metadata.
8.3
---
@@ -630,7 +676,7 @@
8.2
---
-* Pull Request #85: Search egg-base when adding egg-info to manifest.
+* BB Pull Request #85: Search egg-base when adding egg-info to manifest.
8.1
---
@@ -733,9 +779,9 @@
Any users producing distributions with filenames that match those above
case-insensitively, but not case-sensitively, should rename those files in
their repository for better portability.
-* Pull Request #72: When using ``single_version_externally_managed``, the
+* BB Pull Request #72: When using ``single_version_externally_managed``, the
exclusion list now includes Python 3.2 ``__pycache__`` entries.
-* Pull Request #76 and Pull Request #78: lines in top_level.txt are now
+* BB Pull Request #76 and BB Pull Request #78: lines in top_level.txt are now
ordered deterministically.
* Issue #118: The egg-info directory is now no longer included in the list
of outputs.
@@ -934,7 +980,7 @@
3.2
---
-* Pull Request #39: Add support for C++ targets from Cython ``.pyx`` files.
+* BB Pull Request #39: Add support for C++ targets from Cython ``.pyx`` files.
* Issue #162: Update dependency on certifi to 1.0.1.
* Issue #164: Update dependency on wincertstore to 0.2.
@@ -977,7 +1023,7 @@
security vulnerabilities presented by use of tar archives in ez_setup.py.
It also leverages the security features added to ZipFile.extract in Python
2.7.4.
* Issue #65: Removed deprecated Features functionality.
-* Pull Request #28: Remove backport of ``_bytecode_filenames`` which is
+* BB Pull Request #28: Remove backport of ``_bytecode_filenames`` which is
available in Python 2.6 and later, but also has better compatibility with
Python 3 environments.
* Issue #156: Fix spelling of __PYVENV_LAUNCHER__ variable.
@@ -1073,7 +1119,7 @@
* Issue #27: ``easy_install`` will now use credentials from .pypirc if
present for connecting to the package index.
-* Pull Request #21: Omit unwanted newlines in ``package_index._encode_auth``
+* BB Pull Request #21: Omit unwanted newlines in ``package_index._encode_auth``
when the username/password pair length indicates wrapping.
1.3.2
@@ -1415,7 +1461,7 @@
0.6.36
------
-* Pull Request #35: In Buildout #64, it was reported that
+* BB Pull Request #35: In Buildout #64, it was reported that
under Python 3, installation of distutils scripts could attempt to copy
the ``__pycache__`` directory as a file, causing an error, apparently only
under Windows. Easy_install now skips all directories when processing
@@ -1490,7 +1536,7 @@
0.6.29
------
-* Pull Request #14: Honor file permissions in zip files.
+* BB Pull Request #14: Honor file permissions in zip files.
* Distribute #327: Merged pull request #24 to fix a dependency problem with
pip.
* Merged pull request #23 to fix https://github.com/pypa/virtualenv/issues/301.
* If Sphinx is installed, the `upload_docs` command now runs `build_sphinx`
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/setuptools-20.3.1/PKG-INFO
new/setuptools-20.6.7/PKG-INFO
--- old/setuptools-20.3.1/PKG-INFO 2016-03-18 16:14:06.000000000 +0100
+++ new/setuptools-20.6.7/PKG-INFO 2016-03-31 16:49:43.000000000 +0200
@@ -1,8 +1,8 @@
Metadata-Version: 1.1
Name: setuptools
-Version: 20.3.1
+Version: 20.6.7
Summary: Easily download, build, install, upgrade, and uninstall Python
packages
-Home-page: https://bitbucket.org/pypa/setuptools
+Home-page: https://github.com/pypa/setuptools
Author: Python Packaging Authority
Author-email: [email protected]
License: UNKNOWN
@@ -26,7 +26,7 @@
Setuptools requires Python 2.6 or later. To install setuptools
on Python 2.4 or Python 2.5, use the `bootstrap script for Setuptools
1.x
-
<https://bitbucket.org/pypa/setuptools/raw/bootstrap-py24/ez_setup.py>`_.
+
<https://raw.githubusercontent.com/pypa/setuptools/bootstrap-py24/ez_setup.py>`_.
The link provided to ez_setup.py is a bookmark to bootstrap script for
the
latest known stable release.
@@ -184,7 +184,7 @@
*tested* patches to correct problems or add features, you may submit
them to
the `setuptools bug tracker`_.
- .. _setuptools bug tracker:
https://bitbucket.org/pypa/setuptools/issues
+ .. _setuptools bug tracker: https://github.com/pypa/setuptools/issues
.. _The Internal Structure of Python Eggs:
https://pythonhosted.org/setuptools/formats.html
.. _The setuptools Developer's Guide:
https://pythonhosted.org/setuptools/setuptools.html
.. _The pkg_resources API reference:
https://pythonhosted.org/setuptools/pkg_resources.html
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/setuptools-20.3.1/README.txt
new/setuptools-20.6.7/README.txt
--- old/setuptools-20.3.1/README.txt 2016-02-07 15:25:06.000000000 +0100
+++ new/setuptools-20.6.7/README.txt 2016-03-31 16:48:15.000000000 +0200
@@ -18,7 +18,7 @@
Setuptools requires Python 2.6 or later. To install setuptools
on Python 2.4 or Python 2.5, use the `bootstrap script for Setuptools 1.x
-<https://bitbucket.org/pypa/setuptools/raw/bootstrap-py24/ez_setup.py>`_.
+<https://raw.githubusercontent.com/pypa/setuptools/bootstrap-py24/ez_setup.py>`_.
The link provided to ez_setup.py is a bookmark to bootstrap script for the
latest known stable release.
@@ -176,7 +176,7 @@
*tested* patches to correct problems or add features, you may submit them to
the `setuptools bug tracker`_.
-.. _setuptools bug tracker: https://bitbucket.org/pypa/setuptools/issues
+.. _setuptools bug tracker: https://github.com/pypa/setuptools/issues
.. _The Internal Structure of Python Eggs:
https://pythonhosted.org/setuptools/formats.html
.. _The setuptools Developer's Guide:
https://pythonhosted.org/setuptools/setuptools.html
.. _The pkg_resources API reference:
https://pythonhosted.org/setuptools/pkg_resources.html
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/setuptools-20.3.1/docs/conf.py
new/setuptools-20.6.7/docs/conf.py
--- old/setuptools-20.3.1/docs/conf.py 2016-02-25 03:42:28.000000000 +0100
+++ new/setuptools-20.6.7/docs/conf.py 2016-03-31 16:48:15.000000000 +0200
@@ -208,11 +208,11 @@
replace=[
dict(
pattern=r"(Issue )?#(?P<issue>\d+)",
- url='{BB}/pypa/setuptools/issue/{issue}',
+ url='{GH}/pypa/setuptools/issues/{issue}',
),
dict(
- pattern=r"Pull Request ?#(?P<pull_request>\d+)",
-
url='{BB}/pypa/setuptools/pull-request/{pull_request}',
+ pattern=r"BB Pull Request
?#(?P<bb_pull_request>\d+)",
+
url='{BB}/pypa/setuptools/pull-request/{bb_pull_request}',
),
dict(
pattern=r"Distribute #(?P<distribute>\d+)",
@@ -255,8 +255,8 @@
url='https://www.python.org/dev/peps/pep-{pep_number:0>4}/',
),
dict(
-
pattern=r"^(?m)((?P<scm_version>\d+(\.\d+){1,2}))\n[-=]+\n",
- with_scm="{text}\n{rev[timestamp]}\n",
+
pattern=r"^(?m)((?P<scm_version>v?\d+(\.\d+){1,2}))\n[-=]+\n",
+ with_scm="{text}\n{rev[timestamp]:%d %b %Y}\n",
),
],
),
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/setuptools-20.3.1/docs/developer-guide.txt
new/setuptools-20.6.7/docs/developer-guide.txt
--- old/setuptools-20.3.1/docs/developer-guide.txt 2016-02-07
15:25:06.000000000 +0100
+++ new/setuptools-20.6.7/docs/developer-guide.txt 2016-03-31
16:48:15.000000000 +0200
@@ -23,10 +23,10 @@
Project Management
------------------
-Setuptools is maintained primarily in Bitbucket at `this home
-<https://bitbucket.org/pypa/setuptools>`_. Setuptools is maintained under the
+Setuptools is maintained primarily in Github at `this home
+<https://github.com/pypa/setuptools>`_. Setuptools is maintained under the
Python Packaging Authority (PyPA) with several core contributors. All bugs
-for Setuptools are filed and the canonical source is maintained in Bitbucket.
+for Setuptools are filed and the canonical source is maintained in Github.
User support and discussions are done through the issue tracker (for specific)
issues, through the distutils-sig mailing list, or on IRC (Freenode) at
@@ -44,7 +44,7 @@
ticket already exists for your issue. If not, create one. Try to think from
the perspective of the reader. Explain what behavior you expected, what you
got instead, and what factors might have contributed to the unexpected
-behavior. In Bitbucket, surround a block of code or traceback with the triple
+behavior. In Github, surround a block of code or traceback with the triple
backtick "\`\`\`" so that it is formatted nicely.
Filing a ticket provides a forum for justification, discussion, and
@@ -61,17 +61,17 @@
Source Code
-----------
-Grab the code at Bitbucket::
+Grab the code at Github::
- $ hg clone https://bitbucket.org/pypa/setuptools
+ $ git checkout https://github.com/pypa/setuptools
If you want to contribute changes, we recommend you fork the repository on
-Bitbucket, commit the changes to your repository, and then make a pull request
-on Bitbucket. If you make some changes, don't forget to:
+Github, commit the changes to your repository, and then make a pull request
+on Github. If you make some changes, don't forget to:
- add a note in CHANGES.txt
-Please commit all changes in the 'default' branch against the latest available
+Please commit all changes in the 'master' branch against the latest available
commit or for bug-fixes, against an earlier commit or release in which the
bug occurred.
@@ -79,12 +79,11 @@
generally prefers Git-style branches, so use Mercurial bookmarks or Git
branches or multiple forks to maintain separate efforts.
-Setuptools also maintains an unofficial `Git mirror in Github
-<https://github.com/jaraco/setuptools>`_. Contributors are welcome to submit
-pull requests here, but because they are not integrated with the Bitbucket
-Issue tracker, linking pull requests to tickets is more difficult. The
-Continuous Integration tests that validate every release are run from this
-mirror.
+The Continuous Integration tests that validate every release are run
+from this repository.
+
+For posterity, the old `Bitbucket mirror
+<https://bitbucket.org/pypa/setuptools>`_ is available.
-------
Testing
@@ -104,10 +103,7 @@
Semantic Versioning
-------------------
-Setuptools follows ``semver`` with some exceptions:
-
-- Uses two-segment version when three segment version ends in zero
-- Omits 'v' prefix for tags.
+Setuptools follows ``semver``.
.. explain value of reflecting meaning in versions.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/setuptools-20.3.1/docs/releases.txt
new/setuptools-20.6.7/docs/releases.txt
--- old/setuptools-20.3.1/docs/releases.txt 2016-02-07 15:25:06.000000000
+0100
+++ new/setuptools-20.6.7/docs/releases.txt 2016-03-31 16:48:15.000000000
+0200
@@ -3,19 +3,14 @@
===============
In order to allow for rapid, predictable releases, Setuptools uses a
-mechanical technique for releases. The release script, ``release.py`` in the
-repository, defines the details of the releases, and is executed by the
-`jaraco.packaging <https://bitbucket.org/jaraco/jaraco.packaging>`_ release
-module. The script does some checks (some interactive) and fully automates
-the release process.
-
-A Setuptools release manager must have maintainer access on PyPI to the
-project and administrative access to the Bitbucket project.
-
-To make a release, run the following from a Mercurial checkout at the
-revision slated for release::
-
- python -m jaraco.packaging.release
+mechanical technique for releases, enacted by Travis following a
+successful build of a tagged release per
+`PyPI deployment <https://docs.travis-ci.com/user/deployment/pypi>`_.
+
+To cut a release, install and run ``bumpversion {part}`` where ``part``
+is major, minor, or patch based on the scope of the changes in the
+release. Then, push the commits to the master branch. If tests pass,
+the release will be uploaded to PyPI.
Bootstrap Bookmark
------------------
@@ -23,7 +18,7 @@
Setuptools has a bootstrap script (ez_setup.py) which is hosted in the
repository and must be updated with each release (to bump the default version).
The "published" version of the script is the one indicated by the ``bootstrap``
-bookmark (Mercurial) or branch (Git).
+branch.
Therefore, the latest bootstrap script can be retrieved by checking out the
repository at that bookmark. It's also possible to get the bootstrap script for
@@ -57,7 +52,5 @@
Release Managers
----------------
-Jason R. Coombs is the primary release manager. Additionally, the following
-people have access to create releases:
-
-- Matthew Iversen (Ivoz)
+Additionally, anyone with push access to the master branch has access to cut
+releases.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/setuptools-20.3.1/docs/setuptools.txt
new/setuptools-20.6.7/docs/setuptools.txt
--- old/setuptools-20.3.1/docs/setuptools.txt 2016-02-18 04:07:05.000000000
+0100
+++ new/setuptools-20.6.7/docs/setuptools.txt 2016-03-31 16:48:15.000000000
+0200
@@ -258,10 +258,9 @@
``include_package_data``
If set to ``True``, this tells ``setuptools`` to automatically include any
- data files it finds inside your package directories, that are either under
- CVS or Subversion control, or which are specified by your ``MANIFEST.in``
- file. For more information, see the section below on `Including Data
- Files`_.
+ data files it finds inside your package directories that are specified by
+ your ``MANIFEST.in`` file. For more information, see the section below on
+ `Including Data Files`_.
``exclude_package_data``
A dictionary mapping package names to lists of glob patterns that should
@@ -785,17 +784,15 @@
)
This tells setuptools to install any data files it finds in your packages.
-The data files must be under CVS or Subversion control, or else they must be
-specified via the distutils' ``MANIFEST.in`` file. (They can also be tracked
-by another revision control system, using an appropriate plugin. See the
-section below on `Adding Support for Other Revision Control Systems`_ for
-information on how to write such plugins.)
-
-If the data files are not under version control, or are not in a supported
-version control system, or if you want finer-grained control over what files
-are included (for example, if you have documentation files in your package
-directories and want to exclude them from installation), then you can also use
-the ``package_data`` keyword, e.g.::
+The data files must be specified via the distutils' ``MANIFEST.in`` file.
+(They can also be tracked by a revision control system, using an appropriate
+plugin. See the section below on `Adding Support for Revision Control
+Systems`_ for information on how to write such plugins.)
+
+If you want finer-grained control over what files are included (for example,
+if you have documentation files in your package directories and want to exclude
+them from installation), then you can also use the ``package_data`` keyword,
+e.g.::
from setuptools import setup, find_packages
setup(
@@ -853,8 +850,7 @@
Python 2.4; there is `some documentation for the feature`__ available on the
python.org website. If using the setuptools-specific ``include_package_data``
argument, files specified by ``package_data`` will *not* be automatically
-added to the manifest unless they are tracked by a supported version control
-system, or are listed in the MANIFEST.in file.)
+added to the manifest unless they are listed in the MANIFEST.in file.)
__ http://docs.python.org/dist/node11.html
@@ -887,8 +883,7 @@
In summary, the three options allow you to:
``include_package_data``
- Accept all data files and directories matched by ``MANIFEST.in`` or found
- in source control.
+ Accept all data files and directories matched by ``MANIFEST.in``.
``package_data``
Specify additional patterns to match files and directories that may or may
@@ -1231,15 +1226,14 @@
target audience isn't able to compile packages (e.g. most Windows users)
and your package or some of its dependencies include C code.
-Subversion or CVS Users and Co-Developers
+Revision Control System Users and Co-Developers
Users and co-developers who are tracking your in-development code using
- CVS, Subversion, or some other revision control system should probably read
- this manual's sections regarding such development. Alternately, you may
- wish to create a quick-reference guide containing the tips from this manual
- that apply to your particular situation. For example, if you recommend
- that people use ``setup.py develop`` when tracking your in-development
- code, you should let them know that this needs to be run after every update
- or commit.
+ a revision control system should probably read this manual's sections
+ regarding such development. Alternately, you may wish to create a
+ quick-reference guide containing the tips from this manual that apply to
+ your particular situation. For example, if you recommend that people use
+ ``setup.py develop`` when tracking your in-development code, you should let
+ them know that this needs to be run after every update or commit.
Similarly, if you remove modules or data files from your project, you
should remind them to run ``setup.py clean --all`` and delete any obsolete
@@ -1468,18 +1462,11 @@
-------------------------------
``setuptools`` enhances the distutils' default algorithm for source file
-selection, so that all files managed by CVS or Subversion in your project tree
-are included in any source distribution you build. This is a big improvement
-over having to manually write a ``MANIFEST.in`` file and try to keep it in
-sync with your project. So, if you are using CVS or Subversion, and your
-source distributions only need to include files that you're tracking in
-revision control, don't create a ``MANIFEST.in`` file for your project.
-(And, if you already have one, you might consider deleting it the next time
-you would otherwise have to change it.)
-
-(NOTE: other revision control systems besides CVS and Subversion can be
-supported using plugins; see the section below on `Adding Support for Other
-Revision Control Systems`_ for information on how to write such plugins.)
+selection with pluggable endpoints for looking up files to include. If you are
+using a revision control system, and your source distributions only need to
+include files that you're tracking in revision control, use a corresponding
+plugin instead of writing a ``MANIFEST.in`` file. See the section below on
+`Adding Support for Revision Control Systems`_ for information on plugins.
If you need to include automatically generated files, or files that are kept in
an unsupported revision control system, you'll need to create a ``MANIFEST.in``
@@ -1501,12 +1488,6 @@
all practical purposes, you'll probably use only the ``--formats`` option, if
you use any option at all.
-(By the way, if you're using some other revision control system, you might
-consider creating and publishing a `revision control plugin for setuptools`_.)
-
-
-.. _revision control plugin for setuptools: `Adding Support for Other Revision
Control Systems`_
-
Making your package available for EasyInstall
---------------------------------------------
@@ -1687,9 +1668,10 @@
code generated by Pyrex, as well as your original ``.pyx`` files. This means
that you will probably want to include current ``.c`` files in your revision
control system, rebuilding them whenever you check changes in for the ``.pyx``
-source files. This will ensure that people tracking your project in CVS or
-Subversion will be able to build it even if they don't have Pyrex installed,
-and that your source releases will be similarly usable with or without Pyrex.
+source files. This will ensure that people tracking your project in a revision
+control system will be able to build it even if they don't have Pyrex
+installed, and that your source releases will be similarly usable with or
+without Pyrex.
-----------------
@@ -2569,15 +2551,21 @@
those methods' docstrings for more details.
-Adding Support for Other Revision Control Systems
+Adding Support for Revision Control Systems
-------------------------------------------------
-If you would like to create a plugin for ``setuptools`` to find files in
-source control systems, you can do so by adding an
-entry point to the ``setuptools.file_finders`` group. The entry point should
-be a function accepting a single directory name, and should yield
-all the filenames within that directory (and any subdirectories thereof) that
-are under revision control.
+If the files you want to include in the source distribution are tracked using
+Git, Mercurial or SVN, you can use the following packages to achieve that:
+
+- Git and Mercurial: `setuptools_scm
<https://pypi.python.org/pypi/setuptools_scm>`_
+- SVN: `setuptools_svn <https://pypi.python.org/pypi/setuptools_svn>`_
+
+If you would like to create a plugin for ``setuptools`` to find files tracked
+by another revision control system, you can do so by adding an entry point to
+the ``setuptools.file_finders`` group. The entry point should be a function
+accepting a single directory name, and should yield all the filenames within
+that directory (and any subdirectories thereof) that are under revision
+control.
For example, if you were going to create a plugin for a revision control system
called "foobar", you would write a function something like this:
@@ -2670,5 +2658,5 @@
set of steps to reproduce.
.. _distutils-sig mailing list: http://mail.python.org/pipermail/distutils-sig/
-.. _setuptools bug tracker: https://bitbucket.org/pypa/setuptools/
+.. _setuptools bug tracker: https://github.com/pypa/setuptools/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/setuptools-20.3.1/pkg_resources/__init__.py
new/setuptools-20.6.7/pkg_resources/__init__.py
--- old/setuptools-20.3.1/pkg_resources/__init__.py 2016-03-15
22:07:38.000000000 +0100
+++ new/setuptools-20.6.7/pkg_resources/__init__.py 2016-03-31
16:48:15.000000000 +0200
@@ -28,8 +28,6 @@
import stat
import functools
import pkgutil
-import token
-import symbol
import operator
import platform
import collections
@@ -67,11 +65,6 @@
except ImportError:
importlib_machinery = None
-try:
- import parser
-except ImportError:
- pass
-
from pkg_resources.extern import packaging
__import__('pkg_resources.extern.packaging.version')
__import__('pkg_resources.extern.packaging.specifiers')
@@ -809,6 +802,12 @@
if req in processed:
# Ignore cyclic or redundant dependencies
continue
+ # If the req has a marker, evaluate it -- skipping the req if
+ # it evaluates to False.
+ # https://github.com/pypa/setuptools/issues/523
+ _issue_523_bypass = True
+ if not _issue_523_bypass and req.marker and not
req.marker.evaluate():
+ continue
dist = best.get(req.key)
if dist is None:
# Find the best distribution and add it to the map
@@ -2028,12 +2027,13 @@
corresponding to their sys.path order
"""
sys_path = [_normalize_cached(p) for p in sys.path]
- def position_in_sys_path(p):
+ def position_in_sys_path(path):
"""
Return the ordinal of the path based on its position in sys.path
"""
- parts = p.split(os.sep)
- parts = parts[:-(package_name.count('.') + 1)]
+ path_parts = path.split(os.sep)
+ module_parts = package_name.count('.') + 1
+ parts = path_parts[:-module_parts]
return sys_path.index(_normalize_cached(os.sep.join(parts)))
orig_path.sort(key=position_in_sys_path)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/setuptools-20.3.1/pkg_resources/_vendor/packaging/__about__.py
new/setuptools-20.6.7/pkg_resources/_vendor/packaging/__about__.py
--- old/setuptools-20.3.1/pkg_resources/_vendor/packaging/__about__.py
2016-03-15 07:23:33.000000000 +0100
+++ new/setuptools-20.6.7/pkg_resources/_vendor/packaging/__about__.py
2016-03-31 16:48:15.000000000 +0200
@@ -12,7 +12,7 @@
__summary__ = "Core utilities for Python packages"
__uri__ = "https://github.com/pypa/packaging";
-__version__ = "16.5"
+__version__ = "16.6"
__author__ = "Donald Stufft and individual contributors"
__email__ = "[email protected]"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/setuptools-20.3.1/pkg_resources/_vendor/packaging/markers.py
new/setuptools-20.6.7/pkg_resources/_vendor/packaging/markers.py
--- old/setuptools-20.3.1/pkg_resources/_vendor/packaging/markers.py
2016-03-15 07:23:33.000000000 +0100
+++ new/setuptools-20.6.7/pkg_resources/_vendor/packaging/markers.py
2016-03-31 16:48:15.000000000 +0200
@@ -73,9 +73,14 @@
L("python_version") |
L("sys_platform") |
L("os_name") |
+ L("os.name") | # PEP-345
+ L("sys.platform") | # PEP-345
+ L("platform.version") | # PEP-345
+ L("platform.machine") | # PEP-345
+ L("platform.python_implementation") | # PEP-345
L("extra")
)
-VARIABLE.setParseAction(lambda s, l, t: Variable(t[0]))
+VARIABLE.setParseAction(lambda s, l, t: Variable(t[0].replace('.', '_')))
VERSION_CMP = (
L("===") |
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/setuptools-20.3.1/pkg_resources/_vendor/vendored.txt
new/setuptools-20.6.7/pkg_resources/_vendor/vendored.txt
--- old/setuptools-20.3.1/pkg_resources/_vendor/vendored.txt 2016-03-15
07:23:27.000000000 +0100
+++ new/setuptools-20.6.7/pkg_resources/_vendor/vendored.txt 2016-03-31
16:48:15.000000000 +0200
@@ -1,3 +1,3 @@
-packaging==16.5
+packaging==16.6
pyparsing==2.0.6
six==1.10.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/setuptools-20.3.1/pkg_resources/tests/test_resources.py
new/setuptools-20.6.7/pkg_resources/tests/test_resources.py
--- old/setuptools-20.3.1/pkg_resources/tests/test_resources.py 2016-03-15
22:07:38.000000000 +0100
+++ new/setuptools-20.6.7/pkg_resources/tests/test_resources.py 2016-03-31
16:48:15.000000000 +0200
@@ -182,6 +182,16 @@
msg = 'Foo 0.9 is installed but Foo==1.2 is required'
assert vc.value.report() == msg
+ @pytest.mark.xfail(reason="Functionality disabled; see #523")
+ def test_environment_markers(self):
+ """
+ Environment markers are evaluated at resolution time.
+ """
+ ad = pkg_resources.Environment([])
+ ws = WorkingSet([])
+ res = ws.resolve(parse_requirements("Foo;python_version<'2'"), ad)
+ assert list(res) == []
+
def testDistroDependsOptions(self):
d = self.distRequires("""
Twisted>=1.5
@@ -717,7 +727,7 @@
sys.path is imported, and that the namespace package's __path__ is in
the correct order.
- Regression test for https://bitbucket.org/pypa/setuptools/issues/207
+ Regression test for https://github.com/pypa/setuptools/issues/207
"""
tmpdir = symlinked_tmpdir
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/setuptools-20.3.1/release.py
new/setuptools-20.6.7/release.py
--- old/setuptools-20.3.1/release.py 2016-02-18 04:07:05.000000000 +0100
+++ new/setuptools-20.6.7/release.py 1970-01-01 01:00:00.000000000 +0100
@@ -1,20 +0,0 @@
-"""
-Setuptools is released using 'jaraco.packaging.release'. To make a release,
-install jaraco.packaging and run 'python -m jaraco.packaging.release'
-"""
-
-import os
-
-import pkg_resources
-
-pkg_resources.require('jaraco.packaging>=2.0')
-pkg_resources.require('wheel')
-
-files_with_versions = 'setuptools/version.py',
-
-# bdist_wheel must be included or pip will break
-dist_commands = 'sdist', 'bdist_wheel'
-
-test_info = "Travis-CI tests: http://travis-ci.org/#!/jaraco/setuptools";
-
-os.environ["SETUPTOOLS_INSTALL_WINDOWS_SPECIFIC_FILES"] = "1"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/setuptools-20.3.1/setup.cfg
new/setuptools-20.6.7/setup.cfg
--- old/setuptools-20.3.1/setup.cfg 2016-03-18 16:14:06.000000000 +0100
+++ new/setuptools-20.6.7/setup.cfg 2016-03-31 16:49:43.000000000 +0200
@@ -1,10 +1,16 @@
+[bumpversion]
+current_version = 20.6.7
+commit = True
+tag = True
+
[egg_info]
tag_build =
tag_date = 0
tag_svn_revision = 0
[aliases]
-release = egg_info -RDb ''
+clean_egg_info = egg_info -RDb ''
+release = clean_egg_info sdist bdist_wheel build_sphinx
source = register sdist binary
binary = bdist_egg upload --show-response
test = pytest
@@ -23,3 +29,5 @@
[wheel]
universal = 1
+[bumpversion:file:setup.py]
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/setuptools-20.3.1/setup.py
new/setuptools-20.6.7/setup.py
--- old/setuptools-20.3.1/setup.py 2016-02-25 03:42:28.000000000 +0100
+++ new/setuptools-20.6.7/setup.py 2016-03-31 16:48:15.000000000 +0200
@@ -22,11 +22,6 @@
SETUP_COMMANDS = command_ns['__all__']
-main_ns = {}
-ver_path = convert_path('setuptools/version.py')
-with open(ver_path) as ver_file:
- exec(ver_file.read(), main_ns)
-
import setuptools
scripts = []
@@ -66,19 +61,21 @@
needs_pytest = set(['ptr', 'pytest', 'test']).intersection(sys.argv)
pytest_runner = ['pytest-runner'] if needs_pytest else []
-needs_sphinx = set(['build_sphinx', 'upload_docs']).intersection(sys.argv)
-sphinx = ['sphinx', 'rst.linker>=1.4'] if needs_sphinx else []
+needs_sphinx = set(['build_sphinx', 'upload_docs',
'release']).intersection(sys.argv)
+sphinx = ['sphinx', 'rst.linker>=1.5'] if needs_sphinx else []
+needs_wheel = set(['release', 'bdist_wheel']).intersection(sys.argv)
+wheel = ['wheel'] if needs_wheel else []
setup_params = dict(
name="setuptools",
- version=main_ns['__version__'],
+ version="20.6.7",
description="Easily download, build, install, upgrade, and uninstall "
"Python packages",
author="Python Packaging Authority",
author_email="[email protected]",
long_description=long_description,
keywords="CPAN PyPI distutils eggs package management",
- url="https://bitbucket.org/pypa/setuptools";,
+ url="https://github.com/pypa/setuptools";,
src_root=src_root,
packages=setuptools.find_packages(exclude=['*.tests']),
package_data=package_data,
@@ -161,7 +158,7 @@
'pytest>=2.8',
] + (['mock'] if sys.version_info[:2] < (3, 3) else []),
setup_requires=[
- ] + sphinx + pytest_runner,
+ ] + sphinx + pytest_runner + wheel,
)
if __name__ == '__main__':
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/setuptools-20.3.1/setuptools/command/easy_install.py
new/setuptools-20.6.7/setuptools/command/easy_install.py
--- old/setuptools-20.3.1/setuptools/command/easy_install.py 2016-03-15
22:07:38.000000000 +0100
+++ new/setuptools-20.6.7/setuptools/command/easy_install.py 2016-03-31
16:48:15.000000000 +0200
@@ -780,7 +780,7 @@
There are a couple of template scripts in the package. This
function loads one of them and prepares it for use.
"""
- # See https://bitbucket.org/pypa/setuptools/issue/134 for info
+ # See https://github.com/pypa/setuptools/issues/134 for info
# on script file naming and downstream issues with SVR4
name = 'script.tmpl'
if dev_path:
@@ -1762,7 +1762,7 @@
# * Does not support the dict.pop() method, forcing us to use the
# get/del patterns instead. For more detailed information see the
# following links:
- #
https://bitbucket.org/pypa/setuptools/issue/202/more-robust-zipimporter-cache-invalidation#comment-10495960
+ #
https://github.com/pypa/setuptools/issues/202#issuecomment-202913420
#
https://bitbucket.org/pypy/pypy/src/dd07756a34a41f674c0cacfbc8ae1d4cc9ea2ae4/pypy/module/zipimport/interp_zipimport.py#cl-99
old_entry = cache[p]
del cache[p]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/setuptools-20.3.1/setuptools/command/install.py
new/setuptools-20.6.7/setuptools/command/install.py
--- old/setuptools-20.3.1/setuptools/command/install.py 2016-01-30
18:43:56.000000000 +0100
+++ new/setuptools-20.6.7/setuptools/command/install.py 2016-03-31
16:48:15.000000000 +0200
@@ -8,7 +8,7 @@
import setuptools
# Prior to numpy 1.9, NumPy relies on the '_install' name, so provide it for
-# now. See https://bitbucket.org/pypa/setuptools/issue/199/
+# now. See https://github.com/pypa/setuptools/issues/199/
_install = orig.install
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/setuptools-20.3.1/setuptools/dist.py
new/setuptools-20.6.7/setuptools/dist.py
--- old/setuptools-20.3.1/setuptools/dist.py 2016-02-25 14:45:35.000000000
+0100
+++ new/setuptools-20.6.7/setuptools/dist.py 2016-03-31 16:48:15.000000000
+0200
@@ -720,7 +720,7 @@
"""
**deprecated** -- The `Feature` facility was never completely implemented
or supported, `has reported issues
- <https://bitbucket.org/pypa/setuptools/issue/58>`_ and will be removed in
+ <https://github.com/pypa/setuptools/issues/58>`_ and will be removed in
a future version.
A subset of the distribution that can be excluded if unneeded/wanted
@@ -777,7 +777,7 @@
def warn_deprecated():
warnings.warn(
"Features are deprecated and will be removed in a future "
- "version. See http://bitbucket.org/pypa/setuptools/65.";,
+ "version. See https://github.com/pypa/setuptools/issues/65.";,
DeprecationWarning,
stacklevel=3,
)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/setuptools-20.3.1/setuptools/tests/test_egg_info.py
new/setuptools-20.6.7/setuptools/tests/test_egg_info.py
--- old/setuptools-20.3.1/setuptools/tests/test_egg_info.py 2016-02-18
04:07:05.000000000 +0100
+++ new/setuptools-20.6.7/setuptools/tests/test_egg_info.py 2016-03-31
16:48:15.000000000 +0200
@@ -1,4 +1,5 @@
import os
+import glob
import stat
from setuptools.extern.six.moves import map
@@ -89,17 +90,64 @@
sources_txt = os.path.join(egg_info_dir, 'SOURCES.txt')
assert 'docs/usage.rst' in open(sources_txt).read().split('\n')
- def _run_install_command(self, tmpdir_cwd, env):
+ def _setup_script_with_requires(self, requires_line):
+ setup_script = DALS("""
+ from setuptools import setup
+
+ setup(
+ name='foo',
+ %s
+ zip_safe=False,
+ )
+ """ % requires_line)
+ build_files({
+ 'setup.py': setup_script,
+ })
+
+ @pytest.mark.xfail(reason="Functionality disabled; see #523")
+ def test_install_requires_with_markers(self, tmpdir_cwd, env):
+ self._setup_script_with_requires(
+ """install_requires=["barbazquux;python_version<'2'"],""")
+ self._run_install_command(tmpdir_cwd, env)
+ egg_info_dir = self._find_egg_info_files(env.paths['lib']).base
+ requires_txt = os.path.join(egg_info_dir, 'requires.txt')
+ assert "barbazquux;python_version<'2'" in open(
+ requires_txt).read().split('\n')
+ assert glob.glob(os.path.join(env.paths['lib'], 'barbazquux*')) == []
+
+ @pytest.mark.xfail(reason="Functionality disabled; see #523")
+ def test_setup_requires_with_markers(self, tmpdir_cwd, env):
+ self._setup_script_with_requires(
+ """setup_requires=["barbazquux;python_version<'2'"],""")
+ self._run_install_command(tmpdir_cwd, env)
+ assert glob.glob(os.path.join(env.paths['lib'], 'barbazquux*')) == []
+
+ @pytest.mark.xfail(reason="Functionality disabled; see #523")
+ def test_tests_require_with_markers(self, tmpdir_cwd, env):
+ self._setup_script_with_requires(
+ """tests_require=["barbazquux;python_version<'2'"],""")
+ self._run_install_command(
+ tmpdir_cwd, env, cmd=['test'], output="Ran 0 tests in")
+ assert glob.glob(os.path.join(env.paths['lib'], 'barbazquux*')) == []
+
+ def test_extra_requires_with_markers(self, tmpdir_cwd, env):
+ self._setup_script_with_requires(
+ """extra_requires={":python_version<'2'": ["barbazquux"]},""")
+ self._run_install_command(tmpdir_cwd, env)
+ assert glob.glob(os.path.join(env.paths['lib'], 'barbazquux*')) == []
+
+ def _run_install_command(self, tmpdir_cwd, env, cmd=None, output=None):
environ = os.environ.copy().update(
HOME=env.paths['home'],
)
- cmd = [
- 'install',
- '--home', env.paths['home'],
- '--install-lib', env.paths['lib'],
- '--install-scripts', env.paths['scripts'],
- '--install-data', env.paths['data'],
- ]
+ if cmd is None:
+ cmd = [
+ 'install',
+ '--home', env.paths['home'],
+ '--install-lib', env.paths['lib'],
+ '--install-scripts', env.paths['scripts'],
+ '--install-data', env.paths['data'],
+ ]
code, data = environment.run_setup_py(
cmd=cmd,
pypath=os.pathsep.join([env.paths['lib'], str(tmpdir_cwd)]),
@@ -108,6 +156,8 @@
)
if code:
raise AssertionError(data)
+ if output:
+ assert output in data
def _find_egg_info_files(self, root):
class DirList(list):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/setuptools-20.3.1/setuptools/version.py
new/setuptools-20.6.7/setuptools/version.py
--- old/setuptools-20.3.1/setuptools/version.py 2016-03-18 16:13:59.000000000
+0100
+++ new/setuptools-20.6.7/setuptools/version.py 2016-03-31 16:48:15.000000000
+0200
@@ -1 +1,6 @@
-__version__ = '20.3.1'
+import pkg_resources
+
+try:
+ __version__ = pkg_resources.require('setuptools')[0].version
+except Exception:
+ __version__ = 'unknown'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/setuptools-20.3.1/setuptools.egg-info/PKG-INFO
new/setuptools-20.6.7/setuptools.egg-info/PKG-INFO
--- old/setuptools-20.3.1/setuptools.egg-info/PKG-INFO 2016-03-18
16:14:03.000000000 +0100
+++ new/setuptools-20.6.7/setuptools.egg-info/PKG-INFO 2016-03-31
16:49:43.000000000 +0200
@@ -1,8 +1,8 @@
Metadata-Version: 1.1
Name: setuptools
-Version: 20.3.1
+Version: 20.6.7
Summary: Easily download, build, install, upgrade, and uninstall Python
packages
-Home-page: https://bitbucket.org/pypa/setuptools
+Home-page: https://github.com/pypa/setuptools
Author: Python Packaging Authority
Author-email: [email protected]
License: UNKNOWN
@@ -26,7 +26,7 @@
Setuptools requires Python 2.6 or later. To install setuptools
on Python 2.4 or Python 2.5, use the `bootstrap script for Setuptools
1.x
-
<https://bitbucket.org/pypa/setuptools/raw/bootstrap-py24/ez_setup.py>`_.
+
<https://raw.githubusercontent.com/pypa/setuptools/bootstrap-py24/ez_setup.py>`_.
The link provided to ez_setup.py is a bookmark to bootstrap script for
the
latest known stable release.
@@ -184,7 +184,7 @@
*tested* patches to correct problems or add features, you may submit
them to
the `setuptools bug tracker`_.
- .. _setuptools bug tracker:
https://bitbucket.org/pypa/setuptools/issues
+ .. _setuptools bug tracker: https://github.com/pypa/setuptools/issues
.. _The Internal Structure of Python Eggs:
https://pythonhosted.org/setuptools/formats.html
.. _The setuptools Developer's Guide:
https://pythonhosted.org/setuptools/setuptools.html
.. _The pkg_resources API reference:
https://pythonhosted.org/setuptools/pkg_resources.html
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/setuptools-20.3.1/setuptools.egg-info/SOURCES.txt
new/setuptools-20.6.7/setuptools.egg-info/SOURCES.txt
--- old/setuptools-20.3.1/setuptools.egg-info/SOURCES.txt 2016-03-18
16:14:06.000000000 +0100
+++ new/setuptools-20.6.7/setuptools.egg-info/SOURCES.txt 2016-03-31
16:49:43.000000000 +0200
@@ -9,7 +9,6 @@
msvc-build-launcher.cmd
pavement.py
pytest.ini
-release.py
setup.cfg
setup.py
docs/Makefile
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/setuptools-20.3.1/setuptools.egg-info/entry_points.txt
new/setuptools-20.6.7/setuptools.egg-info/entry_points.txt
--- old/setuptools-20.3.1/setuptools.egg-info/entry_points.txt 2016-03-18
16:14:03.000000000 +0100
+++ new/setuptools-20.6.7/setuptools.egg-info/entry_points.txt 2016-03-31
16:49:43.000000000 +0200
@@ -1,6 +1,6 @@
[console_scripts]
easy_install = setuptools.command.easy_install:main
-easy_install-3.5 = setuptools.command.easy_install:main
+easy_install-2.7 = setuptools.command.easy_install:main
[distutils.commands]
alias = setuptools.command.alias:alias
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/setuptools-20.3.1/tests/manual_test.py
new/setuptools-20.6.7/tests/manual_test.py
--- old/setuptools-20.3.1/tests/manual_test.py 2016-02-07 15:25:06.000000000
+0100
+++ new/setuptools-20.6.7/tests/manual_test.py 2016-03-31 16:48:15.000000000
+0200
@@ -43,10 +43,8 @@
_VARS = {'base': '.',
'py_version_short': PYVER}
-if sys.platform == 'win32':
- PURELIB = INSTALL_SCHEMES['nt']['purelib']
-else:
- PURELIB = INSTALL_SCHEMES['unix_prefix']['purelib']
+scheme = 'nt' if sys.platform == 'win32' else 'unix_prefix'
+PURELIB = INSTALL_SCHEMES[scheme]['purelib']
@tempdir
