From b60f7b237ae8aeddbcf8598aecc189b7dc97f0fba36156c5f63d9b2b6e7624bb Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Thu, 8 Jun 2017 10:06:05 +0000 Subject: [PATCH 1/4] - update to 36.0.1 * #1042: Fix import in py27compat module that still referenced six directly, rather than through the externs module (vendored packages hook). * #980 and others: Once again, Setuptools vendors all of its dependencies. It seems to be the case that in the Python ecosystem, all build tools must run without any dependencies (build, runtime, or otherwise). At such a point that a mechanism exists that allows build tools to have dependencies, Setuptools will adopt it. * #1015: Fix test failures on Python 3.7. * #1024: Add workaround for Jython #2581 in monkey module. * #992: Revert change introduced in v34.4.1, now considered invalid. * #1016: Revert change introduced in v35.0.0 per #1014, referencing #436. The approach had unintended consequences, causing sdist installs to be missing files. OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-setuptools?expand=0&rev=111 --- python-setuptools.changes | 23 +++++++++++++++++++++++ python-setuptools.spec | 2 +- setuptools-34.2.0.zip | 3 --- setuptools-36.0.1.zip | 3 +++ 4 files changed, 27 insertions(+), 4 deletions(-) delete mode 100644 setuptools-34.2.0.zip create mode 100644 setuptools-36.0.1.zip diff --git a/python-setuptools.changes b/python-setuptools.changes index 250a371..83b4c05 100644 --- a/python-setuptools.changes +++ b/python-setuptools.changes @@ -1,3 +1,26 @@ +------------------------------------------------------------------- +Thu Jun 8 10:04:16 UTC 2017 - dmueller@suse.com + +- update to 36.0.1 + * #1042: Fix import in py27compat module that still + referenced six directly, rather than through the externs + module (vendored packages hook). + * #980 and others: Once again, Setuptools vendors all + of its dependencies. It seems to be the case that in + the Python ecosystem, all build tools must run without + any dependencies (build, runtime, or otherwise). At + such a point that a mechanism exists that allows + build tools to have dependencies, Setuptools will adopt + it. + * #1015: Fix test failures on Python 3.7. + * #1024: Add workaround for Jython #2581 in monkey module. + * #992: Revert change introduced in v34.4.1, now + considered invalid. + * #1016: Revert change introduced in v35.0.0 per #1014, + referencing #436. The approach had unintended + consequences, causing sdist installs to be missing + files. + ------------------------------------------------------------------- Thu Feb 23 13:28:56 UTC 2017 - jmatejek@suse.com diff --git a/python-setuptools.spec b/python-setuptools.spec index f875f36..a50259a 100644 --- a/python-setuptools.spec +++ b/python-setuptools.spec @@ -19,7 +19,7 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} %define oldpython python Name: python-setuptools -Version: 34.2.0 +Version: 36.0.1 Release: 0 Summary: Easily download, build, install, upgrade, and uninstall Python packages License: Python-2.0 or ZPL-2.0 diff --git a/setuptools-34.2.0.zip b/setuptools-34.2.0.zip deleted file mode 100644 index 500bbb2..0000000 --- a/setuptools-34.2.0.zip +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7b551f5070f9414d48c08dda58bcb879c8d9276199283a99dc8e1362e2f378a2 -size 621904 diff --git a/setuptools-36.0.1.zip b/setuptools-36.0.1.zip new file mode 100644 index 0000000..844cf2a --- /dev/null +++ b/setuptools-36.0.1.zip @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e17c4687fddd6d70a6604ac0ad25e33324cec71b5137267dd5c45e103c4b288a +size 711296 From cf3d602cd821e7a25ac1309b2ef37a3de6b55d2b8d6295d7f81ff815b6f1c8ad Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Thu, 8 Jun 2017 10:07:18 +0000 Subject: [PATCH 2/4] - remove fix-sle11-test-failure.patch: this doesn't build for SLE11 anymore, so no need to patch it anymore OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-setuptools?expand=0&rev=112 --- python-setuptools.changes | 2 ++ python-setuptools.spec | 7 ------- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/python-setuptools.changes b/python-setuptools.changes index 83b4c05..4323b75 100644 --- a/python-setuptools.changes +++ b/python-setuptools.changes @@ -20,6 +20,8 @@ Thu Jun 8 10:04:16 UTC 2017 - dmueller@suse.com referencing #436. The approach had unintended consequences, causing sdist installs to be missing files. +- remove fix-sle11-test-failure.patch: this doesn't build for + SLE11 anymore, so no need to patch it anymore ------------------------------------------------------------------- Thu Feb 23 13:28:56 UTC 2017 - jmatejek@suse.com diff --git a/python-setuptools.spec b/python-setuptools.spec index a50259a..f5e9930 100644 --- a/python-setuptools.spec +++ b/python-setuptools.spec @@ -27,8 +27,6 @@ Group: Development/Languages/Python Source: https://pypi.io/packages/source/s/setuptools/setuptools-%{version}.zip Source1: psfl.txt Source2: zpl.txt -# NOTE(toabctl): Fix for SLE11SP3 test failures -Patch3: fix-sle11-test-failure.patch BuildRequires: %{python_module appdirs} BuildRequires: %{python_module devel} BuildRequires: %{python_module packaging} @@ -52,9 +50,7 @@ Requires(postun): update-alternatives Provides: %{oldpython}-distribute = %{version} Obsoletes: %{oldpython}-distribute < %{version} %endif -%if 0%{?suse_version} > 1110 BuildArch: noarch -%endif %python_subpackages @@ -66,9 +62,6 @@ especially ones that have dependencies on other packages. %prep %setup -q -n setuptools-%{version} -%if 0%{?suse_version} && 0%{?suse_version} <= 1220 -%patch3 -p1 -%endif find . -type f -name "*.orig" -delete # fix rpmlint spurious-executable-perm From 93c93d9c348dc43b3320cddbd4e2a62410ccda68afe8546322f834e5dc298a94 Mon Sep 17 00:00:00 2001 From: Thomas Bechtold Date: Tue, 25 Jul 2017 11:46:01 +0000 Subject: [PATCH 3/4] Accepting request 512362 from home:stroeder:branches:devel:languages:python update to upstream release 36.2.2 OBS-URL: https://build.opensuse.org/request/show/512362 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-setuptools?expand=0&rev=113 --- python-setuptools.changes | 45 +++++++++++++++++++++++++++++++++++++++ python-setuptools.spec | 2 +- setuptools-36.0.1.zip | 3 --- setuptools-36.2.2.zip | 3 +++ 4 files changed, 49 insertions(+), 4 deletions(-) delete mode 100644 setuptools-36.0.1.zip create mode 100644 setuptools-36.2.2.zip diff --git a/python-setuptools.changes b/python-setuptools.changes index 4323b75..ee7ae31 100644 --- a/python-setuptools.changes +++ b/python-setuptools.changes @@ -1,3 +1,48 @@ +------------------------------------------------------------------- +Mon Jul 24 20:08:32 UTC 2017 - michael@stroeder.com + +- update to 36.2.2 + +v36.2.2 +------- +* #1099: Revert commit a3ec721, restoring intended purpose of + extras as part of a requirement declaration. + +v36.2.1 +------- +* fix #1086 +* fix #1087 +* support extras specifiers in install_requires requirements + +v36.2.0 +------- +* #1081: Environment markers indicated in ``install_requires`` + are now processed and treated as nameless ``extras_require`` + with markers, allowing their metadata in requires.txt to be + correctly generated. +* #1053: Tagged commits are now released using Travis-CI + build stages, meaning releases depend on passing tests on + all supported Python versions (Linux) and not just the latest + Python version. + +v36.1.1 +------- +* #1083: Correct ``py31compat.makedirs`` to correctly honor + ``exist_ok`` parameter. +* #1083: Also use makedirs compatibility throughout setuptools. + +v36.1.0 +------- +* #1083: Avoid race condition on directory creation in + ``pkg_resources.ensure_directory``. +* Removed deprecation of and restored support for + ``upload_docs`` command for sites other than PyPI. + Only warehouse is dropping support, but services like + `devpi `_ continue to + support docs built by setuptools' plugins. See + `this comment `_ + for more context on the motivation for this change. + ------------------------------------------------------------------- Thu Jun 8 10:04:16 UTC 2017 - dmueller@suse.com diff --git a/python-setuptools.spec b/python-setuptools.spec index f5e9930..997ed25 100644 --- a/python-setuptools.spec +++ b/python-setuptools.spec @@ -19,7 +19,7 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} %define oldpython python Name: python-setuptools -Version: 36.0.1 +Version: 36.2.2 Release: 0 Summary: Easily download, build, install, upgrade, and uninstall Python packages License: Python-2.0 or ZPL-2.0 diff --git a/setuptools-36.0.1.zip b/setuptools-36.0.1.zip deleted file mode 100644 index 844cf2a..0000000 --- a/setuptools-36.0.1.zip +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e17c4687fddd6d70a6604ac0ad25e33324cec71b5137267dd5c45e103c4b288a -size 711296 diff --git a/setuptools-36.2.2.zip b/setuptools-36.2.2.zip new file mode 100644 index 0000000..69742bd --- /dev/null +++ b/setuptools-36.2.2.zip @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:38156edc9b9b21f8926821d3f994abf931a50c1a2a6a2bab4d195b7d866d9bb0 +size 714105 From a2c374a47a2748e1d409d0b20fd1a41d2afe8a8ba666a625ec4a08baf7e0fef2 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Tue, 19 Sep 2017 08:50:37 +0000 Subject: [PATCH 4/4] Accepting request 527203 from home:tbechtold:branches:devel:languages:python - update to 36.5.0: * #170: When working with Mercurial checkouts, use Windows-friendly syntax for suppressing output. * Inspired by #1134, performed substantial refactoring of ``pkg_resources.find_on_path`` to facilitate an optimization for paths with many non-version entries. * #1075: Add new ``Description-Content-Type`` metadata field. `See here for documentation on how to use this field. `_ * #1068: Sort files and directories when building eggs for deterministic order. * #196: Remove caching of easy_install command in fetch_build_egg. Fixes issue where ``pytest-runner-N.N`` would satisfy the installation of ``pytest``. * #1129: Fix working set dependencies handling when replacing conflicting distributions (e.g. when using ``setup_requires`` with a conflicting transitive dependency, fix #1124). * #1133: Improved handling of README files extensions and added Markdown to the list of searched READMES. * #1135: Improve performance of pkg_resources import by not invoking ``access`` or ``stat`` and using ``os.listdir`` instead. * #1131: Make possible using several files within ``file:`` directive in metadata.long_description in ``setup.cfg``. * fix #1105: Fix handling of requirements with environment markers when declared in ``setup.cfg`` (same treatment as for #1081). * #462: Don't assume a directory is an egg by the ``.egg`` extension alone. * #1093: Fix test command handler with extras_require. * #1112, #1091, #1115: Now using Trusty containers in OBS-URL: https://build.opensuse.org/request/show/527203 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-setuptools?expand=0&rev=114 --- fix-sle11-test-failure.patch | 15 -------------- python-setuptools.changes | 38 ++++++++++++++++++++++++++++++++++++ python-setuptools.spec | 2 +- setuptools-36.2.2.zip | 3 --- setuptools-36.5.0.zip | 3 +++ 5 files changed, 42 insertions(+), 19 deletions(-) delete mode 100644 fix-sle11-test-failure.patch delete mode 100644 setuptools-36.2.2.zip create mode 100644 setuptools-36.5.0.zip diff --git a/fix-sle11-test-failure.patch b/fix-sle11-test-failure.patch deleted file mode 100644 index cd84bba..0000000 --- a/fix-sle11-test-failure.patch +++ /dev/null @@ -1,15 +0,0 @@ -This fixes a test failure on SLE11SP3: -Error is: -AssertionError: error: must supply either home or prefix/exec-prefix -- not both - ---- 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 ee7ae31..93073a4 100644 --- a/python-setuptools.changes +++ b/python-setuptools.changes @@ -1,3 +1,41 @@ +------------------------------------------------------------------- +Tue Sep 19 04:30:46 UTC 2017 - tbechtold@suse.com + +- update to 36.5.0: + * #170: When working with Mercurial checkouts, use Windows-friendly + syntax for suppressing output. + * Inspired by #1134, performed substantial refactoring of + ``pkg_resources.find_on_path`` to facilitate an optimization + for paths with many non-version entries. + * #1075: Add new ``Description-Content-Type`` metadata field. `See here for + documentation on how to use this field. + `_ + * #1068: Sort files and directories when building eggs for + deterministic order. + * #196: Remove caching of easy_install command in fetch_build_egg. + Fixes issue where ``pytest-runner-N.N`` would satisfy the installation + of ``pytest``. + * #1129: Fix working set dependencies handling when replacing conflicting + distributions (e.g. when using ``setup_requires`` with a conflicting + transitive dependency, fix #1124). + * #1133: Improved handling of README files extensions and added + Markdown to the list of searched READMES. + * #1135: Improve performance of pkg_resources import by not invoking + ``access`` or ``stat`` and using ``os.listdir`` instead. + * #1131: Make possible using several files within ``file:`` directive + in metadata.long_description in ``setup.cfg``. + * fix #1105: Fix handling of requirements with environment + markers when declared in ``setup.cfg`` (same treatment as + for #1081). + * #462: Don't assume a directory is an egg by the ``.egg`` + extension alone. + * #1093: Fix test command handler with extras_require. + * #1112, #1091, #1115: Now using Trusty containers in + Travis for CI and CD. + * #1092: ``pkg_resources`` now uses ``inspect.getmro`` to + resolve classes in method resolution order. + * #1102: Restore behavior for empty extras. + ------------------------------------------------------------------- Mon Jul 24 20:08:32 UTC 2017 - michael@stroeder.com diff --git a/python-setuptools.spec b/python-setuptools.spec index 997ed25..3161d62 100644 --- a/python-setuptools.spec +++ b/python-setuptools.spec @@ -19,7 +19,7 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} %define oldpython python Name: python-setuptools -Version: 36.2.2 +Version: 36.5.0 Release: 0 Summary: Easily download, build, install, upgrade, and uninstall Python packages License: Python-2.0 or ZPL-2.0 diff --git a/setuptools-36.2.2.zip b/setuptools-36.2.2.zip deleted file mode 100644 index 69742bd..0000000 --- a/setuptools-36.2.2.zip +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:38156edc9b9b21f8926821d3f994abf931a50c1a2a6a2bab4d195b7d866d9bb0 -size 714105 diff --git a/setuptools-36.5.0.zip b/setuptools-36.5.0.zip new file mode 100644 index 0000000..3238067 --- /dev/null +++ b/setuptools-36.5.0.zip @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ce2007c1cea3359870b80657d634253a0765b0c7dc5a988d77ba803fc86f2c64 +size 721505