diff options
| -rw-r--r-- | MANIFEST.in | 8 | ||||
| -rw-r--r-- | ceilometerclient/common/base.py | 7 | ||||
| -rw-r--r-- | ceilometerclient/tests/unit/test_shell.py | 10 | ||||
| -rw-r--r-- | ceilometerclient/tests/unit/v2/test_capabilities.py | 2 | ||||
| -rw-r--r-- | ceilometerclient/v2/shell.py | 3 | ||||
| -rw-r--r-- | openstack-common.conf | 9 | ||||
| -rw-r--r-- | requirements.txt | 6 | ||||
| -rw-r--r-- | test-requirements.txt | 2 | ||||
| -rw-r--r-- | tox.ini | 3 |
9 files changed, 12 insertions, 38 deletions
diff --git a/MANIFEST.in b/MANIFEST.in deleted file mode 100644 index ab2e128..0000000 --- a/MANIFEST.in +++ /dev/null @@ -1,8 +0,0 @@ -include AUTHORS -include LICENSE -include README.md -include ChangeLog -include tox.ini -recursive-include doc * -recursive-include tests * -recursive-include tools * diff --git a/ceilometerclient/common/base.py b/ceilometerclient/common/base.py index 19d4e8a..3bb30ac 100644 --- a/ceilometerclient/common/base.py +++ b/ceilometerclient/common/base.py @@ -23,13 +23,6 @@ from ceilometerclient import exc from ceilometerclient.openstack.common.apiclient import base from ceilometerclient.openstack.common.apiclient import exceptions -# Python 2.4 compat -try: - all -except NameError: - def all(iterable): - return True not in (not x for x in iterable) - def getid(obj): """Extracts object ID. diff --git a/ceilometerclient/tests/unit/test_shell.py b/ceilometerclient/tests/unit/test_shell.py index 30ca353..47179f9 100644 --- a/ceilometerclient/tests/unit/test_shell.py +++ b/ceilometerclient/tests/unit/test_shell.py @@ -210,7 +210,7 @@ class ShellInsecureTest(ShellTestBase): args = ['--debug', '--os-insecure', 'true', 'alarm-list'] self.assertIsNone(ceilometer_shell.main(args)) args, kwargs = mocked_client.call_args - self.assertEqual(False, kwargs.get('verify')) + self.assertFalse(kwargs.get('verify')) @mock.patch.object(ks_session, 'Session') @mock.patch('ceilometerclient.client.AuthPlugin.redirect_to_aodh_endpoint') @@ -220,7 +220,7 @@ class ShellInsecureTest(ShellTestBase): args = ['--debug', '--os-insecure', 'true', 'alarm-list'] self.assertRaises(exc.CommandError, ceilometer_shell.main, args) args, kwargs = mocked_session.call_args - self.assertEqual(False, kwargs.get('verify')) + self.assertFalse(kwargs.get('verify')) @mock.patch.object(api_client, 'HTTPClient') @mock.patch('ceilometerclient.client.AuthPlugin.redirect_to_aodh_endpoint') @@ -229,7 +229,7 @@ class ShellInsecureTest(ShellTestBase): args = ['--debug', '--os-insecure', 'false', 'alarm-list'] self.assertIsNone(ceilometer_shell.main(args)) args, kwargs = mocked_client.call_args - self.assertEqual(True, kwargs.get('verify')) + self.assertTrue(kwargs.get('verify')) @mock.patch.object(ks_session, 'Session') @mock.patch('ceilometerclient.client.AuthPlugin.redirect_to_aodh_endpoint') @@ -239,7 +239,7 @@ class ShellInsecureTest(ShellTestBase): args = ['--debug', '--os-insecure', 'false', 'alarm-list'] self.assertRaises(exc.CommandError, ceilometer_shell.main, args) args, kwargs = mocked_session.call_args - self.assertEqual(True, kwargs.get('verify')) + self.assertTrue(kwargs.get('verify')) class ShellEndpointTest(ShellTestBase): @@ -248,7 +248,7 @@ class ShellEndpointTest(ShellTestBase): def _test_endpoint_and_token(self, token_name, endpoint_name, mocked): args = ['--debug', token_name, 'fake-token', endpoint_name, 'http://fake-url', 'alarm-list'] - self.assertEqual(None, ceilometer_shell.main(args)) + self.assertIsNone(ceilometer_shell.main(args)) args, kwargs = mocked.call_args self.assertEqual('http://fake-url', kwargs.get('endpoint')) self.assertEqual('fake-token', kwargs.get('token')) diff --git a/ceilometerclient/tests/unit/v2/test_capabilities.py b/ceilometerclient/tests/unit/v2/test_capabilities.py index 32468cb..2442e0a 100644 --- a/ceilometerclient/tests/unit/v2/test_capabilities.py +++ b/ceilometerclient/tests/unit/v2/test_capabilities.py @@ -55,4 +55,4 @@ class CapabilitiesManagerTest(testtools.TestCase): def test_capabilities_get(self): capabilities = self.mgr.get() self.http_client.assert_called('GET', '/v2/capabilities') - self.assertEqual(True, capabilities.api['alarms:query:complex']) + self.assertTrue(capabilities.api['alarms:query:complex']) diff --git a/ceilometerclient/v2/shell.py b/ceilometerclient/v2/shell.py index 0041798..22f55e3 100644 --- a/ceilometerclient/v2/shell.py +++ b/ceilometerclient/v2/shell.py @@ -464,7 +464,8 @@ def common_alarm_arguments(create=False): @utils.arg('--severity', metavar='<SEVERITY>', help='Severity of the alarm, one of: ' + str(ALARM_SEVERITY)) - @utils.arg('--enabled', type=strutils.bool_from_string, + @utils.arg('--enabled', + type=lambda v: strutils.bool_from_string(v, True), metavar='{True|False}', help='True if alarm evaluation/actioning is enabled.') @utils.arg('--alarm-action', dest='alarm_actions', diff --git a/openstack-common.conf b/openstack-common.conf deleted file mode 100644 index 7288bc4..0000000 --- a/openstack-common.conf +++ /dev/null @@ -1,9 +0,0 @@ -[DEFAULT] - -# The list of modules to copy from openstack-common -module=apiclient -module=cliutils -module=install_venv_common - -# The base module to hold the copy of openstack.common -base=ceilometerclient diff --git a/requirements.txt b/requirements.txt index dc207b3..66bee05 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,12 +4,12 @@ pbr>=1.6 argparse iso8601>=0.1.9 -keystoneauth1>=1.0.0 +keystoneauth1>=2.1.0 oslo.i18n>=1.5.0 # Apache-2.0 oslo.serialization>=1.10.0 # Apache-2.0 -oslo.utils>=2.8.0 # Apache-2.0 +oslo.utils>=3.2.0 # Apache-2.0 PrettyTable<0.8,>=0.7 python-keystoneclient!=1.8.0,>=1.6.0 -requests>=2.8.1 +requests!=2.9.0,>=2.8.1 six>=1.9.0 stevedore>=1.5.0 # Apache-2.0 diff --git a/test-requirements.txt b/test-requirements.txt index 143d04f..02b9483 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -10,6 +10,6 @@ mock>=1.2 oslosphinx!=3.4.0,>=2.5.0 # Apache-2.0 python-subunit>=0.0.18 sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2 -tempest-lib>=0.10.0 +tempest-lib>=0.12.0 testrepository>=0.0.18 testtools>=1.4.0 @@ -12,9 +12,6 @@ deps = -r{toxinidir}/requirements.txt commands = python setup.py testr --slowest --testr-args='{posargs}' -[tox:jenkins] -downloadcache = ~/cache/pip - [testenv:pep8] commands = flake8 |