Hello community,
here is the log from the commit of package python3-setuptools for
openSUSE:Factory checked in at 2015-04-07 09:26:56
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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
2015-03-25 09:55:40.000000000 +0100
+++
/work/SRC/openSUSE:Factory/.python3-setuptools.new/python3-setuptools.changes
2015-04-07 09:26:57.000000000 +0200
@@ -1,0 +2,7 @@
+Sat Apr 4 17:34:29 UTC 2015 - [email protected]
+
+- update to version 15.0:
+ * Pull Request #126: DistributionNotFound message now lists the
+ package or packages that required it.
+
+-------------------------------------------------------------------
Old:
----
setuptools-14.3.1.tar.gz
New:
----
setuptools-15.0.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python3-setuptools.spec ++++++
--- /var/tmp/diff_new_pack.rGhqXd/_old 2015-04-07 09:26:58.000000000 +0200
+++ /var/tmp/diff_new_pack.rGhqXd/_new 2015-04-07 09:26:58.000000000 +0200
@@ -17,7 +17,7 @@
Name: python3-setuptools
-Version: 14.3.1
+Version: 15.0
Release: 0
Url: http://pypi.python.org/pypi/setuptools
Summary: Easily download, build, install, upgrade, and uninstall Python
packages
++++++ setuptools-14.3.1.tar.gz -> setuptools-15.0.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/setuptools-14.3.1/CHANGES.txt
new/setuptools-15.0/CHANGES.txt
--- old/setuptools-14.3.1/CHANGES.txt 2015-03-20 21:01:55.000000000 +0100
+++ new/setuptools-15.0/CHANGES.txt 2015-04-04 00:25:33.000000000 +0200
@@ -2,6 +2,20 @@
CHANGES
=======
+----
+15.0
+----
+
+* Pull Request #126: DistributionNotFound message now lists the package or
+ packages that required it. E.g.::
+
+ pkg_resources.DistributionNotFound: The 'colorama>=0.3.1' distribution
was not found and is required by smlib.log.
+
+ Note that zc.buildout once dependended on the string rendering of this
+ message to determine the package that was not found. This expectation
+ has since been changed, but older versions of buildout may experience
+ problems. See Buildout #242 for details.
+
------
14.3.1
------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/setuptools-14.3.1/PKG-INFO
new/setuptools-15.0/PKG-INFO
--- old/setuptools-14.3.1/PKG-INFO 2015-03-20 21:08:37.000000000 +0100
+++ new/setuptools-15.0/PKG-INFO 2015-04-04 00:26:11.000000000 +0200
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: setuptools
-Version: 14.3.1
+Version: 15.0
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-14.3.1/ez_setup.py
new/setuptools-15.0/ez_setup.py
--- old/setuptools-14.3.1/ez_setup.py 2015-03-20 21:08:27.000000000 +0100
+++ new/setuptools-15.0/ez_setup.py 2015-03-28 16:07:10.000000000 +0100
@@ -30,7 +30,7 @@
except ImportError:
USER_SITE = None
-DEFAULT_VERSION = "14.3.1"
+DEFAULT_VERSION = "15.0"
DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/";
DEFAULT_SAVE_DIR = os.curdir
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/setuptools-14.3.1/pkg_resources/__init__.py
new/setuptools-15.0/pkg_resources/__init__.py
--- old/setuptools-14.3.1/pkg_resources/__init__.py 2015-03-20
20:58:50.000000000 +0100
+++ new/setuptools-15.0/pkg_resources/__init__.py 2015-03-28
15:55:54.000000000 +0100
@@ -369,6 +369,30 @@
class DistributionNotFound(ResolutionError):
"""A requested distribution was not found"""
+ _template = ("The '{self.req}' distribution was not found "
+ "and is required by {self.requirers_str}")
+
+ @property
+ def req(self):
+ return self.args[0]
+
+ @property
+ def requirers(self):
+ return self.args[1]
+
+ @property
+ def requirers_str(self):
+ if not self.requirers:
+ return 'the application'
+ return ', '.join(self.requirers)
+
+ def report(self):
+ return self._template.format(**locals())
+
+ def __str__(self):
+ return self.report()
+
+
class UnknownExtra(ResolutionError):
"""Distribution doesn't have an "extra feature" of the given name"""
_provider_factories = {}
@@ -799,13 +823,8 @@
ws = WorkingSet([])
dist = best[req.key] = env.best_match(req, ws, installer)
if dist is None:
- #msg = ("The '%s' distribution was not found on this "
- # "system, and is required by this application.")
- #raise DistributionNotFound(msg % req)
-
- # unfortunately, zc.buildout uses a str(err)
- # to get the name of the distribution here..
- raise DistributionNotFound(req)
+ requirers = required_by.get(req, None)
+ raise DistributionNotFound(req, requirers)
to_activate.append(dist)
if dist not in req:
# Oops, the "best" so far conflicts with a dependency
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/setuptools-14.3.1/setuptools/command/easy_install.py
new/setuptools-15.0/setuptools/command/easy_install.py
--- old/setuptools-14.3.1/setuptools/command/easy_install.py 2015-03-19
18:19:05.000000000 +0100
+++ new/setuptools-15.0/setuptools/command/easy_install.py 2015-03-28
15:55:54.000000000 +0100
@@ -709,9 +709,7 @@
[requirement], self.local_index, self.easy_install
)
except DistributionNotFound as e:
- raise DistutilsError(
- "Could not find required distribution %s" % e.args
- )
+ raise DistutilsError(str(e))
except VersionConflict as e:
raise DistutilsError(e.report())
if self.always_copy or self.always_copy_from:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/setuptools-14.3.1/setuptools/version.py
new/setuptools-15.0/setuptools/version.py
--- old/setuptools-14.3.1/setuptools/version.py 2015-03-20 21:08:27.000000000
+0100
+++ new/setuptools-15.0/setuptools/version.py 2015-03-28 16:07:10.000000000
+0100
@@ -1 +1 @@
-__version__ = '14.3.1'
+__version__ = '15.0'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/setuptools-14.3.1/setuptools.egg-info/PKG-INFO
new/setuptools-15.0/setuptools.egg-info/PKG-INFO
--- old/setuptools-14.3.1/setuptools.egg-info/PKG-INFO 2015-03-20
21:08:34.000000000 +0100
+++ new/setuptools-15.0/setuptools.egg-info/PKG-INFO 2015-04-04
00:26:09.000000000 +0200
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: setuptools
-Version: 14.3.1
+Version: 15.0
Summary: Easily download, build, install, upgrade, and uninstall Python
packages
Home-page: https://bitbucket.org/pypa/setuptools
Author: Python Packaging Authority
