Modernize package a little

- Remove unnecessary dependencies
- Cleanup 'tox.ini' file

Signed-off-by: Stephen Finucane <stephenfin@redhat.com>
Change-Id: I19a5d0318ac72012aa7adc9b7eaccc2e59885838

os_service_types/tests/test_data.py

@@ -22,17 +22,10 @@ Tests for `os_service_types.data` module.
 
 import json
 
-import six
-
 from os_service_types import data
 from os_service_types.tests import base
 
 
-if six.PY2:
-    # Python 2 has not FileNotFoundError exception
-    FileNotFoundError = IOError
-
-
 class TestData(base.TestCase, base.TemporaryFileMixin):
 
     def setUp(self):

test-requirements.txt

@@ -1,17 +1,13 @@
-# The order of packages is significant, because pip processes them in the order
-# of appearance. Changing the order has an impact on the overall integration
-# process, which may cause wedges in the gate later.
+hacking>=3.1.0,<3.2.0 # Apache-2.0
 
-hacking>=3.0.1,<3.1.0 # Apache-2.0
 coverage!=4.4,>=4.0 # Apache-2.0
-python-subunit>=1.0.0 # Apache-2.0/BSD
-sphinx>=2.0.0,!=2.1.0 # BSD
 stestr>=2.0.0 # Apache-2.0
-oslotest>=3.2.0 # Apache-2.0
+oslotest>=3.8.0 # Apache-2.0
 testscenarios>=0.4 # Apache-2.0/BSD
 requests-mock>=1.2.0 # Apache-2.0
-openstackdocstheme>=2.2.1 # Apache-2.0
 keystoneauth1>=3.4.0 # Apache-2.0
-# releasenotes
+
+# docs, releasenotes
+sphinx>=2.0.0,!=2.1.0 # BSD
 reno>=3.1.0 # Apache-2.0
-six>=1.10.0 # MIT
+openstackdocstheme>=2.2.1 # Apache-2.0

tox.ini

@@ -2,18 +2,18 @@
 minversion = 3.1.0
 envlist = py38,pep8
 ignore_basepython_conflict = true
-skipsdist = True
+skipsdist = true
 
 [testenv]
 basepython = python3
-usedevelop = True
+usedevelop = true
 setenv =
-   VIRTUAL_ENV={envdir}
-   PYTHONWARNINGS=default::DeprecationWarning
+  VIRTUAL_ENV={envdir}
+  PYTHONWARNINGS=default::DeprecationWarning
 deps =
-  -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
- -r{toxinidir}/test-requirements.txt
- -r{toxinidir}/requirements.txt
+  -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
+  -r{toxinidir}/test-requirements.txt
+  -r{toxinidir}/requirements.txt
 commands = stestr run --slowest {posargs}
 
 [testenv:pep8]
@@ -24,16 +24,17 @@ commands = {posargs}
 
 [testenv:cover]
 setenv =
-    PYTHON=coverage run --source os_service_types --parallel-mode
+  PYTHON=coverage run --source os_service_types --parallel-mode
 commands =
-    stestr run {posargs}
-    coverage combine
-    coverage html -d cover
-    coverage xml -o cover/coverage.xml
-    coverage report
+  stestr run {posargs}
+  coverage combine
+  coverage html -d cover
+  coverage xml -o cover/coverage.xml
+  coverage report
 
 [testenv:docs]
-commands = sphinx-build -W -b html -d doc/build/doctrees doc/source doc/build/html
+commands =
+  sphinx-build -W -b html -d doc/build/doctrees doc/source doc/build/html
 
 [testenv:releasenotes]
 commands =