From 5dff1692a005e868ca48045838aa921311a360b7 Mon Sep 17 00:00:00 2001
From: Stephen Finucane <sfinucan@redhat.com>
Date: Tue, 21 May 2019 09:44:36 +0100
Subject: [PATCH] Resolve some issue with tox.ini, setup.cfg

- Use constraints for documentation targets
- Indicate support for Python 3.7
- Remove remnants of the usage of 'build_sphinx'

Change-Id: I176384504dc5491abb7b4d417763df125cc398f1
Signed-off-by: Stephen Finucane <sfinucan@redhat.com>
---
 setup.cfg | 12 ++----------
 tox.ini   | 42 +++++++++++++++++-------------------------
 2 files changed, 19 insertions(+), 35 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index e908ddb..578c578 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -17,20 +17,12 @@ classifier =
     Programming Language :: Python :: 2.7
     Programming Language :: Python :: 3
     Programming Language :: Python :: 3.6
+    Programming Language :: Python :: 3.7
 
 [files]
 packages =
     oslo_serialization
 
-[build_sphinx]
-all-files = 1
-warning-is-error = 1
-source-dir = doc/source
-build-dir = doc/build
-
-[upload_sphinx]
-upload-dir = doc/build/html
-
 [compile_catalog]
 directory = oslo.serialization/locale
 domain = oslo.serialization
@@ -45,5 +37,5 @@ keywords = _ gettext ngettext l_ lazy_gettext
 mapping_file = babel.cfg
 output_file = oslo.serialization/locale/oslo.serialization.pot
 
-[wheel]
+[bdist_wheel]
 universal = 1
diff --git a/tox.ini b/tox.ini
index de53e8f..3e6565d 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,55 +1,47 @@
 [tox]
-minversion = 2.0
-envlist = py36,py27,pep8
+minversion = 3.1
+envlist = py27,py36,py37,pep8
+basepython = python3
+ignore_basepython_conflict = True
 
 [testenv]
 install_command = pip install {opts} {packages}
 deps =
-  -c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/master/upper-constraints.txt}
+  -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
   -r{toxinidir}/test-requirements.txt
   -r{toxinidir}/requirements.txt
 commands = stestr run --slowest {posargs}
 
-[testenv:py27]
-basepython = python2.7
-
 [testenv:pep8]
-basepython = python3
-deps =
-  -r{toxinidir}/test-requirements.txt
 commands =
   flake8
   # Run security linter
   bandit -r oslo_serialization tests -n5
 
 [testenv:venv]
-basepython = python3
 commands = {posargs}
 
-[testenv:docs]
-basepython = python3
-deps = -r{toxinidir}/doc/requirements.txt
-commands = sphinx-build -W -b html doc/source doc/build/html
-
 [testenv:cover]
-basepython = python3
 commands = python setup.py test --coverage --coverage-package-name=oslo_serialization --testr-args='{posargs}'
 
-[flake8]
-# E123, E125 skipped as they are invalid PEP-8.
-
-show-source = True
-ignore = E123,E125
-exclude=.venv,.git,.tox,dist,doc,*lib/python*,*egg,build
+[testenv:docs]
+deps =
+  -c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/master/upper-constraints.txt}
+  -r{toxinidir}/doc/requirements.txt
+commands = sphinx-build -W -b html doc/source doc/build/html
 
 [testenv:releasenotes]
-basepython = python3
-deps = -r{toxinidir}/doc/requirements.txt
+deps = {[testenv:docs]deps}
 commands = sphinx-build -a -E -W -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html
 
 [testenv:lower-constraints]
-basepython = python3
 deps =
   -c{toxinidir}/lower-constraints.txt
   -r{toxinidir}/test-requirements.txt
   -r{toxinidir}/requirements.txt
+
+[flake8]
+# E123, E125 skipped as they are invalid PEP-8.
+show-source = True
+ignore = E123,E125
+exclude=.venv,.git,.tox,dist,doc,*lib/python*,*egg,build