diff options
-rw-r--r-- | doc/requirements.txt | 3 | ||||
-rw-r--r-- | oslo_middleware/cors.py | 1 | ||||
-rw-r--r-- | setup.cfg | 9 | ||||
-rw-r--r-- | test-requirements.txt | 2 | ||||
-rw-r--r-- | tox.ini | 4 |
5 files changed, 6 insertions, 13 deletions
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/oslo_middleware/cors.py b/oslo_middleware/cors.py index a01e21e..1fac58a 100644 --- a/oslo_middleware/cors.py +++ b/oslo_middleware/cors.py @@ -396,5 +396,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 @@ -51,15 +51,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 317d0bc..087db15 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -3,7 +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 +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 @@ -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] |