diff options
| author | Sascha Peilicke <saschpe@gmx.de> | 2014-01-16 09:07:47 +0100 |
|---|---|---|
| committer | Sascha Peilicke <saschpe@gmx.de> | 2014-01-17 08:59:45 +0100 |
| commit | 8e7c392920acf80456e4e0c27cf6a3bb65ae9b84 (patch) | |
| tree | 6f037d833a31fa6cf2f9c76955a9fafe5fb91fe2 | |
| parent | 1d0bf6b18f3f41c4406f4e7aa6cbed75f2a430fb (diff) | |
| download | heat-cfntools-8e7c392920acf80456e4e0c27cf6a3bb65ae9b84.tar.gz | |
Sync with global requirements
And fix pep8 issues discovered by hacking update. Remove dependencies
on pep8, pyflakes and flake8. They should be determined by the hacking
dependency implicitely.
Change-Id: I3fefdabcfdc09c28756f5ab0f5a99d12de2d8a3a
| -rw-r--r-- | heat_cfntools/tests/test_cfn_helper.py | 6 | ||||
| -rw-r--r-- | requirements.txt | 6 | ||||
| -rw-r--r-- | test-requirements.txt | 7 |
3 files changed, 8 insertions, 11 deletions
diff --git a/heat_cfntools/tests/test_cfn_helper.py b/heat_cfntools/tests/test_cfn_helper.py index e42f774..9073d01 100644 --- a/heat_cfntools/tests/test_cfn_helper.py +++ b/heat_cfntools/tests/test_cfn_helper.py @@ -497,7 +497,7 @@ class TestCfnHelper(testtools.TestCase): metadata_info.write(content) metadata_info.flush() port = cfn_helper.metadata_server_port(metadata_info.name) - self.assertEquals(value, port) + self.assertEqual(value, port) def test_metadata_server_port(self): self._check_metadata_content("http://172.20.42.42:8000\n", 8000) @@ -521,8 +521,8 @@ class TestCfnHelper(testtools.TestCase): def test_metadata_server_nofile(self): random_filename = self.getUniqueString() - self.assertEquals(None, - cfn_helper.metadata_server_port(random_filename)) + self.assertEqual(None, + cfn_helper.metadata_server_port(random_filename)) def test_to_boolean(self): self.assertTrue(cfn_helper.to_boolean(True)) diff --git a/requirements.txt b/requirements.txt index cff57f6..4bcbe14 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -pbr>=0.5.16,<0.6 +pbr>=0.5.21,<1.0 argparse -boto==2.5.2 -psutil<1.0 +boto>=2.12.0,!=2.13.0 +psutil>=0.6.1,<1.0 diff --git a/test-requirements.txt b/test-requirements.txt index eb0eabb..7528079 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -1,8 +1,5 @@ -# Install bounded pep8/pyflakes first, then let flake8 install -pep8==1.4.5 -pyflakes==0.7.2 -flake8==2.0 -hacking>=0.5.6,<0.7 +# Hacking already pins down pep8, pyflakes and flake8 +hacking>=0.8.0,<0.9 mox>=0.5.3 discover |