diff options
| -rw-r--r-- | .gitreview | 2 | ||||
| -rw-r--r-- | README.rst | 6 | ||||
| -rw-r--r-- | doc/requirements.txt | 3 | ||||
| -rw-r--r-- | doc/source/reference/index.rst | 6 | ||||
| -rw-r--r-- | lower-constraints.txt | 2 | ||||
| -rw-r--r-- | oslo_middleware/cors.py | 2 | ||||
| -rw-r--r-- | oslo_middleware/healthcheck/__init__.py | 6 | ||||
| -rw-r--r-- | requirements.txt | 2 | ||||
| -rw-r--r-- | test-requirements.txt | 2 | ||||
| -rw-r--r-- | tox.ini | 2 |
10 files changed, 18 insertions, 15 deletions
@@ -1,4 +1,4 @@ [gerrit] -host=review.openstack.org +host=review.opendev.org port=29418 project=openstack/oslo.middleware.git
\ No newline at end of file @@ -1,6 +1,6 @@ -=================================== +=============== oslo.middleware -=================================== +=============== .. image:: https://img.shields.io/pypi/v/oslo.middleware.svg :target: https://pypi.org/project/oslo.middleware/ @@ -17,6 +17,6 @@ and support for limiting size/connection etc. * Free software: Apache license * Documentation: https://docs.openstack.org/oslo.middleware/latest/ -* Source: https://git.openstack.org/cgit/openstack/oslo.middleware +* Source: https://opendev.org/openstack/oslo.middleware * Bugs: https://bugs.launchpad.net/oslo.middleware * Release notes: https://docs.openstack.org/releasenotes/oslo.middleware/ diff --git a/doc/requirements.txt b/doc/requirements.txt index 9a410c5..263cc86 100644 --- a/doc/requirements.txt +++ b/doc/requirements.txt @@ -3,6 +3,7 @@ # process, which may cause wedges in the gate later. # These are needed for docs generation openstackdocstheme>=1.18.1 # Apache-2.0 -sphinx!=1.6.6,!=1.6.7,>=1.6.2 # BSD +sphinx!=1.6.6,!=1.6.7,>=1.6.2,<2.0.0;python_version=='2.7' # BSD +sphinx!=1.6.6,!=1.6.7,>=1.6.2;python_version>='3.4' # BSD reno>=2.5.0 # Apache-2.0 fixtures>=3.0.0 # Apache-2.0/BSD diff --git a/doc/source/reference/index.rst b/doc/source/reference/index.rst index 5a2d80a..7c03c1a 100644 --- a/doc/source/reference/index.rst +++ b/doc/source/reference/index.rst @@ -1,6 +1,6 @@ -============================== - oslo.middleware Reference -============================== +========================= +oslo.middleware Reference +========================= .. toctree:: :glob: diff --git a/lower-constraints.txt b/lower-constraints.txt index 61ded8d..218d7a4 100644 --- a/lower-constraints.txt +++ b/lower-constraints.txt @@ -47,5 +47,5 @@ stevedore==1.20.0 testtools==2.2.0 traceback2==1.4.0 unittest2==1.1.0 -WebOb==1.7.1 +WebOb==1.8.0 wrapt==1.7.0 diff --git a/oslo_middleware/cors.py b/oslo_middleware/cors.py index 17ff6d0..a01e21e 100644 --- a/oslo_middleware/cors.py +++ b/oslo_middleware/cors.py @@ -210,7 +210,7 @@ class CORS(base.ConfigurableMiddleware): # NOTE(dims): Support older code that still passes in # a string for allowed_origin instead of a list if isinstance(allowed_origin, six.string_types): - # TODO(krotscheck): https://review.openstack.org/#/c/312687/ + # TODO(krotscheck): https://review.opendev.org/#/c/312687/ LOG.warning('DEPRECATED: The `allowed_origin` keyword argument in ' '`add_origin()` should be a list, found String.') allowed_origin = [allowed_origin] diff --git a/oslo_middleware/healthcheck/__init__.py b/oslo_middleware/healthcheck/__init__.py index 13985cb..bd81f0b 100644 --- a/oslo_middleware/healthcheck/__init__.py +++ b/oslo_middleware/healthcheck/__init__.py @@ -552,8 +552,10 @@ Reason status = self.HEAD_HEALTHY_TO_STATUS_CODES[healthy] else: status = self.HEALTHY_TO_STATUS_CODES[healthy] - accept_type = req.accept.best_match(self._accept_order) - if not accept_type: + try: + offers = req.accept.acceptable_offers(self._accept_order) + accept_type = offers[0][0] + except IndexError: accept_type = self._default_accept functor = self._accept_to_functor[accept_type] body, content_type = functor(results, healthy) diff --git a/requirements.txt b/requirements.txt index 2273d00..2304183 100644 --- a/requirements.txt +++ b/requirements.txt @@ -10,6 +10,6 @@ oslo.i18n>=3.15.3 # Apache-2.0 oslo.utils>=3.33.0 # Apache-2.0 six>=1.10.0 # MIT stevedore>=1.20.0 # Apache-2.0 -WebOb>=1.7.1 # MIT +WebOb>=1.8.0 # MIT debtcollector>=1.2.0 # Apache-2.0 statsd>=3.2.1 # MIT diff --git a/test-requirements.txt b/test-requirements.txt index 8cbddcd..6f0580b 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -10,5 +10,5 @@ testtools>=2.2.0 # MIT coverage!=4.4,>=4.0 # Apache-2.0 oslo.serialization!=2.19.1,>=2.18.0 # Apache-2.0 # Bandit security code scanner -bandit>=1.1.0 # Apache-2.0 +bandit>=1.1.0,<1.6.0 # Apache-2.0 stestr>=2.0.0 # Apache-2.0 @@ -7,7 +7,7 @@ setenv = VIRTUAL_ENV={envdir} install_command = pip install {opts} {packages} deps = - -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} + -c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/master/upper-constraints.txt} -r{toxinidir}/test-requirements.txt commands = stestr run --slowest {posargs} |