From 0c314146776e907ded7dbc33a976d1fed519c7ba Mon Sep 17 00:00:00 2001
From: Andreas Jaeger <aj@suse.com>
Date: Sun, 19 Apr 2020 17:47:22 +0200
Subject: [PATCH] Update docs building, Python 3 cleanup

Update docs building:
* Remove unneeded doc sections from setup.cfg
* Change constraints to use published document, use
  new variable
* Import mock from unittest, remove imports from future

Change-Id: I8f33d4c0bf5fcba203d410cd021c548219a757ec
---
 openstack_releases/tests/test_new_release.py  |  2 --
 openstack_releases/tests/test_npmutils.py     |  4 +---
 openstack_releases/tests/test_puppetutils.py  |  4 +---
 openstack_releases/tests/test_requirements.py |  2 +-
 openstack_releases/tests/test_validate.py     |  4 +---
 openstack_releases/versionutils.py            |  2 --
 setup.cfg                                     | 10 ----------
 test-requirements.txt                         |  3 ---
 tox.ini                                       |  2 +-
 9 files changed, 5 insertions(+), 28 deletions(-)

diff --git a/openstack_releases/tests/test_new_release.py b/openstack_releases/tests/test_new_release.py
index 601fb22b68..544edbbd96 100644
--- a/openstack_releases/tests/test_new_release.py
+++ b/openstack_releases/tests/test_new_release.py
@@ -12,8 +12,6 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from __future__ import unicode_literals
-
 from oslotest import base
 
 from openstack_releases.cmds import new_release
diff --git a/openstack_releases/tests/test_npmutils.py b/openstack_releases/tests/test_npmutils.py
index 07f50c4b23..3a84135347 100644
--- a/openstack_releases/tests/test_npmutils.py
+++ b/openstack_releases/tests/test_npmutils.py
@@ -12,13 +12,11 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from __future__ import unicode_literals
-
 import os
+from unittest import mock
 
 import fixtures
 import json
-import mock
 from oslotest import base
 
 from openstack_releases import npmutils
diff --git a/openstack_releases/tests/test_puppetutils.py b/openstack_releases/tests/test_puppetutils.py
index 78a9b76ced..a47f17da28 100644
--- a/openstack_releases/tests/test_puppetutils.py
+++ b/openstack_releases/tests/test_puppetutils.py
@@ -12,13 +12,11 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from __future__ import unicode_literals
-
 import os
+from unittest import mock
 
 import fixtures
 import json
-import mock
 from oslotest import base
 
 from openstack_releases import puppetutils
diff --git a/openstack_releases/tests/test_requirements.py b/openstack_releases/tests/test_requirements.py
index 02a8d2181b..e2cc782987 100644
--- a/openstack_releases/tests/test_requirements.py
+++ b/openstack_releases/tests/test_requirements.py
@@ -13,8 +13,8 @@
 #    under the License.
 
 import textwrap
+from unittest import mock
 
-import mock
 from oslotest import base
 import pkg_resources
 
diff --git a/openstack_releases/tests/test_validate.py b/openstack_releases/tests/test_validate.py
index d3655e5e59..b7b0bff984 100644
--- a/openstack_releases/tests/test_validate.py
+++ b/openstack_releases/tests/test_validate.py
@@ -12,13 +12,11 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from __future__ import unicode_literals
-
 import os
 import textwrap
+from unittest import mock
 
 import fixtures
-import mock
 from oslotest import base
 
 from openstack_releases.cmds import validate
diff --git a/openstack_releases/versionutils.py b/openstack_releases/versionutils.py
index 8ea642386e..b86e77d261 100644
--- a/openstack_releases/versionutils.py
+++ b/openstack_releases/versionutils.py
@@ -12,8 +12,6 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from __future__ import unicode_literals
-
 import packaging.version
 import pbr.version
 
diff --git a/setup.cfg b/setup.cfg
index f209d3eb19..7942b8e222 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -42,13 +42,3 @@ console_scripts =
     check-schema = openstack_releases.cmds.check_schema:main
     find-gerrit-acl-issues = openstack_releases.cmds.find_gerrit_acl_issues:main
     get-contacts = openstack_releases.cmds.get_contacts:main
-
-[build_sphinx]
-source-dir = doc/source
-build-dir = doc/build
-all_files = 1
-builders = html
-warning-is-error = 1
-
-[upload_sphinx]
-upload-dir = doc/build/html
diff --git a/test-requirements.txt b/test-requirements.txt
index add978e1b1..8f12dd2c18 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -12,6 +12,3 @@ testtools>=1.4.0 # MIT
 oslotest>=1.10.0 # Apache-2.0
 
 coverage>=4.0 # Apache-2.0
-
-# mocking framework
-mock>=2.0 # BSD
diff --git a/tox.ini b/tox.ini
index e75eef9eba..9ecf67db11 100644
--- a/tox.ini
+++ b/tox.ini
@@ -71,7 +71,7 @@ commands = {toxinidir}/tools/build_tag_history.sh {toxinidir}
 
 [testenv:docs]
 deps =
-  -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt}
+  -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
   -r{toxinidir}/requirements.txt
   -r{toxinidir}/doc/requirements.txt
 commands =