From b149d74f8e14a4d421ccab96c61b6339f33a70e9a913532d6bf4a4f0ff2cbe0b Mon Sep 17 00:00:00 2001 From: Denisart Benjamin Date: Wed, 23 Jul 2014 21:24:25 +0000 Subject: [PATCH] Accepting request 242094 from home:sleep_walker:branches:devel:languages:python patch changes are now in patch name and mentioned in changelog entry - bump to 5.4.1 Changes between 5.4.1 and 3.6 * Python #7776: (ssl_support) Correct usage of host for validation when tunneling for HTTPS. * Issue #154: pkg_resources will now cache the zip manifests rather than re-processing the same file from disk multiple times, but only if the environment variable PKG_RESOURCES_CACHE_ZIP_MANIFESTS is set. Clients that package many modules in the same zip file will see some improvement in startup time by enabling this feature. This feature is not enabled by default because it causes a substantial increase in memory usage. * Issue #185: Make svn tagging work on the new style SVN metadata. Thanks cazabon! * Prune revision control directories (e.g .svn) from base path as well as sub-directories. * Added a Developer Guide to the official documentation. * Some code refactoring and cleanup was done with no intended behavioral changes. * During install_egg_info, the generated lines for namespace package .pth files are now processed even during a dry run. * Issue #202: Implemented more robust cache invalidation for the ZipImporter, building on the work in Issue #168. Special thanks to Jurko Gospodnetic and PJE. * Issue #220: Restored script templates. * Renamed script templates to end with .tmpl now that they no longer need to be processed by 2to3. Fixes spurious syntax errors during build/install. * Issue #218: Re-release of 3.8.1 to signal that it supersedes 4.x. * Incidentally, script templates were updated not to include the triple-quote escaping. * Issue #213: Use legacy StringIO behavior for compatibility under pbr. * Issue #218: Setuptools 3.8.1 superseded 4.0.1, and 4.x was removed from OBS-URL: https://build.opensuse.org/request/show/242094 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-setuptools?expand=0&rev=70 --- python-setuptools.changes | 43 +++++++++++++++++++ python-setuptools.spec | 6 +-- setuptools-3.6.tar.gz | 3 -- ...h => setuptools-5.4.1-create-sitedir.patch | 10 +++-- setuptools-5.4.1.tar.gz | 3 ++ 5 files changed, 55 insertions(+), 10 deletions(-) delete mode 100644 setuptools-3.6.tar.gz rename setuptools-0.6c9-create-sitedir.patch => setuptools-5.4.1-create-sitedir.patch (53%) create mode 100644 setuptools-5.4.1.tar.gz diff --git a/python-setuptools.changes b/python-setuptools.changes index 9259124..ab5f74b 100644 --- a/python-setuptools.changes +++ b/python-setuptools.changes @@ -1,3 +1,46 @@ +------------------------------------------------------------------- +Wed Jul 23 08:54:56 UTC 2014 - sleep_walker@suse.cz + +- bump to 5.4.1 + Changes between 5.4.1 and 3.6 + * Python #7776: (ssl_support) Correct usage of host for validation when + tunneling for HTTPS. + * Issue #154: pkg_resources will now cache the zip manifests rather than + re-processing the same file from disk multiple times, but only if the + environment variable PKG_RESOURCES_CACHE_ZIP_MANIFESTS is set. Clients + that package many modules in the same zip file will see some improvement + in startup time by enabling this feature. This feature is not enabled by + default because it causes a substantial increase in memory usage. + * Issue #185: Make svn tagging work on the new style SVN metadata. Thanks + cazabon! + * Prune revision control directories (e.g .svn) from base path as well as + sub-directories. + * Added a Developer Guide to the official documentation. + * Some code refactoring and cleanup was done with no intended behavioral + changes. + * During install_egg_info, the generated lines for namespace package .pth + files are now processed even during a dry run. + * Issue #202: Implemented more robust cache invalidation for the + ZipImporter, building on the work in Issue #168. Special thanks to Jurko + Gospodnetic and PJE. + * Issue #220: Restored script templates. + * Renamed script templates to end with .tmpl now that they no longer need to + be processed by 2to3. Fixes spurious syntax errors during build/install. + * Issue #218: Re-release of 3.8.1 to signal that it supersedes 4.x. + * Incidentally, script templates were updated not to include the + triple-quote escaping. + * Issue #213: Use legacy StringIO behavior for compatibility under pbr. + * Issue #218: Setuptools 3.8.1 superseded 4.0.1, and 4.x was removed from + the available versions to install. + * Issue #210: setup.py develop now copies scripts in binary mode rather than + text mode, matching the behavior of the install command. + * Extend Issue #197 workaround to include all Python 3 versions prior to + * Issue #193: Improved handling of Unicode filenames when building + manifests. + +- drop not applying patch setuptools-0.6c9-create-sitedir.patch +- introduce applying patch with the same effect setuptools-5.4.1-create-sitedir.patch + ------------------------------------------------------------------- Thu May 8 11:25:32 UTC 2014 - toddrme2178@gmail.com diff --git a/python-setuptools.spec b/python-setuptools.spec index 791e793..31c16e5 100644 --- a/python-setuptools.spec +++ b/python-setuptools.spec @@ -17,7 +17,7 @@ Name: python-setuptools -Version: 3.6 +Version: 5.4.1 Release: 0 Url: http://pypi.python.org/pypi/setuptools Summary: Easily download, build, install, upgrade, and uninstall Python packages @@ -26,7 +26,7 @@ Group: Development/Languages/Python Source: https://pypi.python.org/packages/source/s/setuptools/setuptools-%{version}.tar.gz Source1: psfl.txt Source2: zpl.txt -Patch1: setuptools-0.6c9-create-sitedir.patch +Patch1: setuptools-5.4.1-create-sitedir.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: python-devel BuildRequires: python-xml @@ -52,7 +52,7 @@ especially ones that have dependencies on other packages. %prep %setup -q -n setuptools-%{version} -%patch1 +%patch1 -p1 find . -type f -name "*.orig" -delete %build diff --git a/setuptools-3.6.tar.gz b/setuptools-3.6.tar.gz deleted file mode 100644 index 198c392..0000000 --- a/setuptools-3.6.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:afaf5f78b9b0b6439af11224601b2130494051701912e4d9915647e51d9de0e7 -size 797309 diff --git a/setuptools-0.6c9-create-sitedir.patch b/setuptools-5.4.1-create-sitedir.patch similarity index 53% rename from setuptools-0.6c9-create-sitedir.patch rename to setuptools-5.4.1-create-sitedir.patch index 1cae160..f9002cb 100644 --- a/setuptools-0.6c9-create-sitedir.patch +++ b/setuptools-5.4.1-create-sitedir.patch @@ -1,8 +1,10 @@ ---- setuptools/command/easy_install.py -+++ setuptools/command/easy_install.py -@@ -249,6 +249,13 @@ +Index: setuptools-5.4.1/setuptools/command/easy_install.py +=================================================================== +--- setuptools-5.4.1.orig/setuptools/command/easy_install.py ++++ setuptools-5.4.1/setuptools/command/easy_install.py +@@ -405,6 +405,13 @@ class easy_install(Command): instdir = normalize_path(self.install_dir) - pth_file = os.path.join(instdir,'easy-install.pth') + pth_file = os.path.join(instdir, 'easy-install.pth') + # make sure that the directory exists + if not os.path.exists(instdir): diff --git a/setuptools-5.4.1.tar.gz b/setuptools-5.4.1.tar.gz new file mode 100644 index 0000000..13b2a0e --- /dev/null +++ b/setuptools-5.4.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:41194dc283bd186d5a7825c16b89d88bee369a6c4c4c7494e84909933b6f63be +size 782761