diff options
| -rw-r--r-- | .zuul.yaml | 2 | ||||
| -rw-r--r-- | doc/requirements.txt | 3 | ||||
| -rw-r--r-- | lower-constraints.txt | 1 | ||||
| -rw-r--r-- | oslo_middleware/cors.py | 1 | ||||
| -rw-r--r-- | oslo_middleware/tests/test_catch_errors.py | 3 | ||||
| -rw-r--r-- | oslo_middleware/tests/test_correlation_id.py | 3 | ||||
| -rw-r--r-- | oslo_middleware/tests/test_healthcheck.py | 2 | ||||
| -rw-r--r-- | oslo_middleware/tests/test_stats.py | 2 | ||||
| -rw-r--r-- | releasenotes/source/index.rst | 1 | ||||
| -rw-r--r-- | releasenotes/source/ussuri.rst | 6 | ||||
| -rw-r--r-- | setup.cfg | 10 | ||||
| -rw-r--r-- | test-requirements.txt | 3 | ||||
| -rw-r--r-- | tox.ini | 6 |
13 files changed, 22 insertions, 21 deletions
@@ -3,7 +3,7 @@ - check-requirements - lib-forward-testing-python3 - openstack-lower-constraints-jobs - - openstack-python3-ussuri-jobs + - openstack-python3-victoria-jobs - periodic-stable-jobs - publish-openstack-docs-pti - release-notes-jobs-python3 diff --git a/doc/requirements.txt b/doc/requirements.txt index e1f921e..7dcf079 100644 --- a/doc/requirements.txt +++ b/doc/requirements.txt @@ -2,7 +2,8 @@ # of appearance. Changing the order has an impact on the overall integration # process, which may cause wedges in the gate later. # These are needed for docs generation -openstackdocstheme>=1.20.0 # Apache-2.0 + +openstackdocstheme>=1.31.2 # Apache-2.0 sphinx>=1.8.0,!=2.1.0 # BSD reno>=2.5.0 # Apache-2.0 fixtures>=3.0.0 # Apache-2.0/BSD diff --git a/lower-constraints.txt b/lower-constraints.txt index cf963e3..05948ea 100644 --- a/lower-constraints.txt +++ b/lower-constraints.txt @@ -15,7 +15,6 @@ keystoneauth1==3.4.0 linecache2==1.0.0 MarkupSafe==1.0 mccabe==0.2.1 -mock==2.0.0 mox3==0.20.0 msgpack-python==0.4.0 netaddr==0.7.18 diff --git a/oslo_middleware/cors.py b/oslo_middleware/cors.py index 452369f..69fe3d6 100644 --- a/oslo_middleware/cors.py +++ b/oslo_middleware/cors.py @@ -395,5 +395,6 @@ class CORS(base.ConfigurableMiddleware): response.headers['Access-Control-Expose-Headers'] = \ ','.join(cors_config['expose_headers']) + # NOTE(sileht): Shortcut for backwards compatibility filter_factory = CORS.factory diff --git a/oslo_middleware/tests/test_catch_errors.py b/oslo_middleware/tests/test_catch_errors.py index 7a06218..fa6d518 100644 --- a/oslo_middleware/tests/test_catch_errors.py +++ b/oslo_middleware/tests/test_catch_errors.py @@ -13,8 +13,9 @@ # License for the specific language governing permissions and limitations # under the License. +from unittest import mock + import fixtures -import mock from oslotest import base as test_base import webob.dec import webob.exc diff --git a/oslo_middleware/tests/test_correlation_id.py b/oslo_middleware/tests/test_correlation_id.py index e2685bf..738fa37 100644 --- a/oslo_middleware/tests/test_correlation_id.py +++ b/oslo_middleware/tests/test_correlation_id.py @@ -13,8 +13,9 @@ # License for the specific language governing permissions and limitations # under the License. +from unittest import mock + import fixtures -import mock from oslotest import base as test_base from oslo_middleware import correlation_id diff --git a/oslo_middleware/tests/test_healthcheck.py b/oslo_middleware/tests/test_healthcheck.py index 9220ea4..d82316f 100644 --- a/oslo_middleware/tests/test_healthcheck.py +++ b/oslo_middleware/tests/test_healthcheck.py @@ -15,8 +15,8 @@ import threading import time +from unittest import mock -import mock from oslo_config import fixture as config from oslo_serialization import jsonutils from oslotest import base as test_base diff --git a/oslo_middleware/tests/test_stats.py b/oslo_middleware/tests/test_stats.py index 66dfaaf..c6a1771 100644 --- a/oslo_middleware/tests/test_stats.py +++ b/oslo_middleware/tests/test_stats.py @@ -12,9 +12,9 @@ # License for the specific language governing permissions and limitations # under the License. +from unittest import mock import uuid -import mock from oslotest import base as test_base import statsd import webob.dec diff --git a/releasenotes/source/index.rst b/releasenotes/source/index.rst index 6468257..8bf705a 100644 --- a/releasenotes/source/index.rst +++ b/releasenotes/source/index.rst @@ -6,6 +6,7 @@ oslo.middleware Release Notes :maxdepth: 1 unreleased + ussuri train stein rocky diff --git a/releasenotes/source/ussuri.rst b/releasenotes/source/ussuri.rst new file mode 100644 index 0000000..e21e50e --- /dev/null +++ b/releasenotes/source/ussuri.rst @@ -0,0 +1,6 @@ +=========================== +Ussuri Series Release Notes +=========================== + +.. release-notes:: + :branch: stable/ussuri @@ -17,6 +17,7 @@ classifier = Programming Language :: Python :: 3 Programming Language :: Python :: 3.6 Programming Language :: Python :: 3.7 + Programming Language :: Python :: 3.8 Programming Language :: Python :: 3 :: Only Programming Language :: Python :: Implementation :: CPython @@ -51,15 +52,6 @@ paste.filter_factory = sizelimit = oslo_middleware:RequestBodySizeLimiter.factory ssl = oslo_middleware:SSLMiddleware.factory -[build_sphinx] -source-dir = doc/source -build-dir = doc/build -all_files = 1 -warning-is-error = 1 - -[upload_sphinx] -upload-dir = doc/build/html - [compile_catalog] directory = oslo_middleware/locale domain = oslo_middleware diff --git a/test-requirements.txt b/test-requirements.txt index 6f0580b..087db15 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -3,8 +3,7 @@ # process, which may cause wedges in the gate later. fixtures>=3.0.0 # Apache-2.0/BSD -hacking>=1.1.0,<1.2.0 # Apache-2.0 -mock>=2.0.0 # BSD +hacking>=3.0,<3.1.0 # Apache-2.0 oslotest>=3.2.0 # Apache-2.0 testtools>=2.2.0 # MIT coverage!=4.4,>=4.0 # Apache-2.0 @@ -1,6 +1,6 @@ [tox] minversion = 3.1 -envlist = py37,pep8 +envlist = py38,pep8 ignore_basepython_conflict = true [testenv] @@ -34,9 +34,9 @@ commands = python setup.py test --coverage --coverage-package-name=oslo_middlewa [flake8] # E123, E125 skipped as they are invalid PEP-8. - +# W504 line break after binary operator show-source = True -ignore = E123,E125 +ignore = E123,E125,W504 exclude=.venv,.git,.tox,dist,doc,*lib/python*,*egg,build,__init__.py [hacking] |