Hello community,
here is the log from the commit of package python3-setuptools for
openSUSE:Factory checked in at 2015-10-24 10:22:18
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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-10-01 09:28:00.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.python3-setuptools.new/python3-setuptools.changes
2015-10-24 10:22:29.000000000 +0200
@@ -1,0 +2,7 @@
+Sun Oct 11 16:31:44 UTC 2015 - [email protected]
+
+- update to version 18.4:
+ * Issue #446: Test command now always invokes unittest, even
+ if no test suite is supplied.
+
+-------------------------------------------------------------------
Old:
----
setuptools-18.3.2.tar.gz
New:
----
setuptools-18.4.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python3-setuptools.spec ++++++
--- /var/tmp/diff_new_pack.oMAjCS/_old 2015-10-24 10:22:30.000000000 +0200
+++ /var/tmp/diff_new_pack.oMAjCS/_new 2015-10-24 10:22:30.000000000 +0200
@@ -17,7 +17,7 @@
Name: python3-setuptools
-Version: 18.3.2
+Version: 18.4
Release: 0
Url: http://pypi.python.org/pypi/setuptools
Summary: Easily download, build, install, upgrade, and uninstall Python
packages
++++++ setuptools-18.3.2.tar.gz -> setuptools-18.4.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/setuptools-18.3.2/CHANGES.txt
new/setuptools-18.4/CHANGES.txt
--- old/setuptools-18.3.2/CHANGES.txt 2015-09-19 18:26:28.000000000 +0200
+++ new/setuptools-18.4/CHANGES.txt 2015-10-11 02:43:14.000000000 +0200
@@ -2,6 +2,13 @@
CHANGES
=======
+----
+18.4
+----
+
+* Issue #446: Test command now always invokes unittest, even
+ if no test suite is supplied.
+
------
18.3.2
------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/setuptools-18.3.2/PKG-INFO
new/setuptools-18.4/PKG-INFO
--- old/setuptools-18.3.2/PKG-INFO 2015-09-19 18:27:13.000000000 +0200
+++ new/setuptools-18.4/PKG-INFO 2015-10-11 03:04:13.000000000 +0200
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: setuptools
-Version: 18.3.2
+Version: 18.4
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-18.3.2/ez_setup.py
new/setuptools-18.4/ez_setup.py
--- old/setuptools-18.3.2/ez_setup.py 2015-09-19 18:27:06.000000000 +0200
+++ new/setuptools-18.4/ez_setup.py 2015-10-11 03:04:05.000000000 +0200
@@ -30,7 +30,7 @@
except ImportError:
USER_SITE = None
-DEFAULT_VERSION = "18.3.2"
+DEFAULT_VERSION = "18.4"
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-18.3.2/pkg_resources/__init__.py
new/setuptools-18.4/pkg_resources/__init__.py
--- old/setuptools-18.3.2/pkg_resources/__init__.py 2015-08-07
19:08:28.000000000 +0200
+++ new/setuptools-18.4/pkg_resources/__init__.py 2015-09-27
13:26:55.000000000 +0200
@@ -2983,12 +2983,8 @@
@staticmethod
def parse(s):
- reqs = list(parse_requirements(s))
- if reqs:
- if len(reqs) == 1:
- return reqs[0]
- raise ValueError("Expected only one requirement", s)
- raise ValueError("No requirements found", s)
+ req, = parse_requirements(s)
+ return req
def _get_mro(cls):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/setuptools-18.3.2/setuptools/command/test.py
new/setuptools-18.4/setuptools/command/test.py
--- old/setuptools-18.3.2/setuptools/command/test.py 2015-08-07
19:08:28.000000000 +0200
+++ new/setuptools-18.4/setuptools/command/test.py 2015-10-11
02:41:31.000000000 +0200
@@ -1,6 +1,5 @@
from distutils.errors import DistutilsOptionError
from unittest import TestLoader
-import unittest
import sys
from pkg_resources import (resource_listdir, resource_exists, normalize_path,
@@ -12,7 +11,7 @@
class ScanningLoader(TestLoader):
- def loadTestsFromModule(self, module):
+ def loadTestsFromModule(self, module, pattern=None):
"""Return a suite of all tests cases contained in the given module
If the module is a package, load tests from all the modules in it.
@@ -62,20 +61,16 @@
def finalize_options(self):
+ if self.test_suite and self.test_module:
+ msg = "You may specify a module or a suite, but not both"
+ raise DistutilsOptionError(msg)
+
if self.test_suite is None:
if self.test_module is None:
self.test_suite = self.distribution.test_suite
else:
self.test_suite = self.test_module + ".test_suite"
- elif self.test_module:
- raise DistutilsOptionError(
- "You may specify a module or a suite, but not both"
- )
-
- self.test_args = [self.test_suite]
- if self.verbose:
- self.test_args.insert(0, '--verbose')
if self.test_loader is None:
self.test_loader = getattr(self.distribution, 'test_loader', None)
if self.test_loader is None:
@@ -83,6 +78,16 @@
if self.test_runner is None:
self.test_runner = getattr(self.distribution, 'test_runner', None)
+ @property
+ def test_args(self):
+ return list(self._test_args())
+
+ def _test_args(self):
+ if self.verbose:
+ yield '--verbose'
+ if self.test_suite:
+ yield self.test_suite
+
def with_project_on_sys_path(self, func):
with_2to3 = PY3 and getattr(self.distribution, 'use_2to3', False)
@@ -133,20 +138,19 @@
if self.distribution.tests_require:
self.distribution.fetch_build_eggs(self.distribution.tests_require)
- if self.test_suite:
- cmd = ' '.join(self.test_args)
- if self.dry_run:
- self.announce('skipping "unittest %s" (dry run)' % cmd)
- else:
- self.announce('running "unittest %s"' % cmd)
- self.with_project_on_sys_path(self.run_tests)
+ cmd = ' '.join(self._argv)
+ if self.dry_run:
+ self.announce('skipping "%s" (dry run)' % cmd)
+ else:
+ self.announce('running "%s"' % cmd)
+ self.with_project_on_sys_path(self.run_tests)
def run_tests(self):
# Purge modules under test from sys.modules. The test loader will
# re-import them from the build location. Required when 2to3 is used
# with namespace packages.
if PY3 and getattr(self.distribution, 'use_2to3', False):
- module = self.test_args[-1].split('.')[0]
+ module = self.test_suite.split('.')[0]
if module in _namespace_packages:
del_modules = []
if module in sys.modules:
@@ -158,11 +162,15 @@
list(map(sys.modules.__delitem__, del_modules))
unittest_main(
- None, None, [unittest.__file__] + self.test_args,
+ None, None, self._argv,
testLoader=self._resolve_as_ep(self.test_loader),
testRunner=self._resolve_as_ep(self.test_runner),
)
+ @property
+ def _argv(self):
+ return ['unittest'] + self.test_args
+
@staticmethod
def _resolve_as_ep(val):
"""
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/setuptools-18.3.2/setuptools/version.py
new/setuptools-18.4/setuptools/version.py
--- old/setuptools-18.3.2/setuptools/version.py 2015-09-19 18:27:06.000000000
+0200
+++ new/setuptools-18.4/setuptools/version.py 2015-10-11 03:04:05.000000000
+0200
@@ -1 +1 @@
-__version__ = '18.3.2'
+__version__ = '18.4'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/setuptools-18.3.2/setuptools.egg-info/PKG-INFO
new/setuptools-18.4/setuptools.egg-info/PKG-INFO
--- old/setuptools-18.3.2/setuptools.egg-info/PKG-INFO 2015-09-19
18:27:11.000000000 +0200
+++ new/setuptools-18.4/setuptools.egg-info/PKG-INFO 2015-10-11
03:04:11.000000000 +0200
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: setuptools
-Version: 18.3.2
+Version: 18.4
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-18.3.2/setuptools.egg-info/entry_points.txt
new/setuptools-18.4/setuptools.egg-info/entry_points.txt
--- old/setuptools-18.3.2/setuptools.egg-info/entry_points.txt 2015-09-19
18:27:11.000000000 +0200
+++ new/setuptools-18.4/setuptools.egg-info/entry_points.txt 2015-10-11
03:04:11.000000000 +0200
@@ -1,6 +1,6 @@
[console_scripts]
easy_install = setuptools.command.easy_install:main
-easy_install-3.4 = setuptools.command.easy_install:main
+easy_install-3.5 = setuptools.command.easy_install:main
[distutils.commands]
alias = setuptools.command.alias:alias
