Hello community, here is the log from the commit of package python-setuptools for openSUSE:Factory checked in at 2015-06-17 16:15:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-setuptools (Old) and /work/SRC/openSUSE:Factory/.python-setuptools.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-setuptools" Changes: -------- --- /work/SRC/openSUSE:Factory/python-setuptools/python-setuptools.changes 2015-04-28 20:48:00.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.python-setuptools.new/python-setuptools.changes 2015-06-17 16:15:04.000000000 +0200 @@ -1,0 +2,19 @@ +Mon Jun 8 16:43:29 UTC 2015 - tbecht...@suse.com + +- update to 17.1: + * Issue #380: Add support for range operators on environment + marker evaluation. + * Issue #378: Do not use internal importlib._bootstrap module. + * Issue #390: Disallow console scripts with path separators in + the name. Removes unintended functionality and brings behavior + into parity with pip. + * Pull Request #130: Better error messages for errors in + parsed requirements. + * Pull Request #133: Removed ``setuptools.tests`` from the + installed packages. + * Issue #373: Provisionally expose + ``pkg_resources._initialize_master_working_set``, allowing for + imperative re-initialization of the master working set. + + +------------------------------------------------------------------- Old: ---- setuptools-15.1.tar.gz New: ---- setuptools-17.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-setuptools.spec ++++++ --- /var/tmp/diff_new_pack.We5eKq/_old 2015-06-17 16:15:05.000000000 +0200 +++ /var/tmp/diff_new_pack.We5eKq/_new 2015-06-17 16:15:05.000000000 +0200 @@ -17,7 +17,7 @@ Name: python-setuptools -Version: 15.1 +Version: 17.1 Release: 0 Url: http://pypi.python.org/pypi/setuptools Summary: Easily download, build, install, upgrade, and uninstall Python packages ++++++ setuptools-15.1.tar.gz -> setuptools-17.1.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setuptools-15.1/CHANGES.txt new/setuptools-17.1/CHANGES.txt --- old/setuptools-15.1/CHANGES.txt 2015-04-15 15:01:36.000000000 +0200 +++ new/setuptools-17.1/CHANGES.txt 2015-06-07 16:36:44.000000000 +0200 @@ -3,6 +3,39 @@ ======= ---- +17.1 +---- + +* Issue #380: Add support for range operators on environment + marker evaluation. + +---- +17.0 +---- + +* Issue #378: Do not use internal importlib._bootstrap module. +* Issue #390: Disallow console scripts with path separators in + the name. Removes unintended functionality and brings behavior + into parity with pip. + +---- +16.0 +---- + +* Pull Request #130: Better error messages for errors in + parsed requirements. +* Pull Request #133: Removed ``setuptools.tests`` from the + installed packages. + +---- +15.2 +---- + +* Issue #373: Provisionally expose + ``pkg_resources._initialize_master_working_set``, allowing for + imperative re-initialization of the master working set. + +---- 15.1 ---- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setuptools-15.1/PKG-INFO new/setuptools-17.1/PKG-INFO --- old/setuptools-15.1/PKG-INFO 2015-04-15 15:16:31.000000000 +0200 +++ new/setuptools-17.1/PKG-INFO 2015-06-07 16:38:08.000000000 +0200 @@ -1,252 +1,252 @@ -Metadata-Version: 1.1 -Name: setuptools -Version: 15.1 -Summary: Easily download, build, install, upgrade, and uninstall Python packages -Home-page: https://bitbucket.org/pypa/setuptools -Author: Python Packaging Authority -Author-email: distutils-...@python.org -License: PSF or ZPL -Description: =============================== - Installing and Using Setuptools - =============================== - - .. contents:: **Table of Contents** - - - `Change History <https://pythonhosted.org/setuptools/history.html>`_. - - ------------------------- - Installation Instructions - ------------------------- - - The recommended way to bootstrap setuptools on any system is to download - `ez_setup.py`_ and run it using the target Python environment. Different - operating systems have different recommended techniques to accomplish this - basic routine, so below are some examples to get you started. - - 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>`_. - - The link provided to ez_setup.py is a bookmark to bootstrap script for the - latest known stable release. - - .. _ez_setup.py: https://bootstrap.pypa.io/ez_setup.py - - Windows (Powershell 3 or later) - =============================== - - For best results, uninstall previous versions FIRST (see `Uninstalling`_). - - Using Windows 8 (which includes PowerShell 3) or earlier versions of Windows - with PowerShell 3 installed, it's possible to install with one simple - Powershell command. Start up Powershell and paste this command:: - - > (Invoke-WebRequest https://bootstrap.pypa.io/ez_setup.py).Content | python - - - You must start the Powershell with Administrative privileges or you may choose - to install a user-local installation:: - - > (Invoke-WebRequest https://bootstrap.pypa.io/ez_setup.py).Content | python - --user - - If you have Python 3.3 or later, you can use the ``py`` command to install to - different Python versions. For example, to install to Python 3.3 if you have - Python 2.7 installed:: - - > (Invoke-WebRequest https://bootstrap.pypa.io/ez_setup.py).Content | py -3 - - - The recommended way to install setuptools on Windows is to download - `ez_setup.py`_ and run it. The script will download the appropriate - distribution file and install it for you. - - Once installation is complete, you will find an ``easy_install`` program in - your Python ``Scripts`` subdirectory. For simple invocation and best results, - add this directory to your ``PATH`` environment variable, if it is not already - present. If you did a user-local install, the ``Scripts`` subdirectory is - ``$env:APPDATA\Python\Scripts``. - - - Windows (simplified) - ==================== - - For Windows without PowerShell 3 or for installation without a command-line, - download `ez_setup.py`_ using your preferred web browser or other technique - and "run" that file. - - - Unix (wget) - =========== - - Most Linux distributions come with wget. - - Download `ez_setup.py`_ and run it using the target Python version. The script - will download the appropriate version and install it for you:: - - > wget https://bootstrap.pypa.io/ez_setup.py -O - | python - - Note that you will may need to invoke the command with superuser privileges to - install to the system Python:: - - > wget https://bootstrap.pypa.io/ez_setup.py -O - | sudo python - - Alternatively, Setuptools may be installed to a user-local path:: - - > wget https://bootstrap.pypa.io/ez_setup.py -O - | python - --user - - Note that on some older systems (noted on Debian 6 and CentOS 5 installations), - `wget` may refuse to download `ez_setup.py`, complaining that the certificate common name `*.c.ssl.fastly.net` - does not match the host name `bootstrap.pypa.io`. In addition, the `ez_setup.py` script may then encounter similar problems using - `wget` internally to download `setuptools-x.y.zip`, complaining that the certificate common name of `www.python.org` does not match the - host name `pypi.python.org`. Those are known issues, related to a bug in the older versions of `wget` - (see `Issue 59 <https://bitbucket.org/pypa/pypi/issue/59#comment-5881915>`_). If you happen to encounter them, - install Setuptools as follows:: - - > wget --no-check-certificate https://bootstrap.pypa.io/ez_setup.py - > python ez_setup.py --insecure - - - Unix including Mac OS X (curl) - ============================== - - If your system has curl installed, follow the ``wget`` instructions but - replace ``wget`` with ``curl`` and ``-O`` with ``-o``. For example:: - - > curl https://bootstrap.pypa.io/ez_setup.py -o - | python - - - Advanced Installation - ===================== - - For more advanced installation options, such as installing to custom - locations or prefixes, download and extract the source - tarball from `Setuptools on PyPI <https://pypi.python.org/pypi/setuptools>`_ - and run setup.py with any supported distutils and Setuptools options. - For example:: - - setuptools-x.x$ python setup.py install --prefix=/opt/setuptools - - Use ``--help`` to get a full options list, but we recommend consulting - the `EasyInstall manual`_ for detailed instructions, especially `the section - on custom installation locations`_. - - .. _EasyInstall manual: https://pythonhosted.org/setuptools/EasyInstall - .. _the section on custom installation locations: https://pythonhosted.org/setuptools/EasyInstall#custom-installation-locations - - - Downloads - ========= - - All setuptools downloads can be found at `the project's home page in the Python - Package Index`_. Scroll to the very bottom of the page to find the links. - - .. _the project's home page in the Python Package Index: https://pypi.python.org/pypi/setuptools - - In addition to the PyPI downloads, the development version of ``setuptools`` - is available from the `Bitbucket repo`_, and in-development versions of the - `0.6 branch`_ are available as well. - - .. _Bitbucket repo: https://bitbucket.org/pypa/setuptools/get/default.tar.gz#egg=setuptools-dev - .. _0.6 branch: http://svn.python.org/projects/sandbox/branches/setuptools-0.6/#egg=setuptools-dev06 - - Uninstalling - ============ - - On Windows, if Setuptools was installed using an ``.exe`` or ``.msi`` - installer, simply use the uninstall feature of "Add/Remove Programs" in the - Control Panel. - - Otherwise, to uninstall Setuptools or Distribute, regardless of the Python - version, delete all ``setuptools*`` and ``distribute*`` files and - directories from your system's ``site-packages`` directory - (and any other ``sys.path`` directories) FIRST. - - If you are upgrading or otherwise plan to re-install Setuptools or Distribute, - nothing further needs to be done. If you want to completely remove Setuptools, - you may also want to remove the 'easy_install' and 'easy_install-x.x' scripts - and associated executables installed to the Python scripts directory. - - -------------------------------- - Using Setuptools and EasyInstall - -------------------------------- - - Here are some of the available manuals, tutorials, and other resources for - learning about Setuptools, Python Eggs, and EasyInstall: - - * `The EasyInstall user's guide and reference manual`_ - * `The setuptools Developer's Guide`_ - * `The pkg_resources API reference`_ - * `The Internal Structure of Python Eggs`_ - - Questions, comments, and bug reports should be directed to the `distutils-sig - mailing list`_. If you have written (or know of) any tutorials, documentation, - plug-ins, or other resources for setuptools users, please let us know about - them there, so this reference list can be updated. If you have working, - *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 - .. _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 - .. _The EasyInstall user's guide and reference manual: https://pythonhosted.org/setuptools/easy_install.html - .. _distutils-sig mailing list: http://mail.python.org/pipermail/distutils-sig/ - - - ------- - Credits - ------- - - * The original design for the ``.egg`` format and the ``pkg_resources`` API was - co-created by Phillip Eby and Bob Ippolito. Bob also implemented the first - version of ``pkg_resources``, and supplied the OS X operating system version - compatibility algorithm. - - * Ian Bicking implemented many early "creature comfort" features of - easy_install, including support for downloading via Sourceforge and - Subversion repositories. Ian's comments on the Web-SIG about WSGI - application deployment also inspired the concept of "entry points" in eggs, - and he has given talks at PyCon and elsewhere to inform and educate the - community about eggs and setuptools. - - * Jim Fulton contributed time and effort to build automated tests of various - aspects of ``easy_install``, and supplied the doctests for the command-line - ``.exe`` wrappers on Windows. - - * Phillip J. Eby is the seminal author of setuptools, and - first proposed the idea of an importable binary distribution format for - Python application plug-ins. - - * Significant parts of the implementation of setuptools were funded by the Open - Source Applications Foundation, to provide a plug-in infrastructure for the - Chandler PIM application. In addition, many OSAF staffers (such as Mike - "Code Bear" Taylor) contributed their time and stress as guinea pigs for the - use of eggs and setuptools, even before eggs were "cool". (Thanks, guys!) - - * Tarek Ziadé is the principal author of the Distribute fork, which - re-invigorated the community on the project, encouraged renewed innovation, - and addressed many defects. - - * Since the merge with Distribute, Jason R. Coombs is the - maintainer of setuptools. The project is maintained in coordination with - the Python Packaging Authority (PyPA) and the larger Python community. - - .. _files: - -Keywords: CPAN PyPI distutils eggs package management -Platform: UNKNOWN -Classifier: Development Status :: 5 - Production/Stable -Classifier: Intended Audience :: Developers -Classifier: License :: OSI Approved :: Python Software Foundation License -Classifier: License :: OSI Approved :: Zope Public License -Classifier: Operating System :: OS Independent -Classifier: Programming Language :: Python :: 2.6 -Classifier: Programming Language :: Python :: 2.7 -Classifier: Programming Language :: Python :: 3 -Classifier: Programming Language :: Python :: 3.1 -Classifier: Programming Language :: Python :: 3.2 -Classifier: Programming Language :: Python :: 3.3 -Classifier: Programming Language :: Python :: 3.4 -Classifier: Topic :: Software Development :: Libraries :: Python Modules -Classifier: Topic :: System :: Archiving :: Packaging -Classifier: Topic :: System :: Systems Administration -Classifier: Topic :: Utilities +Metadata-Version: 1.1 +Name: setuptools +Version: 17.1 +Summary: Easily download, build, install, upgrade, and uninstall Python packages +Home-page: https://bitbucket.org/pypa/setuptools +Author: Python Packaging Authority +Author-email: distutils-...@python.org +License: PSF or ZPL +Description: =============================== + Installing and Using Setuptools + =============================== + + .. contents:: **Table of Contents** + + + `Change History <https://pythonhosted.org/setuptools/history.html>`_. + + ------------------------- + Installation Instructions + ------------------------- + + The recommended way to bootstrap setuptools on any system is to download + `ez_setup.py`_ and run it using the target Python environment. Different + operating systems have different recommended techniques to accomplish this + basic routine, so below are some examples to get you started. + + 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>`_. + + The link provided to ez_setup.py is a bookmark to bootstrap script for the + latest known stable release. + + .. _ez_setup.py: https://bootstrap.pypa.io/ez_setup.py + + Windows (Powershell 3 or later) + =============================== + + For best results, uninstall previous versions FIRST (see `Uninstalling`_). + + Using Windows 8 (which includes PowerShell 3) or earlier versions of Windows + with PowerShell 3 installed, it's possible to install with one simple + Powershell command. Start up Powershell and paste this command:: + + > (Invoke-WebRequest https://bootstrap.pypa.io/ez_setup.py).Content | python - + + You must start the Powershell with Administrative privileges or you may choose + to install a user-local installation:: + + > (Invoke-WebRequest https://bootstrap.pypa.io/ez_setup.py).Content | python - --user + + If you have Python 3.3 or later, you can use the ``py`` command to install to + different Python versions. For example, to install to Python 3.3 if you have + Python 2.7 installed:: + + > (Invoke-WebRequest https://bootstrap.pypa.io/ez_setup.py).Content | py -3 - + + The recommended way to install setuptools on Windows is to download + `ez_setup.py`_ and run it. The script will download the appropriate + distribution file and install it for you. + + Once installation is complete, you will find an ``easy_install`` program in + your Python ``Scripts`` subdirectory. For simple invocation and best results, + add this directory to your ``PATH`` environment variable, if it is not already + present. If you did a user-local install, the ``Scripts`` subdirectory is + ``$env:APPDATA\Python\Scripts``. + + + Windows (simplified) + ==================== + + For Windows without PowerShell 3 or for installation without a command-line, + download `ez_setup.py`_ using your preferred web browser or other technique + and "run" that file. + + + Unix (wget) + =========== + + Most Linux distributions come with wget. + + Download `ez_setup.py`_ and run it using the target Python version. The script + will download the appropriate version and install it for you:: + + > wget https://bootstrap.pypa.io/ez_setup.py -O - | python + + Note that you will may need to invoke the command with superuser privileges to + install to the system Python:: + + > wget https://bootstrap.pypa.io/ez_setup.py -O - | sudo python + + Alternatively, Setuptools may be installed to a user-local path:: + + > wget https://bootstrap.pypa.io/ez_setup.py -O - | python - --user + + Note that on some older systems (noted on Debian 6 and CentOS 5 installations), + `wget` may refuse to download `ez_setup.py`, complaining that the certificate common name `*.c.ssl.fastly.net` + does not match the host name `bootstrap.pypa.io`. In addition, the `ez_setup.py` script may then encounter similar problems using + `wget` internally to download `setuptools-x.y.zip`, complaining that the certificate common name of `www.python.org` does not match the + host name `pypi.python.org`. Those are known issues, related to a bug in the older versions of `wget` + (see `Issue 59 <https://bitbucket.org/pypa/pypi/issue/59#comment-5881915>`_). If you happen to encounter them, + install Setuptools as follows:: + + > wget --no-check-certificate https://bootstrap.pypa.io/ez_setup.py + > python ez_setup.py --insecure + + + Unix including Mac OS X (curl) + ============================== + + If your system has curl installed, follow the ``wget`` instructions but + replace ``wget`` with ``curl`` and ``-O`` with ``-o``. For example:: + + > curl https://bootstrap.pypa.io/ez_setup.py -o - | python + + + Advanced Installation + ===================== + + For more advanced installation options, such as installing to custom + locations or prefixes, download and extract the source + tarball from `Setuptools on PyPI <https://pypi.python.org/pypi/setuptools>`_ + and run setup.py with any supported distutils and Setuptools options. + For example:: + + setuptools-x.x$ python setup.py install --prefix=/opt/setuptools + + Use ``--help`` to get a full options list, but we recommend consulting + the `EasyInstall manual`_ for detailed instructions, especially `the section + on custom installation locations`_. + + .. _EasyInstall manual: https://pythonhosted.org/setuptools/EasyInstall + .. _the section on custom installation locations: https://pythonhosted.org/setuptools/EasyInstall#custom-installation-locations + + + Downloads + ========= + + All setuptools downloads can be found at `the project's home page in the Python + Package Index`_. Scroll to the very bottom of the page to find the links. + + .. _the project's home page in the Python Package Index: https://pypi.python.org/pypi/setuptools + + In addition to the PyPI downloads, the development version of ``setuptools`` + is available from the `Bitbucket repo`_, and in-development versions of the + `0.6 branch`_ are available as well. + + .. _Bitbucket repo: https://bitbucket.org/pypa/setuptools/get/default.tar.gz#egg=setuptools-dev + .. _0.6 branch: http://svn.python.org/projects/sandbox/branches/setuptools-0.6/#egg=setuptools-dev06 + + Uninstalling + ============ + + On Windows, if Setuptools was installed using an ``.exe`` or ``.msi`` + installer, simply use the uninstall feature of "Add/Remove Programs" in the + Control Panel. + + Otherwise, to uninstall Setuptools or Distribute, regardless of the Python + version, delete all ``setuptools*`` and ``distribute*`` files and + directories from your system's ``site-packages`` directory + (and any other ``sys.path`` directories) FIRST. + + If you are upgrading or otherwise plan to re-install Setuptools or Distribute, + nothing further needs to be done. If you want to completely remove Setuptools, + you may also want to remove the 'easy_install' and 'easy_install-x.x' scripts + and associated executables installed to the Python scripts directory. + + -------------------------------- + Using Setuptools and EasyInstall + -------------------------------- + + Here are some of the available manuals, tutorials, and other resources for + learning about Setuptools, Python Eggs, and EasyInstall: + + * `The EasyInstall user's guide and reference manual`_ + * `The setuptools Developer's Guide`_ + * `The pkg_resources API reference`_ + * `The Internal Structure of Python Eggs`_ + + Questions, comments, and bug reports should be directed to the `distutils-sig + mailing list`_. If you have written (or know of) any tutorials, documentation, + plug-ins, or other resources for setuptools users, please let us know about + them there, so this reference list can be updated. If you have working, + *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 + .. _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 + .. _The EasyInstall user's guide and reference manual: https://pythonhosted.org/setuptools/easy_install.html + .. _distutils-sig mailing list: http://mail.python.org/pipermail/distutils-sig/ + + + ------- + Credits + ------- + + * The original design for the ``.egg`` format and the ``pkg_resources`` API was + co-created by Phillip Eby and Bob Ippolito. Bob also implemented the first + version of ``pkg_resources``, and supplied the OS X operating system version + compatibility algorithm. + + * Ian Bicking implemented many early "creature comfort" features of + easy_install, including support for downloading via Sourceforge and + Subversion repositories. Ian's comments on the Web-SIG about WSGI + application deployment also inspired the concept of "entry points" in eggs, + and he has given talks at PyCon and elsewhere to inform and educate the + community about eggs and setuptools. + + * Jim Fulton contributed time and effort to build automated tests of various + aspects of ``easy_install``, and supplied the doctests for the command-line + ``.exe`` wrappers on Windows. + + * Phillip J. Eby is the seminal author of setuptools, and + first proposed the idea of an importable binary distribution format for + Python application plug-ins. + + * Significant parts of the implementation of setuptools were funded by the Open + Source Applications Foundation, to provide a plug-in infrastructure for the + Chandler PIM application. In addition, many OSAF staffers (such as Mike + "Code Bear" Taylor) contributed their time and stress as guinea pigs for the + use of eggs and setuptools, even before eggs were "cool". (Thanks, guys!) + + * Tarek Ziadé is the principal author of the Distribute fork, which + re-invigorated the community on the project, encouraged renewed innovation, + and addressed many defects. + + * Since the merge with Distribute, Jason R. Coombs is the + maintainer of setuptools. The project is maintained in coordination with + the Python Packaging Authority (PyPA) and the larger Python community. + + .. _files: + +Keywords: CPAN PyPI distutils eggs package management +Platform: UNKNOWN +Classifier: Development Status :: 5 - Production/Stable +Classifier: Intended Audience :: Developers +Classifier: License :: OSI Approved :: Python Software Foundation License +Classifier: License :: OSI Approved :: Zope Public License +Classifier: Operating System :: OS Independent +Classifier: Programming Language :: Python :: 2.6 +Classifier: Programming Language :: Python :: 2.7 +Classifier: Programming Language :: Python :: 3 +Classifier: Programming Language :: Python :: 3.1 +Classifier: Programming Language :: Python :: 3.2 +Classifier: Programming Language :: Python :: 3.3 +Classifier: Programming Language :: Python :: 3.4 +Classifier: Topic :: Software Development :: Libraries :: Python Modules +Classifier: Topic :: System :: Archiving :: Packaging +Classifier: Topic :: System :: Systems Administration +Classifier: Topic :: Utilities diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setuptools-15.1/ez_setup.py new/setuptools-17.1/ez_setup.py --- old/setuptools-15.1/ez_setup.py 2015-04-04 00:26:40.000000000 +0200 +++ new/setuptools-17.1/ez_setup.py 2015-05-29 04:23:34.000000000 +0200 @@ -30,7 +30,7 @@ except ImportError: USER_SITE = None -DEFAULT_VERSION = "15.1" +DEFAULT_VERSION = "17.1" DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"; DEFAULT_SAVE_DIR = os.curdir diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setuptools-15.1/pkg_resources/__init__.py new/setuptools-17.1/pkg_resources/__init__.py --- old/setuptools-15.1/pkg_resources/__init__.py 2015-04-04 00:34:27.000000000 +0200 +++ new/setuptools-17.1/pkg_resources/__init__.py 2015-06-07 16:06:01.000000000 +0200 @@ -69,9 +69,9 @@ # Avoid try/except due to potential problems with delayed import mechanisms. if sys.version_info >= (3, 3) and sys.implementation.name == "cpython": - import importlib._bootstrap as importlib_bootstrap + import importlib.machinery as importlib_machinery else: - importlib_bootstrap = None + importlib_machinery = None try: import parser @@ -89,6 +89,12 @@ import packaging.specifiers +# declare some globals that will be defined later to +# satisfy the linters. +require = None +working_set = None + + class PEP440Warning(RuntimeWarning): """ Used when there is an issue with a version or specifier not complying with @@ -1483,6 +1489,10 @@ 'in': lambda x, y: x in y, '==': operator.eq, '!=': operator.ne, + '<': operator.lt, + '>': operator.gt, + '<=': operator.le, + '>=': operator.ge, } if hasattr(symbol, 'or_test'): ops[symbol.or_test] = cls.test @@ -1714,8 +1724,8 @@ register_loader_type(type(None), DefaultProvider) -if importlib_bootstrap is not None: - register_loader_type(importlib_bootstrap.SourceFileLoader, DefaultProvider) +if importlib_machinery is not None: + register_loader_type(importlib_machinery.SourceFileLoader, DefaultProvider) class EmptyProvider(NullProvider): @@ -2122,8 +2132,8 @@ break register_finder(pkgutil.ImpImporter, find_on_path) -if importlib_bootstrap is not None: - register_finder(importlib_bootstrap.FileFinder, find_on_path) +if importlib_machinery is not None: + register_finder(importlib_machinery.FileFinder, find_on_path) _declare_state('dict', _namespace_handlers={}) _declare_state('dict', _namespace_packages={}) @@ -2231,8 +2241,8 @@ register_namespace_handler(pkgutil.ImpImporter, file_ns_handler) register_namespace_handler(zipimport.zipimporter, file_ns_handler) -if importlib_bootstrap is not None: - register_namespace_handler(importlib_bootstrap.FileFinder, file_ns_handler) +if importlib_machinery is not None: + register_namespace_handler(importlib_machinery.FileFinder, file_ns_handler) def null_ns_handler(importer, path_item, packageName, module): @@ -2847,6 +2857,11 @@ warnings.warn(stacklevel=level + 1, *args, **kw) +class RequirementParseError(ValueError): + def __str__(self): + return ' '.join(self.args) + + def parse_requirements(strs): """Yield ``Requirement`` objects for each specification in `strs` @@ -2865,14 +2880,13 @@ line = next(lines) p = 0 except StopIteration: - raise ValueError( - "\\ must not appear on the last nonblank line" - ) + msg = "\\ must not appear on the last nonblank line" + raise RequirementParseError(msg) match = ITEM(line, p) if not match: msg = "Expected " + item_name + " in" - raise ValueError(msg, line, "at", line[p:]) + raise RequirementParseError(msg, line, "at", line[p:]) items.append(match.group(*groups)) p = match.end() @@ -2883,7 +2897,7 @@ p = match.end() elif not TERMINATOR(line, p): msg = "Expected ',' or end-of-list in" - raise ValueError(msg, line, "at", line[p:]) + raise RequirementParseError(msg, line, "at", line[p:]) match = TERMINATOR(line, p) # skip the terminator, if any @@ -2894,7 +2908,7 @@ for line in lines: match = DISTRO(line) if not match: - raise ValueError("Missing distribution spec", line) + raise RequirementParseError("Missing distribution spec", line) project_name = match.group(1) p = match.end() extras = [] @@ -3045,28 +3059,49 @@ warnings.filterwarnings("ignore", category=PEP440Warning, append=True) -# Set up global resource manager (deliberately not state-saved) -_manager = ResourceManager() -def _initialize(g): - for name in dir(_manager): +# from jaraco.functools 1.3 +def _call_aside(f, *args, **kwargs): + f(*args, **kwargs) + return f + + +@_call_aside +def _initialize(g=globals()): + "Set up global resource manager (deliberately not state-saved)" + manager = ResourceManager() + g['_manager'] = manager + for name in dir(manager): if not name.startswith('_'): - g[name] = getattr(_manager, name) -_initialize(globals()) + g[name] = getattr(manager, name) -# Prepare the master working set and make the ``require()`` API available -working_set = WorkingSet._build_master() -_declare_state('object', working_set=working_set) - -require = working_set.require -iter_entry_points = working_set.iter_entry_points -add_activation_listener = working_set.subscribe -run_script = working_set.run_script -# backward compatibility -run_main = run_script -# Activate all distributions already on sys.path, and ensure that -# all distributions added to the working set in the future (e.g. by -# calling ``require()``) will get activated as well. -add_activation_listener(lambda dist: dist.activate()) -working_set.entries=[] -# match order -list(map(working_set.add_entry, sys.path)) + +@_call_aside +def _initialize_master_working_set(): + """ + Prepare the master working set and make the ``require()`` + API available. + + This function has explicit effects on the global state + of pkg_resources. It is intended to be invoked once at + the initialization of this module. + + Invocation by other packages is unsupported and done + at their own risk. + """ + working_set = WorkingSet._build_master() + _declare_state('object', working_set=working_set) + + require = working_set.require + iter_entry_points = working_set.iter_entry_points + add_activation_listener = working_set.subscribe + run_script = working_set.run_script + # backward compatibility + run_main = run_script + # Activate all distributions already on sys.path, and ensure that + # all distributions added to the working set in the future (e.g. by + # calling ``require()``) will get activated as well. + add_activation_listener(lambda dist: dist.activate()) + working_set.entries=[] + # match order + list(map(working_set.add_entry, sys.path)) + globals().update(locals()) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setuptools-15.1/pkg_resources/api_tests.txt new/setuptools-17.1/pkg_resources/api_tests.txt --- old/setuptools-15.1/pkg_resources/api_tests.txt 2015-03-28 15:55:50.000000000 +0100 +++ new/setuptools-17.1/pkg_resources/api_tests.txt 2015-06-07 16:23:49.000000000 +0200 @@ -364,9 +364,6 @@ >>> print(im("'x'=='x' or os.open('foo')=='y'")) # no short-circuit! Language feature not supported in environment markers - >>> print(im("'x' < 'y'")) - '<' operator not allowed in environment markers - >>> print(im("'x' < 'y' < 'z'")) Chained comparison not allowed in environment markers @@ -417,3 +414,9 @@ >>> em("'yx' in 'x'") False + + >>> em("python_version >= '2.6'") + True + + >>> em("python_version > '2.5'") + True diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setuptools-15.1/pkg_resources/tests/test_markers.py new/setuptools-17.1/pkg_resources/tests/test_markers.py --- old/setuptools-15.1/pkg_resources/tests/test_markers.py 1970-01-01 01:00:00.000000000 +0100 +++ new/setuptools-17.1/pkg_resources/tests/test_markers.py 2015-06-07 16:32:16.000000000 +0200 @@ -0,0 +1,16 @@ +try: + import unittest.mock as mock +except ImportError: + import mock + +from pkg_resources import evaluate_marker + + +@mock.patch.dict('pkg_resources.MarkerEvaluation.values', + python_full_version=mock.Mock(return_value='2.7.10')) +def test_lexicographic_ordering(): + """ + Although one might like 2.7.10 to be greater than 2.7.3, + the marker spec only supports lexicographic ordering. + """ + assert evaluate_marker("python_full_version > '2.7.3'") is False diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setuptools-15.1/setup.cfg new/setuptools-17.1/setup.cfg --- old/setuptools-15.1/setup.cfg 2015-04-15 15:16:31.000000000 +0200 +++ new/setuptools-17.1/setup.cfg 2015-06-07 16:38:08.000000000 +0200 @@ -1,25 +1,25 @@ -[egg_info] -tag_build = -tag_date = 0 -tag_svn_revision = 0 - -[aliases] -release = egg_info -RDb '' -source = register sdist binary -binary = bdist_egg upload --show-response -test = pytest - -[build_sphinx] -source-dir = docs/ -build-dir = docs/build -all_files = 1 - -[upload_docs] -upload-dir = docs/build/html - -[sdist] -formats = gztar zip - -[wheel] -universal = 1 - +[egg_info] +tag_build = +tag_date = 0 +tag_svn_revision = 0 + +[aliases] +release = egg_info -RDb '' +source = register sdist binary +binary = bdist_egg upload --show-response +test = pytest + +[build_sphinx] +source-dir = docs/ +build-dir = docs/build +all_files = 1 + +[upload_docs] +upload-dir = docs/build/html + +[sdist] +formats = gztar zip + +[wheel] +universal = 1 + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setuptools-15.1/setup.py new/setuptools-17.1/setup.py --- old/setuptools-15.1/setup.py 2015-03-28 15:55:50.000000000 +0100 +++ new/setuptools-17.1/setup.py 2015-05-18 09:33:28.000000000 +0200 @@ -80,7 +80,7 @@ keywords="CPAN PyPI distutils eggs package management", url="https://bitbucket.org/pypa/setuptools";, src_root=src_root, - packages=setuptools.find_packages(), + packages=setuptools.find_packages(exclude=['*.tests']), package_data=package_data, py_modules=['easy_install'], diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setuptools-15.1/setuptools/command/easy_install.py new/setuptools-17.1/setuptools/command/easy_install.py --- old/setuptools-15.1/setuptools/command/easy_install.py 2015-04-04 00:34:27.000000000 +0200 +++ new/setuptools-17.1/setuptools/command/easy_install.py 2015-05-28 00:35:03.000000000 +0200 @@ -2015,7 +2015,8 @@ @classmethod def get_args(cls, dist, header=None): """ - Yield write_script() argument tuples for a distribution's entrypoints + Yield write_script() argument tuples for a distribution's + console_scripts and gui_scripts entry points. """ if header is None: header = cls.get_header() @@ -2023,11 +2024,21 @@ for type_ in 'console', 'gui': group = type_ + '_scripts' for name, ep in dist.get_entry_map(group).items(): + cls._ensure_safe_name(name) script_text = cls.template % locals() - for res in cls._get_script_args(type_, name, header, - script_text): + args = cls._get_script_args(type_, name, header, script_text) + for res in args: yield res + @staticmethod + def _ensure_safe_name(name): + """ + Prevent paths in *_scripts entry point names. + """ + has_path_sep = re.search(r'[\\/]', name) + if has_path_sep: + raise ValueError("Path separators not allowed in script names") + @classmethod def get_writer(cls, force_windows): # for backward compatibility diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setuptools-15.1/setuptools/dist.py new/setuptools-17.1/setuptools/dist.py --- old/setuptools-15.1/setuptools/dist.py 2015-03-28 15:55:50.000000000 +0100 +++ new/setuptools-17.1/setuptools/dist.py 2015-05-10 00:36:35.000000000 +0200 @@ -115,18 +115,21 @@ def assert_bool(dist, attr, value): """Verify that value is True, False, 0, or 1""" if bool(value) != value: - raise DistutilsSetupError( - "%r must be a boolean value (got %r)" % (attr,value) - ) + tmpl = "{attr!r} must be a boolean value (got {value!r})" + raise DistutilsSetupError(tmpl.format(attr=attr, value=value)) + + def check_requirements(dist, attr, value): """Verify that install_requires is a valid requirements list""" try: list(pkg_resources.parse_requirements(value)) - except (TypeError,ValueError): - raise DistutilsSetupError( - "%r must be a string or list of strings " - "containing valid project/version requirement specifiers" % (attr,) + except (TypeError, ValueError) as error: + tmpl = ( + "{attr!r} must be a string or list of strings " + "containing valid project/version requirement specifiers; {error}" ) + raise DistutilsSetupError(tmpl.format(attr=attr, error=error)) + def check_entry_points(dist, attr, value): """Verify that entry_points map is parseable""" try: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setuptools-15.1/setuptools/sandbox.py new/setuptools-17.1/setuptools/sandbox.py --- old/setuptools-15.1/setuptools/sandbox.py 2015-04-04 00:34:27.000000000 +0200 +++ new/setuptools-17.1/setuptools/sandbox.py 2015-05-10 00:36:35.000000000 +0200 @@ -10,7 +10,7 @@ import pkg_resources -if os.name == "java": +if sys.platform.startswith('java'): import org.python.modules.posix.PosixModule as _os else: _os = sys.modules[os.name] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setuptools-15.1/setuptools/version.py new/setuptools-17.1/setuptools/version.py --- old/setuptools-15.1/setuptools/version.py 2015-04-04 00:26:40.000000000 +0200 +++ new/setuptools-17.1/setuptools/version.py 2015-05-29 04:23:34.000000000 +0200 @@ -1 +1 @@ -__version__ = '15.1' +__version__ = '17.1' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setuptools-15.1/setuptools.egg-info/PKG-INFO new/setuptools-17.1/setuptools.egg-info/PKG-INFO --- old/setuptools-15.1/setuptools.egg-info/PKG-INFO 2015-04-15 15:16:27.000000000 +0200 +++ new/setuptools-17.1/setuptools.egg-info/PKG-INFO 2015-06-07 16:38:07.000000000 +0200 @@ -1,252 +1,252 @@ -Metadata-Version: 1.1 -Name: setuptools -Version: 15.1 -Summary: Easily download, build, install, upgrade, and uninstall Python packages -Home-page: https://bitbucket.org/pypa/setuptools -Author: Python Packaging Authority -Author-email: distutils-...@python.org -License: PSF or ZPL -Description: =============================== - Installing and Using Setuptools - =============================== - - .. contents:: **Table of Contents** - - - `Change History <https://pythonhosted.org/setuptools/history.html>`_. - - ------------------------- - Installation Instructions - ------------------------- - - The recommended way to bootstrap setuptools on any system is to download - `ez_setup.py`_ and run it using the target Python environment. Different - operating systems have different recommended techniques to accomplish this - basic routine, so below are some examples to get you started. - - 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>`_. - - The link provided to ez_setup.py is a bookmark to bootstrap script for the - latest known stable release. - - .. _ez_setup.py: https://bootstrap.pypa.io/ez_setup.py - - Windows (Powershell 3 or later) - =============================== - - For best results, uninstall previous versions FIRST (see `Uninstalling`_). - - Using Windows 8 (which includes PowerShell 3) or earlier versions of Windows - with PowerShell 3 installed, it's possible to install with one simple - Powershell command. Start up Powershell and paste this command:: - - > (Invoke-WebRequest https://bootstrap.pypa.io/ez_setup.py).Content | python - - - You must start the Powershell with Administrative privileges or you may choose - to install a user-local installation:: - - > (Invoke-WebRequest https://bootstrap.pypa.io/ez_setup.py).Content | python - --user - - If you have Python 3.3 or later, you can use the ``py`` command to install to - different Python versions. For example, to install to Python 3.3 if you have - Python 2.7 installed:: - - > (Invoke-WebRequest https://bootstrap.pypa.io/ez_setup.py).Content | py -3 - - - The recommended way to install setuptools on Windows is to download - `ez_setup.py`_ and run it. The script will download the appropriate - distribution file and install it for you. - - Once installation is complete, you will find an ``easy_install`` program in - your Python ``Scripts`` subdirectory. For simple invocation and best results, - add this directory to your ``PATH`` environment variable, if it is not already - present. If you did a user-local install, the ``Scripts`` subdirectory is - ``$env:APPDATA\Python\Scripts``. - - - Windows (simplified) - ==================== - - For Windows without PowerShell 3 or for installation without a command-line, - download `ez_setup.py`_ using your preferred web browser or other technique - and "run" that file. - - - Unix (wget) - =========== - - Most Linux distributions come with wget. - - Download `ez_setup.py`_ and run it using the target Python version. The script - will download the appropriate version and install it for you:: - - > wget https://bootstrap.pypa.io/ez_setup.py -O - | python - - Note that you will may need to invoke the command with superuser privileges to - install to the system Python:: - - > wget https://bootstrap.pypa.io/ez_setup.py -O - | sudo python - - Alternatively, Setuptools may be installed to a user-local path:: - - > wget https://bootstrap.pypa.io/ez_setup.py -O - | python - --user - - Note that on some older systems (noted on Debian 6 and CentOS 5 installations), - `wget` may refuse to download `ez_setup.py`, complaining that the certificate common name `*.c.ssl.fastly.net` - does not match the host name `bootstrap.pypa.io`. In addition, the `ez_setup.py` script may then encounter similar problems using - `wget` internally to download `setuptools-x.y.zip`, complaining that the certificate common name of `www.python.org` does not match the - host name `pypi.python.org`. Those are known issues, related to a bug in the older versions of `wget` - (see `Issue 59 <https://bitbucket.org/pypa/pypi/issue/59#comment-5881915>`_). If you happen to encounter them, - install Setuptools as follows:: - - > wget --no-check-certificate https://bootstrap.pypa.io/ez_setup.py - > python ez_setup.py --insecure - - - Unix including Mac OS X (curl) - ============================== - - If your system has curl installed, follow the ``wget`` instructions but - replace ``wget`` with ``curl`` and ``-O`` with ``-o``. For example:: - - > curl https://bootstrap.pypa.io/ez_setup.py -o - | python - - - Advanced Installation - ===================== - - For more advanced installation options, such as installing to custom - locations or prefixes, download and extract the source - tarball from `Setuptools on PyPI <https://pypi.python.org/pypi/setuptools>`_ - and run setup.py with any supported distutils and Setuptools options. - For example:: - - setuptools-x.x$ python setup.py install --prefix=/opt/setuptools - - Use ``--help`` to get a full options list, but we recommend consulting - the `EasyInstall manual`_ for detailed instructions, especially `the section - on custom installation locations`_. - - .. _EasyInstall manual: https://pythonhosted.org/setuptools/EasyInstall - .. _the section on custom installation locations: https://pythonhosted.org/setuptools/EasyInstall#custom-installation-locations - - - Downloads - ========= - - All setuptools downloads can be found at `the project's home page in the Python - Package Index`_. Scroll to the very bottom of the page to find the links. - - .. _the project's home page in the Python Package Index: https://pypi.python.org/pypi/setuptools - - In addition to the PyPI downloads, the development version of ``setuptools`` - is available from the `Bitbucket repo`_, and in-development versions of the - `0.6 branch`_ are available as well. - - .. _Bitbucket repo: https://bitbucket.org/pypa/setuptools/get/default.tar.gz#egg=setuptools-dev - .. _0.6 branch: http://svn.python.org/projects/sandbox/branches/setuptools-0.6/#egg=setuptools-dev06 - - Uninstalling - ============ - - On Windows, if Setuptools was installed using an ``.exe`` or ``.msi`` - installer, simply use the uninstall feature of "Add/Remove Programs" in the - Control Panel. - - Otherwise, to uninstall Setuptools or Distribute, regardless of the Python - version, delete all ``setuptools*`` and ``distribute*`` files and - directories from your system's ``site-packages`` directory - (and any other ``sys.path`` directories) FIRST. - - If you are upgrading or otherwise plan to re-install Setuptools or Distribute, - nothing further needs to be done. If you want to completely remove Setuptools, - you may also want to remove the 'easy_install' and 'easy_install-x.x' scripts - and associated executables installed to the Python scripts directory. - - -------------------------------- - Using Setuptools and EasyInstall - -------------------------------- - - Here are some of the available manuals, tutorials, and other resources for - learning about Setuptools, Python Eggs, and EasyInstall: - - * `The EasyInstall user's guide and reference manual`_ - * `The setuptools Developer's Guide`_ - * `The pkg_resources API reference`_ - * `The Internal Structure of Python Eggs`_ - - Questions, comments, and bug reports should be directed to the `distutils-sig - mailing list`_. If you have written (or know of) any tutorials, documentation, - plug-ins, or other resources for setuptools users, please let us know about - them there, so this reference list can be updated. If you have working, - *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 - .. _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 - .. _The EasyInstall user's guide and reference manual: https://pythonhosted.org/setuptools/easy_install.html - .. _distutils-sig mailing list: http://mail.python.org/pipermail/distutils-sig/ - - - ------- - Credits - ------- - - * The original design for the ``.egg`` format and the ``pkg_resources`` API was - co-created by Phillip Eby and Bob Ippolito. Bob also implemented the first - version of ``pkg_resources``, and supplied the OS X operating system version - compatibility algorithm. - - * Ian Bicking implemented many early "creature comfort" features of - easy_install, including support for downloading via Sourceforge and - Subversion repositories. Ian's comments on the Web-SIG about WSGI - application deployment also inspired the concept of "entry points" in eggs, - and he has given talks at PyCon and elsewhere to inform and educate the - community about eggs and setuptools. - - * Jim Fulton contributed time and effort to build automated tests of various - aspects of ``easy_install``, and supplied the doctests for the command-line - ``.exe`` wrappers on Windows. - - * Phillip J. Eby is the seminal author of setuptools, and - first proposed the idea of an importable binary distribution format for - Python application plug-ins. - - * Significant parts of the implementation of setuptools were funded by the Open - Source Applications Foundation, to provide a plug-in infrastructure for the - Chandler PIM application. In addition, many OSAF staffers (such as Mike - "Code Bear" Taylor) contributed their time and stress as guinea pigs for the - use of eggs and setuptools, even before eggs were "cool". (Thanks, guys!) - - * Tarek Ziadé is the principal author of the Distribute fork, which - re-invigorated the community on the project, encouraged renewed innovation, - and addressed many defects. - - * Since the merge with Distribute, Jason R. Coombs is the - maintainer of setuptools. The project is maintained in coordination with - the Python Packaging Authority (PyPA) and the larger Python community. - - .. _files: - -Keywords: CPAN PyPI distutils eggs package management -Platform: UNKNOWN -Classifier: Development Status :: 5 - Production/Stable -Classifier: Intended Audience :: Developers -Classifier: License :: OSI Approved :: Python Software Foundation License -Classifier: License :: OSI Approved :: Zope Public License -Classifier: Operating System :: OS Independent -Classifier: Programming Language :: Python :: 2.6 -Classifier: Programming Language :: Python :: 2.7 -Classifier: Programming Language :: Python :: 3 -Classifier: Programming Language :: Python :: 3.1 -Classifier: Programming Language :: Python :: 3.2 -Classifier: Programming Language :: Python :: 3.3 -Classifier: Programming Language :: Python :: 3.4 -Classifier: Topic :: Software Development :: Libraries :: Python Modules -Classifier: Topic :: System :: Archiving :: Packaging -Classifier: Topic :: System :: Systems Administration -Classifier: Topic :: Utilities +Metadata-Version: 1.1 +Name: setuptools +Version: 17.1 +Summary: Easily download, build, install, upgrade, and uninstall Python packages +Home-page: https://bitbucket.org/pypa/setuptools +Author: Python Packaging Authority +Author-email: distutils-...@python.org +License: PSF or ZPL +Description: =============================== + Installing and Using Setuptools + =============================== + + .. contents:: **Table of Contents** + + + `Change History <https://pythonhosted.org/setuptools/history.html>`_. + + ------------------------- + Installation Instructions + ------------------------- + + The recommended way to bootstrap setuptools on any system is to download + `ez_setup.py`_ and run it using the target Python environment. Different + operating systems have different recommended techniques to accomplish this + basic routine, so below are some examples to get you started. + + 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>`_. + + The link provided to ez_setup.py is a bookmark to bootstrap script for the + latest known stable release. + + .. _ez_setup.py: https://bootstrap.pypa.io/ez_setup.py + + Windows (Powershell 3 or later) + =============================== + + For best results, uninstall previous versions FIRST (see `Uninstalling`_). + + Using Windows 8 (which includes PowerShell 3) or earlier versions of Windows + with PowerShell 3 installed, it's possible to install with one simple + Powershell command. Start up Powershell and paste this command:: + + > (Invoke-WebRequest https://bootstrap.pypa.io/ez_setup.py).Content | python - + + You must start the Powershell with Administrative privileges or you may choose + to install a user-local installation:: + + > (Invoke-WebRequest https://bootstrap.pypa.io/ez_setup.py).Content | python - --user + + If you have Python 3.3 or later, you can use the ``py`` command to install to + different Python versions. For example, to install to Python 3.3 if you have + Python 2.7 installed:: + + > (Invoke-WebRequest https://bootstrap.pypa.io/ez_setup.py).Content | py -3 - + + The recommended way to install setuptools on Windows is to download + `ez_setup.py`_ and run it. The script will download the appropriate + distribution file and install it for you. + + Once installation is complete, you will find an ``easy_install`` program in + your Python ``Scripts`` subdirectory. For simple invocation and best results, + add this directory to your ``PATH`` environment variable, if it is not already + present. If you did a user-local install, the ``Scripts`` subdirectory is + ``$env:APPDATA\Python\Scripts``. + + + Windows (simplified) + ==================== + + For Windows without PowerShell 3 or for installation without a command-line, + download `ez_setup.py`_ using your preferred web browser or other technique + and "run" that file. + + + Unix (wget) + =========== + + Most Linux distributions come with wget. + + Download `ez_setup.py`_ and run it using the target Python version. The script + will download the appropriate version and install it for you:: + + > wget https://bootstrap.pypa.io/ez_setup.py -O - | python + + Note that you will may need to invoke the command with superuser privileges to + install to the system Python:: + + > wget https://bootstrap.pypa.io/ez_setup.py -O - | sudo python + + Alternatively, Setuptools may be installed to a user-local path:: + + > wget https://bootstrap.pypa.io/ez_setup.py -O - | python - --user + + Note that on some older systems (noted on Debian 6 and CentOS 5 installations), + `wget` may refuse to download `ez_setup.py`, complaining that the certificate common name `*.c.ssl.fastly.net` + does not match the host name `bootstrap.pypa.io`. In addition, the `ez_setup.py` script may then encounter similar problems using + `wget` internally to download `setuptools-x.y.zip`, complaining that the certificate common name of `www.python.org` does not match the + host name `pypi.python.org`. Those are known issues, related to a bug in the older versions of `wget` + (see `Issue 59 <https://bitbucket.org/pypa/pypi/issue/59#comment-5881915>`_). If you happen to encounter them, + install Setuptools as follows:: + + > wget --no-check-certificate https://bootstrap.pypa.io/ez_setup.py + > python ez_setup.py --insecure + + + Unix including Mac OS X (curl) + ============================== + + If your system has curl installed, follow the ``wget`` instructions but + replace ``wget`` with ``curl`` and ``-O`` with ``-o``. For example:: + + > curl https://bootstrap.pypa.io/ez_setup.py -o - | python + + + Advanced Installation + ===================== + + For more advanced installation options, such as installing to custom + locations or prefixes, download and extract the source + tarball from `Setuptools on PyPI <https://pypi.python.org/pypi/setuptools>`_ + and run setup.py with any supported distutils and Setuptools options. + For example:: + + setuptools-x.x$ python setup.py install --prefix=/opt/setuptools + + Use ``--help`` to get a full options list, but we recommend consulting + the `EasyInstall manual`_ for detailed instructions, especially `the section + on custom installation locations`_. + + .. _EasyInstall manual: https://pythonhosted.org/setuptools/EasyInstall + .. _the section on custom installation locations: https://pythonhosted.org/setuptools/EasyInstall#custom-installation-locations + + + Downloads + ========= + + All setuptools downloads can be found at `the project's home page in the Python + Package Index`_. Scroll to the very bottom of the page to find the links. + + .. _the project's home page in the Python Package Index: https://pypi.python.org/pypi/setuptools + + In addition to the PyPI downloads, the development version of ``setuptools`` + is available from the `Bitbucket repo`_, and in-development versions of the + `0.6 branch`_ are available as well. + + .. _Bitbucket repo: https://bitbucket.org/pypa/setuptools/get/default.tar.gz#egg=setuptools-dev + .. _0.6 branch: http://svn.python.org/projects/sandbox/branches/setuptools-0.6/#egg=setuptools-dev06 + + Uninstalling + ============ + + On Windows, if Setuptools was installed using an ``.exe`` or ``.msi`` + installer, simply use the uninstall feature of "Add/Remove Programs" in the + Control Panel. + + Otherwise, to uninstall Setuptools or Distribute, regardless of the Python + version, delete all ``setuptools*`` and ``distribute*`` files and + directories from your system's ``site-packages`` directory + (and any other ``sys.path`` directories) FIRST. + + If you are upgrading or otherwise plan to re-install Setuptools or Distribute, + nothing further needs to be done. If you want to completely remove Setuptools, + you may also want to remove the 'easy_install' and 'easy_install-x.x' scripts + and associated executables installed to the Python scripts directory. + + -------------------------------- + Using Setuptools and EasyInstall + -------------------------------- + + Here are some of the available manuals, tutorials, and other resources for + learning about Setuptools, Python Eggs, and EasyInstall: + + * `The EasyInstall user's guide and reference manual`_ + * `The setuptools Developer's Guide`_ + * `The pkg_resources API reference`_ + * `The Internal Structure of Python Eggs`_ + + Questions, comments, and bug reports should be directed to the `distutils-sig + mailing list`_. If you have written (or know of) any tutorials, documentation, + plug-ins, or other resources for setuptools users, please let us know about + them there, so this reference list can be updated. If you have working, + *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 + .. _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 + .. _The EasyInstall user's guide and reference manual: https://pythonhosted.org/setuptools/easy_install.html + .. _distutils-sig mailing list: http://mail.python.org/pipermail/distutils-sig/ + + + ------- + Credits + ------- + + * The original design for the ``.egg`` format and the ``pkg_resources`` API was + co-created by Phillip Eby and Bob Ippolito. Bob also implemented the first + version of ``pkg_resources``, and supplied the OS X operating system version + compatibility algorithm. + + * Ian Bicking implemented many early "creature comfort" features of + easy_install, including support for downloading via Sourceforge and + Subversion repositories. Ian's comments on the Web-SIG about WSGI + application deployment also inspired the concept of "entry points" in eggs, + and he has given talks at PyCon and elsewhere to inform and educate the + community about eggs and setuptools. + + * Jim Fulton contributed time and effort to build automated tests of various + aspects of ``easy_install``, and supplied the doctests for the command-line + ``.exe`` wrappers on Windows. + + * Phillip J. Eby is the seminal author of setuptools, and + first proposed the idea of an importable binary distribution format for + Python application plug-ins. + + * Significant parts of the implementation of setuptools were funded by the Open + Source Applications Foundation, to provide a plug-in infrastructure for the + Chandler PIM application. In addition, many OSAF staffers (such as Mike + "Code Bear" Taylor) contributed their time and stress as guinea pigs for the + use of eggs and setuptools, even before eggs were "cool". (Thanks, guys!) + + * Tarek Ziadé is the principal author of the Distribute fork, which + re-invigorated the community on the project, encouraged renewed innovation, + and addressed many defects. + + * Since the merge with Distribute, Jason R. Coombs is the + maintainer of setuptools. The project is maintained in coordination with + the Python Packaging Authority (PyPA) and the larger Python community. + + .. _files: + +Keywords: CPAN PyPI distutils eggs package management +Platform: UNKNOWN +Classifier: Development Status :: 5 - Production/Stable +Classifier: Intended Audience :: Developers +Classifier: License :: OSI Approved :: Python Software Foundation License +Classifier: License :: OSI Approved :: Zope Public License +Classifier: Operating System :: OS Independent +Classifier: Programming Language :: Python :: 2.6 +Classifier: Programming Language :: Python :: 2.7 +Classifier: Programming Language :: Python :: 3 +Classifier: Programming Language :: Python :: 3.1 +Classifier: Programming Language :: Python :: 3.2 +Classifier: Programming Language :: Python :: 3.3 +Classifier: Programming Language :: Python :: 3.4 +Classifier: Topic :: Software Development :: Libraries :: Python Modules +Classifier: Topic :: System :: Archiving :: Packaging +Classifier: Topic :: System :: Systems Administration +Classifier: Topic :: Utilities diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setuptools-15.1/setuptools.egg-info/SOURCES.txt new/setuptools-17.1/setuptools.egg-info/SOURCES.txt --- old/setuptools-15.1/setuptools.egg-info/SOURCES.txt 2015-04-15 15:16:30.000000000 +0200 +++ new/setuptools-17.1/setuptools.egg-info/SOURCES.txt 2015-06-07 16:38:08.000000000 +0200 @@ -44,6 +44,7 @@ pkg_resources/_vendor/packaging/specifiers.py pkg_resources/_vendor/packaging/version.py pkg_resources/tests/__init__.py +pkg_resources/tests/test_markers.py pkg_resources/tests/test_pkg_resources.py pkg_resources/tests/test_resources.py setuptools/__init__.py
