diff --git a/python-setuptools.changes b/python-setuptools.changes index 773e96e..250a371 100644 --- a/python-setuptools.changes +++ b/python-setuptools.changes @@ -1,3 +1,23 @@ +------------------------------------------------------------------- +Thu Feb 23 13:28:56 UTC 2017 - jmatejek@suse.com + +- update to 34.2.0 + * dependencies are no longer vendored and setuptools can't bootstrap + without them + * drop support for python 2.6 and 3.2 + * declarative config option for setup.cfg + * nspkg.pth files for development + * switch to zip format for source dist + * ensure extras are honored when building the working set + * add support for reading dist-info metadata + * support for PEP440 version specifiers +- added build-time and run-time dependencies to appdirs and packaging, + ensured these packages build without setuptools +- drop upstreamed setuptools-certpath.patch +- drop unneeded setuptools-5.4.1-create-sitedir.patch +- add fdupes +- change source file to zip, add unzip dependency + ------------------------------------------------------------------- Thu Feb 16 15:58:12 UTC 2017 - jmatejek@suse.com diff --git a/python-setuptools.spec b/python-setuptools.spec index 7ab7f8b..0b97b18 100644 --- a/python-setuptools.spec +++ b/python-setuptools.spec @@ -17,25 +17,30 @@ %{?!python_module:%define python_module() python-%1 python3-%1} +%define oldpython python Name: python-setuptools -Version: 28.3.0 +Version: 34.2.0 Release: 0 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.io/packages/source/s/setuptools/setuptools-%{version}.tar.gz +Source: https://pypi.io/packages/source/s/setuptools/setuptools-%{version}.zip Source1: psfl.txt Source2: zpl.txt -Patch1: setuptools-5.4.1-create-sitedir.patch # NOTE(toabctl): Fix for SLE11SP3 test failures Patch3: fix-sle11-test-failure.patch -# PATCH-FIX-UPSTREAM better handling of certificate store in SUSE -Patch4: setuptools-certpath.patch +BuildRequires: %{python_module appdirs} BuildRequires: %{python_module devel} +BuildRequires: %{python_module packaging} +BuildRequires: %{python_module six} BuildRequires: %{python_module xml} +BuildRequires: fdupes BuildRequires: python-rpm-macros +BuildRequires: unzip # needed for SLE Requires: python +Requires: python-appdirs +Requires: python-packaging Requires: python-six Requires: python-xml Recommends: ca-certificates-mozilla @@ -43,8 +48,10 @@ Requires(post): update-alternatives Requires(postun): update-alternatives # NOTE(saschpe): Distribute was merged into 0.7.x, so even though distribute # obsoletes setuptools < 0.6.45, current setuptools obsoletes distribute again -Provides: python-distribute = %{version} -Obsoletes: python-distribute < %{version} +%ifpython2 +Provides: %{oldpython}-distribute = %{version} +Obsoletes: %{oldpython}-distribute < %{version} +%endif %if 0%{?suse_version} > 1110 BuildArch: noarch %endif @@ -59,11 +66,9 @@ especially ones that have dependencies on other packages. %prep %setup -q -n setuptools-%{version} -%patch1 -p1 %if 0%{?suse_version} && 0%{?suse_version} <= 1220 %patch3 -p1 %endif -%patch4 -p1 find . -type f -name "*.orig" -delete # fix rpmlint spurious-executable-perm @@ -75,7 +80,7 @@ chmod -x README.rst # s@...@...@ = same as s/.../.../ except with @ instead of / # ^ = start; #!/ = shebang leading characters; .* = rest of line; $ = end # replace with nothing -sed -r -i '1s@^#!/.*$@@' pkg_resources/_vendor/appdirs.py setuptools/command/easy_install.py +sed -r -i '1s@^#!/.*$@@' setuptools/command/easy_install.py %build %python_build @@ -83,6 +88,7 @@ sed -r -i '1s@^#!/.*$@@' pkg_resources/_vendor/appdirs.py setuptools/command/eas %install %python_install %prepare_alternative easy_install +%fdupes %{buildroot}%{_prefix} # Can not run testsuite as this introduces build cycle #%check diff --git a/setuptools-28.3.0.tar.gz b/setuptools-28.3.0.tar.gz deleted file mode 100644 index 5e8d369..0000000 --- a/setuptools-28.3.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e31c9397fcb3bf20c257f5804d0ea2a17cf220027f4ab65b9ee5158010d41fc2 -size 640503 diff --git a/setuptools-34.2.0.zip b/setuptools-34.2.0.zip new file mode 100644 index 0000000..500bbb2 --- /dev/null +++ b/setuptools-34.2.0.zip @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7b551f5070f9414d48c08dda58bcb879c8d9276199283a99dc8e1362e2f378a2 +size 621904 diff --git a/setuptools-5.4.1-create-sitedir.patch b/setuptools-5.4.1-create-sitedir.patch deleted file mode 100644 index c6ab01f..0000000 --- a/setuptools-5.4.1-create-sitedir.patch +++ /dev/null @@ -1,18 +0,0 @@ -Index: setuptools-15.0/setuptools/command/easy_install.py -=================================================================== ---- setuptools-15.0.orig/setuptools/command/easy_install.py -+++ setuptools-15.0/setuptools/command/easy_install.py -@@ -415,6 +415,13 @@ class easy_install(Command): - instdir = normalize_path(self.install_dir) - pth_file = os.path.join(instdir, 'easy-install.pth') - -+ # make sure that the directory exists -+ if not os.path.exists(instdir): -+ try: -+ os.makedirs(instdir) -+ except (OSError,IOError): -+ self.cant_write_to_target() -+ - # Is it a configured, PYTHONPATH, implicit, or explicit site dir? - is_site_dir = instdir in self.all_site_dirs - diff --git a/setuptools-certpath.patch b/setuptools-certpath.patch deleted file mode 100644 index fa665aa..0000000 --- a/setuptools-certpath.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/setuptools/ssl_support.py b/setuptools/ssl_support.py -index f4ba8a9..1627263 100644 ---- a/setuptools/ssl_support.py -+++ b/setuptools/ssl_support.py -@@ -26,6 +26,7 @@ cert_paths = """ - /etc/ssl/cert.pem - /System/Library/OpenSSL/certs/cert.pem - /usr/local/share/certs/ca-root-nss.crt -+/etc/ssl/ca-bundle.pem - """.strip().split() - - -@@ -242,6 +243,7 @@ def find_ca_bundle(): - if os.path.isfile(cert_path): - return cert_path - try: -- return pkg_resources.resource_filename('certifi', 'cacert.pem') -+ import certifi -+ return certifi.where() - except (ImportError, ResolutionError, ExtractionError): - return None