Hello community,
here is the log from the commit of package python3-setuptools for
openSUSE:Factory checked in at 2016-03-02 14:19:28
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python3-setuptools (Old)
and /work/SRC/openSUSE:Factory/.python3-setuptools.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python3-setuptools"
Changes:
--------
--- /work/SRC/openSUSE:Factory/python3-setuptools/python3-setuptools.changes
2016-02-28 02:28:04.000000000 +0100
+++
/work/SRC/openSUSE:Factory/.python3-setuptools.new/python3-setuptools.changes
2016-03-02 14:19:29.000000000 +0100
@@ -1,0 +2,7 @@
+Sat Feb 27 16:37:15 UTC 2016 - [email protected]
+
+- update to version 20.2.2:
+ * Issue #502: Correct regression in parsing of multiple version
+ specifiers separated by commas and spaces.
+
+-------------------------------------------------------------------
Old:
----
setuptools-20.2.1.tar.gz
New:
----
setuptools-20.2.2.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python3-setuptools.spec ++++++
--- /var/tmp/diff_new_pack.QsxZ0P/_old 2016-03-02 14:19:30.000000000 +0100
+++ /var/tmp/diff_new_pack.QsxZ0P/_new 2016-03-02 14:19:30.000000000 +0100
@@ -17,7 +17,7 @@
Name: python3-setuptools
-Version: 20.2.1
+Version: 20.2.2
Release: 0
Url: http://pypi.python.org/pypi/setuptools
Summary: Easily download, build, install, upgrade, and uninstall Python
packages
++++++ setuptools-20.2.1.tar.gz -> setuptools-20.2.2.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/setuptools-20.2.1/CHANGES.txt
new/setuptools-20.2.2/CHANGES.txt
--- old/setuptools-20.2.1/CHANGES.txt 2016-02-25 03:52:24.000000000 +0100
+++ new/setuptools-20.2.2/CHANGES.txt 2016-02-27 15:24:10.000000000 +0100
@@ -2,6 +2,12 @@
CHANGES
=======
+20.2.2
+------
+
+* Issue #502: Correct regression in parsing of multiple
+ version specifiers separated by commas and spaces.
+
20.2.1
------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/setuptools-20.2.1/PKG-INFO
new/setuptools-20.2.2/PKG-INFO
--- old/setuptools-20.2.1/PKG-INFO 2016-02-25 04:01:06.000000000 +0100
+++ new/setuptools-20.2.2/PKG-INFO 2016-02-27 15:48:30.000000000 +0100
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: setuptools
-Version: 20.2.1
+Version: 20.2.2
Summary: Easily download, build, install, upgrade, and uninstall Python
packages
Home-page: https://bitbucket.org/pypa/setuptools
Author: Python Packaging Authority
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/setuptools-20.2.1/pavement.py
new/setuptools-20.2.2/pavement.py
--- old/setuptools-20.2.1/pavement.py 1970-01-01 01:00:00.000000000 +0100
+++ new/setuptools-20.2.2/pavement.py 2016-02-27 15:18:39.000000000 +0100
@@ -0,0 +1,28 @@
+import re
+
+from paver.easy import task, path as Path
+import pip
+
+def remove_all(paths):
+ for path in paths:
+ path.rmtree() if path.isdir() else path.remove()
+
+@task
+def update_vendored():
+ vendor = Path('pkg_resources/_vendor')
+ remove_all(vendor.glob('packaging*'))
+ remove_all(vendor.glob('six*'))
+ remove_all(vendor.glob('pyparsing*'))
+ install_args = [
+ 'install',
+ '-r', str(vendor/'vendored.txt'),
+ '-t', str(vendor),
+ ]
+ pip.main(install_args)
+ packaging = vendor / 'packaging'
+ for file in packaging.glob('*.py'):
+ text = file.text()
+ text = re.sub(r' (pyparsing|six)', r' pkg_resources.extern.\1',
text)
+ file.write_text(text)
+ remove_all(vendor.glob('*.dist-info'))
+ remove_all(vendor.glob('*.egg-info'))
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/setuptools-20.2.1/pkg_resources/_vendor/packaging/__about__.py
new/setuptools-20.2.2/pkg_resources/_vendor/packaging/__about__.py
--- old/setuptools-20.2.1/pkg_resources/_vendor/packaging/__about__.py
2016-02-25 03:42:28.000000000 +0100
+++ new/setuptools-20.2.2/pkg_resources/_vendor/packaging/__about__.py
2016-02-27 15:20:09.000000000 +0100
@@ -12,7 +12,7 @@
__summary__ = "Core utilities for Python packages"
__uri__ = "https://github.com/pypa/packaging";
-__version__ = "16.4"
+__version__ = "16.5"
__author__ = "Donald Stufft and individual contributors"
__email__ = "[email protected]"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/setuptools-20.2.1/pkg_resources/_vendor/packaging/requirements.py
new/setuptools-20.2.2/pkg_resources/_vendor/packaging/requirements.py
--- old/setuptools-20.2.1/pkg_resources/_vendor/packaging/requirements.py
2016-02-25 03:42:28.000000000 +0100
+++ new/setuptools-20.2.2/pkg_resources/_vendor/packaging/requirements.py
2016-02-27 15:20:09.000000000 +0100
@@ -49,7 +49,7 @@
VERSION_ONE = VERSION_PEP440 ^ VERSION_LEGACY
VERSION_MANY = Combine(VERSION_ONE + ZeroOrMore(COMMA + VERSION_ONE),
- joinString=",")("_raw_spec")
+ joinString=",", adjacent=False)("_raw_spec")
_VERSION_SPEC = Optional(((LPAREN + VERSION_MANY + RPAREN) | VERSION_MANY))
_VERSION_SPEC.setParseAction(lambda s, l, t: t._raw_spec or '')
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/setuptools-20.2.1/pkg_resources/_vendor/packaging/specifiers.py
new/setuptools-20.2.2/pkg_resources/_vendor/packaging/specifiers.py
--- old/setuptools-20.2.1/pkg_resources/_vendor/packaging/specifiers.py
2016-02-25 03:42:28.000000000 +0100
+++ new/setuptools-20.2.2/pkg_resources/_vendor/packaging/specifiers.py
2016-02-27 15:20:09.000000000 +0100
@@ -218,11 +218,11 @@
(?P<operator>(==|!=|<=|>=|<|>))
\s*
(?P<version>
- [^;\s)]* # We just match everything, except for whitespace,
- # a semi-colon for marker support, and closing paren
- # since versions can be enclosed in them. Since this is
- # a "legacy" specifier and the version string can be
- # just about anything.
+ [^,;\s)]* # Since this is a "legacy" specifier, and the version
+ # string can be just about anything, we match everything
+ # except for whitespace, a semi-colon for marker support,
+ # a closing paren since versions can be enclosed in
+ # them, and a comma since it's a version separator.
)
"""
)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/setuptools-20.2.1/pkg_resources/_vendor/packaging/utils.py
new/setuptools-20.2.2/pkg_resources/_vendor/packaging/utils.py
--- old/setuptools-20.2.1/pkg_resources/_vendor/packaging/utils.py
1970-01-01 01:00:00.000000000 +0100
+++ new/setuptools-20.2.2/pkg_resources/_vendor/packaging/utils.py
2016-02-27 15:20:09.000000000 +0100
@@ -0,0 +1,14 @@
+# This file is dual licensed under the terms of the Apache License, Version
+# 2.0, and the BSD License. See the LICENSE file in the root of this repository
+# for complete details.
+from __future__ import absolute_import, division, print_function
+
+import re
+
+
+_canonicalize_regex = re.compile(r"[-_.]+")
+
+
+def canonicalize_name(name):
+ # This is taken from PEP 503.
+ return _canonicalize_regex.sub("-", name).lower()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/setuptools-20.2.1/pkg_resources/_vendor/vendored.txt
new/setuptools-20.2.2/pkg_resources/_vendor/vendored.txt
--- old/setuptools-20.2.1/pkg_resources/_vendor/vendored.txt 2016-02-25
03:42:28.000000000 +0100
+++ new/setuptools-20.2.2/pkg_resources/_vendor/vendored.txt 2016-02-27
15:20:05.000000000 +0100
@@ -1,3 +1,3 @@
-packaging==16.4
+packaging==16.5
pyparsing==2.0.6
six==1.10.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/setuptools-20.2.1/pkg_resources/tests/test_resources.py
new/setuptools-20.2.2/pkg_resources/tests/test_resources.py
--- old/setuptools-20.2.1/pkg_resources/tests/test_resources.py 2016-02-25
03:42:28.000000000 +0100
+++ new/setuptools-20.2.2/pkg_resources/tests/test_resources.py 2016-02-25
14:48:19.000000000 +0100
@@ -511,6 +511,10 @@
def test_local_version(self):
req, = parse_requirements('foo==1.0.org1')
+ def test_spaces_between_multiple_versions(self):
+ req, = parse_requirements('foo>=1.0, <3')
+ req, = parse_requirements('foo >= 1.0, < 3')
+
def testVersionEquality(self):
def c(s1,s2):
p1, p2 = parse_version(s1),parse_version(s2)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/setuptools-20.2.1/pytest.ini
new/setuptools-20.2.2/pytest.ini
--- old/setuptools-20.2.1/pytest.ini 2016-02-07 15:25:06.000000000 +0100
+++ new/setuptools-20.2.2/pytest.ini 2016-02-27 15:28:10.000000000 +0100
@@ -1,3 +1,3 @@
[pytest]
-addopts=--doctest-modules --ignore release.py --ignore
setuptools/lib2to3_ex.py --ignore tests/manual_test.py --ignore
tests/shlib_test --doctest-glob=pkg_resources/api_tests.txt --ignore
scripts/upload-old-releases-as-zip.py
+addopts=--doctest-modules --ignore release.py --ignore
setuptools/lib2to3_ex.py --ignore tests/manual_test.py --ignore
tests/shlib_test --doctest-glob=pkg_resources/api_tests.txt --ignore
scripts/upload-old-releases-as-zip.py --ignore pavement.py
norecursedirs=dist build *.egg setuptools/extern pkg_resources/extern
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/setuptools-20.2.1/setup.cfg
new/setuptools-20.2.2/setup.cfg
--- old/setuptools-20.2.1/setup.cfg 2016-02-25 04:01:06.000000000 +0100
+++ new/setuptools-20.2.2/setup.cfg 2016-02-27 15:48:30.000000000 +0100
@@ -1,7 +1,7 @@
[egg_info]
tag_build =
-tag_date = 0
tag_svn_revision = 0
+tag_date = 0
[aliases]
release = egg_info -RDb ''
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/setuptools-20.2.1/setuptools/version.py
new/setuptools-20.2.2/setuptools/version.py
--- old/setuptools-20.2.1/setuptools/version.py 2016-02-25 04:00:54.000000000
+0100
+++ new/setuptools-20.2.2/setuptools/version.py 2016-02-25 04:04:28.000000000
+0100
@@ -1 +1 @@
-__version__ = '20.2.1'
+__version__ = '20.2.2'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/setuptools-20.2.1/setuptools.egg-info/PKG-INFO
new/setuptools-20.2.2/setuptools.egg-info/PKG-INFO
--- old/setuptools-20.2.1/setuptools.egg-info/PKG-INFO 2016-02-25
04:01:03.000000000 +0100
+++ new/setuptools-20.2.2/setuptools.egg-info/PKG-INFO 2016-02-27
15:48:29.000000000 +0100
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: setuptools
-Version: 20.2.1
+Version: 20.2.2
Summary: Easily download, build, install, upgrade, and uninstall Python
packages
Home-page: https://bitbucket.org/pypa/setuptools
Author: Python Packaging Authority
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/setuptools-20.2.1/setuptools.egg-info/SOURCES.txt
new/setuptools-20.2.2/setuptools.egg-info/SOURCES.txt
--- old/setuptools-20.2.1/setuptools.egg-info/SOURCES.txt 2016-02-25
04:01:06.000000000 +0100
+++ new/setuptools-20.2.2/setuptools.egg-info/SOURCES.txt 2016-02-27
15:48:30.000000000 +0100
@@ -7,6 +7,7 @@
ez_setup.py
launcher.c
msvc-build-launcher.cmd
+pavement.py
pytest.ini
release.py
setup.cfg
@@ -41,6 +42,7 @@
pkg_resources/_vendor/packaging/markers.py
pkg_resources/_vendor/packaging/requirements.py
pkg_resources/_vendor/packaging/specifiers.py
+pkg_resources/_vendor/packaging/utils.py
pkg_resources/_vendor/packaging/version.py
pkg_resources/extern/__init__.py
pkg_resources/tests/__init__.py
