diff --git a/fix-sle11-test-failure.patch b/fix-sle11-test-failure.patch index a68647a..cd84bba 100644 --- a/fix-sle11-test-failure.patch +++ b/fix-sle11-test-failure.patch @@ -2,16 +2,14 @@ This fixes a test failure on SLE11SP3: Error is: AssertionError: error: must supply either home or prefix/exec-prefix -- not both -Index: setuptools-15.0/setuptools/tests/test_egg_info.py -=================================================================== ---- setuptools-15.0.orig/setuptools/tests/test_egg_info.py -+++ setuptools-15.0/setuptools/tests/test_egg_info.py -@@ -61,7 +61,7 @@ class TestEggInfo: - ) - cmd = [ - 'install', -- '--home', env.paths['home'], -+ '--prefix', env.paths['home'], - '--install-lib', env.paths['lib'], - '--install-scripts', env.paths['scripts'], - '--install-data', env.paths['data'], +--- a/setuptools/tests/test_egg_info.py ++++ b/setuptools/tests/test_egg_info.py +@@ -217,7 +217,7 @@ class TestEggInfo(object): + if cmd is None: + cmd = [ + 'install', +- '--home', env.paths['home'], ++ '--prefix', env.paths['home'], + '--install-lib', env.paths['lib'], + '--install-scripts', env.paths['scripts'], + '--install-data', env.paths['data'], diff --git a/python-setuptools.changes b/python-setuptools.changes index dadf0ac..0696228 100644 --- a/python-setuptools.changes +++ b/python-setuptools.changes @@ -1,3 +1,117 @@ +------------------------------------------------------------------- +Mon Jul 4 10:11:11 UTC 2016 - dev@stellardeath.org + +- Update fix-sle11-test-failure.patch to new line numbers and + indentation + +------------------------------------------------------------------- +Mon Jul 4 08:57:47 UTC 2016 - tbechtold@suse.com + +- Use pypi.io for Source url + +------------------------------------------------------------------- +Thu Jun 30 05:33:02 UTC 2016 - tbechtold@suse.com + +- update to 23.1.0: + * #619: Deprecated ``tag_svn_revision`` distribution + option. + * #611: Removed ARM executables for CLI and GUI script + launchers on Windows. If this was a feature you cared + about, please comment in the ticket. + * #604: Removed docs building support. The project + now relies on documentation hosted at + https://setuptools.readthedocs.io/. + * #604: Restore repository for upload_docs command + to restore publishing of docs during release. + * #589: Upload releases to pypi.io using the upload + hostname and legacy path. + * #589: Releases are now uploaded to pypi.io (Warehouse) + even when releases are made on Twine via Travis. + * #589: Releases are now uploaded to pypi.io (Warehouse). + * #190: On Python 2, if unicode is passed for packages to + ``build_py`` command, it will be handled just as with + text on Python 3. + * #598: Setuptools now lists itself first in the User-Agent + for web requests, better following the guidelines in + `RFC 7231 + `_. + * Minor fixes to changelog and docs. + * #261: Exclude directories when resolving globs in + package_data. + * #539: In the easy_install get_site_dirs, honor all + paths found in ``site.getsitepackages``. + * #572: In build_ext, now always import ``_CONFIG_VARS`` + from ``distutils`` rather than from ``sysconfig`` + to allow ``distutils.sysconfig.customize_compiler`` + configure the OS X compiler for ``-dynamiclib``. + * Removed ez_setup.py from Setuptools sdist. The + bootstrap script will be maintained in its own + branch and should be generally be retrieved from + its canonical location at + https://bootstrap.pypa.io/ez_setup.py. + * #553: egg_info section is now generated in a + deterministic order, matching the order generated + by earlier versions of Python. Except on Python 2.6, + order is preserved when existing settings are present. + * #556: Update to Packaging 16.7, restoring support + for deprecated ``python_implmentation`` marker. + * #555: Upload command now prompts for a password + when uploading to PyPI (or other repository) if no + password is present in .pypirc or in the keyring. + * #548: Update certify version to 2016.2.28 + * #545: Safely handle deletion of non-zip eggs in rotate + command. + * Issue #544: Fix issue with extra environment marker + processing in WorkingSet due to refactor in v20.7.0. + * Issue #543: Re-release so that latest release doesn't + cause déjà vu with distribute and setuptools 0.7 in + older environments. + * Refactored extra enviroment marker processing + in WorkingSet. + * Issue #533: Fixed intermittent test failures. + * Issue #536: In msvc9_support, trap additional exceptions + that might occur when importing + ``distutils.msvc9compiler`` in mingw environments. + * Issue #537: Provide better context when package + metadata fails to decode in UTF-8. + * Issue #523: Restored support for environment markers, + now honoring 'extra' environment markers. + * Issue #523: Disabled support for environment markers + introduced in v20.5. + * Issue #503: Restore support for PEP 345 environment + markers by updating to Packaging 16.6. + * New release process that relies on + `bumpversion `_ + and Travis CI for continuous deployment. + * Project versioning semantics now follow + `semver `_ 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. + * BB Pull Request #185, #470: 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. + * Issue #422: Moved hosting to + `Github `_ + from `Bitbucket `_. + 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. + * Issue #519: Remove import hook when reloading the + ``pkg_resources`` module. + * BB Pull Request #184: Update documentation in ``pkg_resources`` + around new ``Requirement`` implementation. + * 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 + * BB Pull Request #179: Restore use of RequirementParseError + exception unintentionally dropped in 20.2. + ------------------------------------------------------------------- Wed Mar 9 09:37:04 UTC 2016 - tbechtold@suse.com diff --git a/python-setuptools.spec b/python-setuptools.spec index c85f295..55e09f3 100644 --- a/python-setuptools.spec +++ b/python-setuptools.spec @@ -17,13 +17,13 @@ Name: python-setuptools -Version: 20.2.2 +Version: 23.1.0 Release: 0 Url: http://pypi.python.org/pypi/setuptools Summary: Easily download, build, install, upgrade, and uninstall Python packages License: Python-2.0 or ZPL-2.0 Group: Development/Languages/Python -Source: https://pypi.python.org/packages/source/s/setuptools/setuptools-%{version}.tar.gz +Source: https://pypi.io/packages/source/s/setuptools/setuptools-%{version}.tar.gz Source1: psfl.txt Source2: zpl.txt Patch1: setuptools-5.4.1-create-sitedir.patch @@ -62,7 +62,6 @@ especially ones that have dependencies on other packages. find . -type f -name "*.orig" -delete %build -chmod -x *txt python setup.py build %install @@ -88,7 +87,7 @@ fi %files %defattr(-,root,root,-) -%doc CHANGES.txt README.txt +%doc CHANGES.rst README.rst %{_bindir}/easy_install %{_bindir}/easy_install-%{py_ver} %ghost %{_sysconfdir}/alternatives/easy_install diff --git a/setuptools-20.2.2.tar.gz b/setuptools-20.2.2.tar.gz deleted file mode 100644 index 60e0e46..0000000 --- a/setuptools-20.2.2.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:24fcfc15364a9fe09a220f37d2dcedc849795e3de3e4b393ee988e66a9cbd85a -size 676284 diff --git a/setuptools-23.1.0.tar.gz b/setuptools-23.1.0.tar.gz new file mode 100644 index 0000000..f44ddc5 --- /dev/null +++ b/setuptools-23.1.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4e269d36ba2313e6236f384b36eb97b3433cf99a16b94c74cca7eee2b311f2be +size 601865