From 9931946b2c26dffe1102fd8ab6245b3ee3f3190075532691d0b62c9b9239408a Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Wed, 31 Aug 2016 06:43:55 +0000 Subject: [PATCH 1/2] Accepting request 423762 from home:tbechtold:branches:devel:languages:python - update to 26.1.1: * Re-release of 26.1.0 with pytest pinned to allow for automated deployement and thus proper packaging environment variables, fixing issues with missing executable launchers. * #763: ``pkg_resources.get_default_cache`` now defers to the `appdirs project `_ to resolve the cache directory. Adds a vendored dependency on appdirs to pkg_resources. * #748: By default, sdists are now produced in gzipped tarfile format by default on all platforms, adding forward compatibility for the same behavior in Python 3.6 (See Python #27819). * #459 via #736: On Windows with script launchers, sys.argv[0] now reflects the name of the entry point, consistent with the behavior in distlib and pip wrappers. * #752 via #753: When indicating ``py_limited_api`` to Extension, it must be passed as a keyword argument. * Add Extension(py_limited_api=True). When set to a truthy value, that extension gets a filename apropriate for code using Py_LIMITED_API. When used correctly this allows a single compiled extension to work on all future versions of CPython 3. The py_limited_api argument only controls the filename. To be compatible with multiple versions of Python 3, the C extension will also need to set -DPy_LIMITED_API=... and be modified to use only the functions in the limited API. * #739 Fix unquoted libpaths by fixing compatibility between `numpy.distutils` and `distutils._msvccompiler` for numpy < 1.11.2 (Fix issue #728, error also fixed in Numpy). * #731: Bump certifi. * Style updates. See #740, #741, #743, #744, #742, #747. OBS-URL: https://build.opensuse.org/request/show/423762 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-setuptools?expand=0&rev=99 --- python-setuptools.changes | 118 ++++++++++++++++++++++++++++++++++++++ python-setuptools.spec | 2 +- setuptools-23.1.0.tar.gz | 3 - setuptools-26.1.1.tar.gz | 3 + 4 files changed, 122 insertions(+), 4 deletions(-) delete mode 100644 setuptools-23.1.0.tar.gz create mode 100644 setuptools-26.1.1.tar.gz diff --git a/python-setuptools.changes b/python-setuptools.changes index 0696228..95575cd 100644 --- a/python-setuptools.changes +++ b/python-setuptools.changes @@ -1,3 +1,121 @@ +------------------------------------------------------------------- +Tue Aug 30 08:08:13 UTC 2016 - tbechtold@suse.com + +- update to 26.1.1: + * Re-release of 26.1.0 with pytest pinned to allow for automated + deployement and thus proper packaging environment variables, + fixing issues with missing executable launchers. + * #763: ``pkg_resources.get_default_cache`` now defers to the + `appdirs project `_ to + resolve the cache directory. Adds a vendored dependency on + appdirs to pkg_resources. + * #748: By default, sdists are now produced in gzipped tarfile + format by default on all platforms, adding forward compatibility + for the same behavior in Python 3.6 (See Python #27819). + * #459 via #736: On Windows with script launchers, + sys.argv[0] now reflects + the name of the entry point, consistent with the behavior in + distlib and pip wrappers. + * #752 via #753: When indicating ``py_limited_api`` to Extension, + it must be passed as a keyword argument. + * Add Extension(py_limited_api=True). When set to a truthy value, + that extension gets a filename apropriate for code using Py_LIMITED_API. + When used correctly this allows a single compiled extension to work on + all future versions of CPython 3. + The py_limited_api argument only controls the filename. To be + compatible with multiple versions of Python 3, the C extension + will also need to set -DPy_LIMITED_API=... and be modified to use + only the functions in the limited API. + * #739 Fix unquoted libpaths by fixing compatibility between + `numpy.distutils` and `distutils._msvccompiler` + for numpy < 1.11.2 (Fix issue #728, error also fixed in Numpy). + * #731: Bump certifi. + * Style updates. See #740, #741, #743, #744, #742, #747. + * #735: include license file. + * #612 via #730: Add a LICENSE file which needs to be provided by the terms of + the MIT license. + * #725: revert `library_dir_option` patch (Error is related to + `numpy.distutils` and make errors on non Numpy users). + * #720 + * #723: Improve patch for `library_dir_option`. + * #717 + * #713 + * #707: Fix Python 2 compatibility for MSVC by catching errors properly. + * #715: Fix unquoted libpaths by patching `library_dir_option`. + * #714 and #704: Revert fix as it breaks other components + downstream that can't handle unicode. See #709, #710, + and #712. + * #704: Fix errors when installing a zip sdist that contained + files named with non-ascii characters on Windows would + crash the install when it attempted to clean up the build. + * #646: MSVC compatibility - catch errors properly in + RegistryInfo.lookup. + * #702: Prevent UnboundLocalError when initial working_set + is empty. + * #686: Fix issue in sys.path ordering by pkg_resources when + rewrite technique is "raw". + * #699: Fix typo in msvc support. + * #609: Setuptools will now try to download a distribution from + the next possible download location if the first download fails. + This means you can now specify multiple links as ``dependency_links`` + and all links will be tried until a working download link is encountered. + * #688: Fix AttributeError in setup.py when invoked not from + the current directory. + * Cleanup of setup.py script. + * Fixed documentation builders by allowing setup.py + to be imported without having bootstrapped the + metadata. + * More style cleanup. See #677, #678, #679, #681, #685. + * #674: Default ``sys.path`` manipulation by easy-install.pth + is now "raw", meaning that when writing easy-install.pth + during any install operation, the ``sys.path`` will not be + rewritten and will no longer give preference to easy_installed + packages. + To retain the old behavior when using any easy_install + operation (including ``setup.py install`` when setuptools is + present), set the environment variable: + SETUPTOOLS_SYS_PATH_TECHNIQUE=rewrite + This project hopes that that few if any environments find it + necessary to retain the old behavior, and intends to drop + support for it altogether in a future release. Please report + any relevant concerns in the ticket for this change. + * #398: Fix shebang handling on Windows in script + headers where spaces in ``sys.executable`` would + produce an improperly-formatted shebang header, + introduced in 12.0 with the fix for #188. + * #663, #670: More style updates. + * #516: Disable ``os.link`` to avoid hard linking + in ``sdist.make_distribution``, avoiding errors on + systems that support hard links but not on the + file system in which the build is occurring. + * #667: Update Metadata-Version to 1.2 when + ``python_requires`` is supplied. + * #631: Add support for ``python_requires`` keyword. + * More style updates. See #660, #661, #641. + * #659: ``setup.py`` now will fail fast and with a helpful + error message when the necessary metadata is missing. + * More style updates. See #656, #635, #640, + #644, #650, #652, and #655. + * Updated style in much of the codebase to match + community expectations. See #632, #633, #634, + #637, #639, #638, #642, #648. + * If MSVC++14 is needed ``setuptools.msvc`` now redirect + user to Visual C++ Build Tools web page. + * #625 and #626: Fixes on ``setuptools.msvc`` mainly + for Python 2 and Linux. + * Pull Request #174: Add more aggressive support for + standalone Microsoft Visual C++ compilers in + msvc9compiler patch. + Particularly : Windows SDK 6.1 and 7.0 + (MSVC++ 9.0), Windows SDK 7.1 (MSVC++ 10.0), + Visual C++ Build Tools 2015 (MSVC++14) + * Renamed ``setuptools.msvc9_support`` to + ``setuptools.msvc``. + Re-release of v23.2.0, which was missing the intended + commits. + * #623: Remove used of deprecated 'U' flag when reading + manifests. + ------------------------------------------------------------------- Mon Jul 4 10:11:11 UTC 2016 - dev@stellardeath.org diff --git a/python-setuptools.spec b/python-setuptools.spec index 55e09f3..c2d4c44 100644 --- a/python-setuptools.spec +++ b/python-setuptools.spec @@ -17,7 +17,7 @@ Name: python-setuptools -Version: 23.1.0 +Version: 26.1.1 Release: 0 Url: http://pypi.python.org/pypi/setuptools Summary: Easily download, build, install, upgrade, and uninstall Python packages diff --git a/setuptools-23.1.0.tar.gz b/setuptools-23.1.0.tar.gz deleted file mode 100644 index f44ddc5..0000000 --- a/setuptools-23.1.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4e269d36ba2313e6236f384b36eb97b3433cf99a16b94c74cca7eee2b311f2be -size 601865 diff --git a/setuptools-26.1.1.tar.gz b/setuptools-26.1.1.tar.gz new file mode 100644 index 0000000..8a5e4ff --- /dev/null +++ b/setuptools-26.1.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:475ce28993d7cb75335942525b9fac79f7431a7f6e8a0079c0f2680641379481 +size 637041 From 8b6122bdee10f7f44b1abd51fef39d5b896823c26d3c199c425dde2747ccd848 Mon Sep 17 00:00:00 2001 From: Jan Matejek Date: Wed, 31 Aug 2016 15:37:24 +0000 Subject: [PATCH 2/2] - fix certificate handling with certifi, add support for SUSE's CA bundle (setuptools-certpath.patch, fixes boo#993968) - remove shebang lines, strip executable bit from README, to silence the easy rpmlint warnings OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-setuptools?expand=0&rev=100 --- python-setuptools.changes | 8 ++++++++ python-setuptools.spec | 15 +++++++++++++++ setuptools-certpath.patch | 21 +++++++++++++++++++++ 3 files changed, 44 insertions(+) create mode 100644 setuptools-certpath.patch diff --git a/python-setuptools.changes b/python-setuptools.changes index 95575cd..008a741 100644 --- a/python-setuptools.changes +++ b/python-setuptools.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Wed Aug 31 14:56:46 UTC 2016 - jmatejek@suse.com + +- fix certificate handling with certifi, add support for SUSE's + CA bundle (setuptools-certpath.patch, fixes boo#993968) +- remove shebang lines, strip executable bit from README, to silence + the easy rpmlint warnings + ------------------------------------------------------------------- Tue Aug 30 08:08:13 UTC 2016 - tbechtold@suse.com diff --git a/python-setuptools.spec b/python-setuptools.spec index c2d4c44..d3c967f 100644 --- a/python-setuptools.spec +++ b/python-setuptools.spec @@ -29,6 +29,8 @@ 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 BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: python-devel BuildRequires: python-xml @@ -36,6 +38,7 @@ BuildRequires: python-xml Requires: python Requires: python-six Requires: python-xml +Recommends: ca-certificates-mozilla Requires(post): update-alternatives Requires(postun): update-alternatives # NOTE(saschpe): Distribute was merged into 0.7.x, so even though distribute @@ -58,9 +61,21 @@ especially ones that have dependencies on other packages. %patch1 -p1 %if 0%{?suse_version} && 0%{?suse_version} <= 1220 %patch3 -p1 +%patch4 -p1 %endif find . -type f -name "*.orig" -delete +# fix rpmlint spurious-executable-perm +chmod -x README.rst + +# strip shebangs to fix rpmlint warnings +# "explain the sed": +# 1 = first line only +# 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 + %build python setup.py build diff --git a/setuptools-certpath.patch b/setuptools-certpath.patch new file mode 100644 index 0000000..fa665aa --- /dev/null +++ b/setuptools-certpath.patch @@ -0,0 +1,21 @@ +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