diff options
| -rw-r--r-- | .zuul.yaml | 4 | ||||
| -rw-r--r-- | babel.cfg | 3 | ||||
| -rw-r--r-- | keystonemiddleware/audit/__init__.py | 4 | ||||
| -rw-r--r-- | keystonemiddleware/tests/unit/utils.py | 18 | ||||
| -rw-r--r-- | lower-constraints.txt | 84 | ||||
| -rw-r--r-- | requirements.txt | 4 | ||||
| -rw-r--r-- | setup.cfg | 17 | ||||
| -rw-r--r-- | tox.ini | 6 |
8 files changed, 8 insertions, 132 deletions
@@ -6,7 +6,3 @@ - check-requirements - lib-forward-testing-python3 - release-notes-jobs-python3 - check: - jobs: - - openstack-tox-lower-constraints: - voting: false diff --git a/babel.cfg b/babel.cfg deleted file mode 100644 index 79cd39b..0000000 --- a/babel.cfg +++ /dev/null @@ -1,3 +0,0 @@ -[python: **.py] - - diff --git a/keystonemiddleware/audit/__init__.py b/keystonemiddleware/audit/__init__.py index 9b4c380..bf7bae9 100644 --- a/keystonemiddleware/audit/__init__.py +++ b/keystonemiddleware/audit/__init__.py @@ -92,7 +92,7 @@ class AuditMiddleware(object): self._application = app self._conf = config.Config('audit', AUDIT_MIDDLEWARE_GROUP, - _list_opts(), + list_opts(), conf) global _LOG _LOG = logging.getLogger(conf.get('log_name', __name__)) @@ -165,7 +165,7 @@ class AuditMiddleware(object): return response -def _list_opts(): +def list_opts(): """Return a list of oslo_config options available in audit middleware. The returned list includes all oslo_config options which may be registered diff --git a/keystonemiddleware/tests/unit/utils.py b/keystonemiddleware/tests/unit/utils.py index 63a329b..ae5157c 100644 --- a/keystonemiddleware/tests/unit/utils.py +++ b/keystonemiddleware/tests/unit/utils.py @@ -61,24 +61,6 @@ class TestCase(BaseTestCase): super(TestCase, self).tearDown() -if tuple(sys.version_info)[0:2] < (2, 7): - - def assertDictEqual(self, d1, d2, msg=None): - # Simple version taken from 2.7 - self.assertIsInstance(d1, dict, - 'First argument is not a dictionary') - self.assertIsInstance(d2, dict, - 'Second argument is not a dictionary') - if d1 != d2: - if msg: - self.fail(msg) - else: - standardMsg = '%r != %r' % (d1, d2) - self.fail(standardMsg) - - TestCase.assertDictEqual = assertDictEqual - - class MiddlewareTestCase(BaseTestCase): def create_middleware(self, cb, **kwargs): diff --git a/lower-constraints.txt b/lower-constraints.txt deleted file mode 100644 index 7cf2eef..0000000 --- a/lower-constraints.txt +++ /dev/null @@ -1,84 +0,0 @@ -appdirs==1.4.3 -asn1crypto==0.24.0 -Babel==2.5.3 -bandit==1.1.0 -beautifulsoup4==4.6.0 -certifi==2018.1.18 -cffi==1.14.0 -chardet==3.0.4 -cliff==2.11.0 -cmd2==0.8.1 -coverage==4.0 -cryptography==3.0 -debtcollector==1.19.0 -dogpile.cache==0.6.5 -dulwich==0.19.0 -extras==1.0.0 -fixtures==3.0.0 -flake8-docstrings==0.2.1.post1 -flake8==2.2.4 -future==0.16.0 -gitdb2==2.0.3 -GitPython==2.1.8 -hacking==0.10.0 -idna==2.6 -iso8601==0.1.12 -keystoneauth1==3.12.0 -linecache2==1.0.0 -mccabe==0.2.1 -mock==2.0.0 -monotonic==1.4 -mox3==0.25.0 -msgpack==0.5.6 -netaddr==0.7.19 -netifaces==0.10.6 -openstack-requirements==1.2.0 -os-client-config==1.29.0 -os-testr==1.0.0 -oslo.cache==1.26.0 -oslo.config==5.2.0 -oslo.context==2.19.2 -oslo.i18n==3.15.3 -oslo.log==3.36.0 -oslo.messaging==5.29.0 -oslo.serialization==2.18.0 -oslo.utils==3.33.0 -oslotest==3.2.0 -packaging==17.1 -Parsley==1.3 -pbr==2.0.0 -pep257==0.7.0 -pep8==1.5.7 -prettytable==0.7.2 -pycadf==1.1.0 -pycparser==2.18 -pyflakes==0.8.1 -pyinotify==0.9.6 -pyparsing==2.2.0 -pyperclip==1.6.0 -python-dateutil==2.7.0 -python-keystoneclient==3.20.0 -python-memcached==1.59 -python-mimeparse==1.6.0 -python-subunit==1.2.0 -pytz==2018.3 -PyYAML==3.13 -requests-mock==1.2.0 -requests==2.14.2 -requestsexceptions==1.4.0 -rfc3986==1.1.0 -six==1.10.0 -smmap2==2.0.3 -stestr==2.0.0 -stevedore==1.20.0 -testrepository==0.0.18 -testresources==2.0.0 -testtools==2.2.0 -traceback2==1.4.0 -unittest2==1.1.0 -urllib3==1.22 -voluptuous==0.11.1 -waitress==1.1.0 -WebOb==1.7.1 -WebTest==2.0.27 -wrapt==1.10.11 diff --git a/requirements.txt b/requirements.txt index d3f07ce..c1398f9 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,7 @@ +# Requirements lower bounds listed here are our best effort to keep them up to +# date but we do not test them so no guarantee of having them all correct. If +# you find any incorrect lower bounds, let us know or propose a fix. + # The order of packages is significant, because pip processes them in the order # of appearance. Changing the order has an impact on the overall integration # process, which may cause wedges in the gate later. @@ -14,6 +14,7 @@ classifier = License :: OSI Approved :: Apache Software License Operating System :: POSIX :: Linux Programming Language :: Python + Programming Language :: Python :: 3 :: Only Programming Language :: Python :: 3 Programming Language :: Python :: 3 :: Only Programming Language :: Python :: 3.8 @@ -34,24 +35,10 @@ setup_hooks = [entry_points] oslo.config.opts = keystonemiddleware.auth_token = keystonemiddleware.auth_token._opts:list_opts + keystonemiddleware.audit = keystonemiddleware.audit:list_opts paste.filter_factory = auth_token = keystonemiddleware.auth_token:filter_factory audit = keystonemiddleware.audit:filter_factory ec2_token = keystonemiddleware.ec2_token:filter_factory s3_token = keystonemiddleware.s3_token:filter_factory - -[compile_catalog] -directory = keystonemiddleware/locale -domain = keystonemiddleware - -[update_catalog] -domain = keystonemiddleware -output_dir = keystonemiddleware/locale -input_file = keystonemiddleware/locale/keystonemiddleware.pot - -[extract_messages] -keywords = _ gettext ngettext l_ lazy_gettext -mapping_file = babel.cfg -output_file = keystonemiddleware/locale/keystonemiddleware.pot - @@ -85,9 +85,3 @@ import_exceptions = extensions = .rst, .yaml # lines should not be longer than 79 characters. max-line-length = 79 - -[testenv:lower-constraints] -deps = - -c{toxinidir}/lower-constraints.txt - -r{toxinidir}/test-requirements.txt - -r{toxinidir}/requirements.txt |