summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Jaeger <aj@suse.com>2020-04-13 11:11:33 +0200
committerAndreas Jaeger <aj@suse.com>2020-04-13 11:16:21 +0200
commitd9718805c1eaead1b00470d276cc94d12d3c9b57 (patch)
tree324f7cf0035ee2e4a5d83b57ebdca41bfe390cb8
parent8b2aaa3f6cdcd1840b2b101dd3d0d9bc2034ad9d (diff)
downloadoslo-middleware-d9718805c1eaead1b00470d276cc94d12d3c9b57.tar.gz
Cleanup py27 support
This repo is now testing only with Python 3, so let's make a few cleanups: - Remove obsolete sections from setup.cfg - Update classifiers - Use newer openstackdocstheme version - Switch to hacking 3.0, fix problems found Change-Id: I539b00204279c7645ef4a3f804f64a1e7af30f05
-rw-r--r--doc/requirements.txt3
-rw-r--r--oslo_middleware/cors.py1
-rw-r--r--setup.cfg9
-rw-r--r--test-requirements.txt2
-rw-r--r--tox.ini4
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
diff --git a/setup.cfg b/setup.cfg
index 0cb17d9..19f812b 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -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
diff --git a/tox.ini b/tox.ini
index 9ce0e69..cbcd691 100644
--- a/tox.ini
+++ b/tox.ini
@@ -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]