diff --git a/detail.py b/detail.py index 6bd835c147..209c7963be 100644 --- a/detail.py +++ b/detail.py @@ -19,11 +19,12 @@ from __future__ import print_function import contextlib import json import os -import pkg_resources import sys import traceback import urllib +import pkg_resources + try: PYPI_LOCATION = os.environ['PYPI_LOCATION'] except KeyError: @@ -61,7 +62,7 @@ def release_data(req): attempted.append(url) continue return json.loads(uh.read()) - attempted = [" * %s" % url for url in attempted] + attempted = [" * %s" % u for u in attempted] raise IOError("Could not find '%s' on pypi\nAttempted urls:\n%s" % (req.key, "\n".join(attempted))) diff --git a/test-requirements.txt b/test-requirements.txt index 394e8f831f..b8f5941a8b 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -1,6 +1,6 @@ # NOTE: These are requirements for testing the requirements project only # See global-requirements for the actual requirements list -hacking>=0.8.0,<0.9 +hacking>=0.9.2,<0.10 testrepository>=0.0.17 testscenarios>=0.4 testtools>=0.9.32,<0.9.35 diff --git a/tests/files/old-setup.py b/tests/files/old-setup.py index 74237ee2b9..ff5795f7db 100644 --- a/tests/files/old-setup.py +++ b/tests/files/old-setup.py @@ -15,7 +15,6 @@ # limitations under the License. import setuptools - from swift import __canonical_version__ as version diff --git a/tests/test_update.py b/tests/test_update.py index bd409477d7..fc96ddd13e 100644 --- a/tests/test_update.py +++ b/tests/test_update.py @@ -20,6 +20,7 @@ import shutil import subprocess import sys import tempfile + import testtools diff --git a/tests/test_update_pbr.py b/tests/test_update_pbr.py index d54277d2d4..8ed3c03eaf 100644 --- a/tests/test_update_pbr.py +++ b/tests/test_update_pbr.py @@ -23,6 +23,7 @@ import shutil import subprocess import sys import tempfile + import testtools diff --git a/tests/test_update_suffix.py b/tests/test_update_suffix.py index b834dac627..0abfea9d17 100644 --- a/tests/test_update_suffix.py +++ b/tests/test_update_suffix.py @@ -20,6 +20,7 @@ import shutil import subprocess import sys import tempfile + import testtools