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
This commit is contained in:
Andreas Jaeger 2020-04-19 17:47:22 +02:00
parent 29d7290c61
commit 0c31414677
9 changed files with 5 additions and 28 deletions

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -13,8 +13,8 @@
# under the License.
import textwrap
from unittest import mock
import mock
from oslotest import base
import pkg_resources

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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 =