Hello community,
here is the log from the commit of package python3-setuptools for
openSUSE:Factory checked in at 2016-08-03 11:39:58
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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-07-27 16:30:42.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.python3-setuptools.new/python3-setuptools.changes
2016-08-03 11:39:59.000000000 +0200
@@ -1,0 +2,8 @@
+Fri Jul 29 05:58:10 UTC 2016 - [email protected]
+
+- update to version 25.1.1:
+ * #686: Fix issue in sys.path ordering by pkg_resources when rewrite
+ technique is "raw".
+ * #699: Fix typo in msvc support.
+
+-------------------------------------------------------------------
Old:
----
setuptools-25.1.0.tar.gz
New:
----
setuptools-25.1.1.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python3-setuptools.spec ++++++
--- /var/tmp/diff_new_pack.wDa57z/_old 2016-08-03 11:40:00.000000000 +0200
+++ /var/tmp/diff_new_pack.wDa57z/_new 2016-08-03 11:40:00.000000000 +0200
@@ -17,7 +17,7 @@
Name: python3-setuptools
-Version: 25.1.0
+Version: 25.1.1
Release: 0
Url: http://pypi.python.org/pypi/setuptools
Summary: Easily download, build, install, upgrade, and uninstall Python
packages
++++++ setuptools-25.1.0.tar.gz -> setuptools-25.1.1.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/setuptools-25.1.0/CHANGES.rst
new/setuptools-25.1.1/CHANGES.rst
--- old/setuptools-25.1.0/CHANGES.rst 2016-07-25 19:14:54.000000000 +0200
+++ new/setuptools-25.1.1/CHANGES.rst 2016-07-28 21:01:16.000000000 +0200
@@ -2,6 +2,13 @@
CHANGES
=======
+v25.1.1
+-------
+
+* #686: Fix issue in sys.path ordering by pkg_resources when
+ rewrite technique is "raw".
+* #699: Fix typo in msvc support.
+
v25.1.0
-------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/setuptools-25.1.0/PKG-INFO
new/setuptools-25.1.1/PKG-INFO
--- old/setuptools-25.1.0/PKG-INFO 2016-07-25 19:16:04.000000000 +0200
+++ new/setuptools-25.1.1/PKG-INFO 2016-07-28 21:01:42.000000000 +0200
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: setuptools
-Version: 25.1.0
+Version: 25.1.1
Summary: Easily download, build, install, upgrade, and uninstall Python
packages
Home-page: https://github.com/pypa/setuptools
Author: Python Packaging Authority
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/setuptools-25.1.0/pkg_resources/__init__.py
new/setuptools-25.1.1/pkg_resources/__init__.py
--- old/setuptools-25.1.0/pkg_resources/__init__.py 2016-07-25
19:14:54.000000000 +0200
+++ new/setuptools-25.1.1/pkg_resources/__init__.py 2016-07-28
21:01:16.000000000 +0200
@@ -947,11 +947,17 @@
return needed
- def subscribe(self, callback):
- """Invoke `callback` for all distributions (including existing ones)"""
+ def subscribe(self, callback, existing=True):
+ """Invoke `callback` for all distributions
+
+ If `existing=True` (default),
+ call on all existing ones, as well.
+ """
if callback in self.callbacks:
return
self.callbacks.append(callback)
+ if not existing:
+ return
for dist in self:
callback(dist)
@@ -2503,11 +2509,11 @@
for line in self.get_metadata_lines(name):
yield line
- def activate(self, path=None):
+ def activate(self, path=None, replace=False):
"""Ensure distribution is importable on `path` (default=sys.path)"""
if path is None:
path = sys.path
- self.insert_on(path, replace=True)
+ self.insert_on(path, replace=replace)
if path is sys.path:
fixup_namespace_packages(self.location)
for pkg in self._get_metadata('namespace_packages.txt'):
@@ -2585,7 +2591,24 @@
return self.get_entry_map(group).get(name)
def insert_on(self, path, loc=None, replace=False):
- """Insert self.location in path before its nearest parent directory"""
+ """Ensure self.location is on path
+
+ If replace=False (default):
+ - If location is already in path anywhere, do nothing.
+ - Else:
+ - If it's an egg and its parent directory is on path,
+ insert just ahead of the parent.
+ - Else: add to the end of path.
+ If replace=True:
+ - If location is already on path anywhere (not eggs)
+ or higher priority than its parent (eggs)
+ do nothing.
+ - Else:
+ - If it's an egg and its parent directory is on path,
+ insert just ahead of the parent,
+ removing any lower-priority entries.
+ - Else: add it to the front of path.
+ """
loc = loc or self.location
if not loc:
@@ -2597,9 +2620,16 @@
for p, item in enumerate(npath):
if item == nloc:
- break
+ if replace:
+ break
+ else:
+ # don't modify path (even removing duplicates) if found
and not replace
+ return
elif item == bdir and self.precedence == EGG_DIST:
# if it's an .egg, give it precedence over its directory
+ # UNLESS it's already been added to sys.path and replace=False
+ if (not replace) and nloc in npath[p:]:
+ return
if path is sys.path:
self.check_version_conflict()
path.insert(p, loc)
@@ -2947,10 +2977,14 @@
run_script = working_set.run_script
# backward compatibility
run_main = run_script
- # Activate all distributions already on sys.path, and ensure that
- # all distributions added to the working set in the future (e.g. by
- # calling ``require()``) will get activated as well.
- add_activation_listener(lambda dist: dist.activate())
+ # Activate all distributions already on sys.path with replace=False and
+ # ensure that all distributions added to the working set in the future
+ # (e.g. by calling ``require()``) will get activated as well,
+ # with higher priority (replace=True).
+ for dist in working_set:
+ dist.activate(replace=False)
+ del dist
+ add_activation_listener(lambda dist: dist.activate(replace=True),
existing=False)
working_set.entries=[]
# match order
list(map(working_set.add_entry, sys.path))
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/setuptools-25.1.0/pytest.ini
new/setuptools-25.1.1/pytest.ini
--- old/setuptools-25.1.0/pytest.ini 2016-07-25 19:14:54.000000000 +0200
+++ new/setuptools-25.1.1/pytest.ini 2016-07-28 21:01:16.000000000 +0200
@@ -1,6 +1,6 @@
[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 --ignore pavement.py
-norecursedirs=dist build *.egg setuptools/extern pkg_resources/extern
+norecursedirs=dist build *.egg setuptools/extern pkg_resources/extern .tox
flake8-ignore =
setuptools/site-patch.py F821
setuptools/py*compat.py F811
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/setuptools-25.1.0/setup.cfg
new/setuptools-25.1.1/setup.cfg
--- old/setuptools-25.1.0/setup.cfg 2016-07-25 19:16:04.000000000 +0200
+++ new/setuptools-25.1.1/setup.cfg 2016-07-28 21:01:42.000000000 +0200
@@ -1,5 +1,5 @@
[bumpversion]
-current_version = 25.1.0
+current_version = 25.1.1
commit = True
tag = True
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/setuptools-25.1.0/setup.py
new/setuptools-25.1.1/setup.py
--- old/setuptools-25.1.0/setup.py 2016-07-25 19:14:54.000000000 +0200
+++ new/setuptools-25.1.1/setup.py 2016-07-28 21:01:16.000000000 +0200
@@ -88,7 +88,7 @@
setup_params = dict(
name="setuptools",
- version="25.1.0",
+ version="25.1.1",
description="Easily download, build, install, upgrade, and uninstall "
"Python packages",
author="Python Packaging Authority",
@@ -181,8 +181,6 @@
tests_require=[
'setuptools[ssl]',
'pytest-flake8',
- # workaround for pytest-flake8 #7
- 'flake8<3dev',
'pytest>=2.8',
] + (['mock'] if sys.version_info[:2] < (3, 3) else []),
setup_requires=[
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/setuptools-25.1.0/setuptools/msvc.py
new/setuptools-25.1.1/setuptools/msvc.py
--- old/setuptools-25.1.0/setuptools/msvc.py 2016-07-25 19:14:54.000000000
+0200
+++ new/setuptools-25.1.1/setuptools/msvc.py 2016-07-28 21:01:16.000000000
+0200
@@ -909,7 +909,7 @@
os.path.join(self.si.WindowsSdkDir, 'UnionMetadata'),
os.path.join(
ref,
- 'Windows.Foundation.UniversalApiContract'
+ 'Windows.Foundation.UniversalApiContract',
'1.0.0.0',
),
os.path.join(
@@ -919,7 +919,7 @@
),
os.path.join(
ref,
- 'Windows.Networking.Connectivity.WwanContract'
+ 'Windows.Networking.Connectivity.WwanContract',
'1.0.0.0',
),
os.path.join(
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/setuptools-25.1.0/setuptools.egg-info/PKG-INFO
new/setuptools-25.1.1/setuptools.egg-info/PKG-INFO
--- old/setuptools-25.1.0/setuptools.egg-info/PKG-INFO 2016-07-25
19:16:03.000000000 +0200
+++ new/setuptools-25.1.1/setuptools.egg-info/PKG-INFO 2016-07-28
21:01:42.000000000 +0200
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: setuptools
-Version: 25.1.0
+Version: 25.1.1
Summary: Easily download, build, install, upgrade, and uninstall Python
packages
Home-page: https://github.com/pypa/setuptools
Author: Python Packaging Authority
