openstack/deb-python-testtools
Code Issues Proposed changes

Bug #1430076 fix installing when extras is not installed.

Browse Source 
Change-Id: Icc9c40d6ef74e6b12323fdab7ce0581ec68794b7
This commit is contained in:
Robert Collins 2015-03-10 13:18:49 +13:00
parent 452786489f
commit a0e61b3a20
3 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
NEWS
View File

@ -7,6 +7,16 @@ Changes and improvements to testtools_, grouped by release.
NEXT
~~~~
1.6.1
~~~~~
Changes
-------
* Fix installing when ``extras`` is not already installed. Our guards
for the absence of unittest2 were not sufficient.
(Robert Collins, #1430076)
1.6.0
~~~~~

2
testtools/__init__.py
View File

@ -122,4 +122,4 @@ else:
# If the releaselevel is 'final', then the tarball will be major.minor.micro.
# Otherwise it is major.minor.micro~$(revno).
__version__ = (1, 7, 0, 'dev', 0)
__version__ = (1, 6, 1, 'final', 0)

5
testtools/run.py
View File

@ -25,7 +25,10 @@ from testtools.testsuite import filter_by_ids, iterate_tests, sorted_tests
defaultTestLoader = unittest.defaultTestLoader
defaultTestLoaderCls = unittest.TestLoader
have_discover = True
discover_impl = unittest.loader
# This shouldn't really be public - its legacy. Try to set it if we can, and
# if we can't (during installs before unittest2 is installed) just stub it out
# to None.
discover_impl = getattr(unittest, 'loader', None)
# Kept for API compatibility, but no longer used.
BUFFEROUTPUT = ""