Small cleanups

the repo is building using Python 3, so remove some cruft:
* Remove python 2 requirements
* Remove python2 stanza from setup.py
* Remove obsolete sections from setup.cfg
* Remove unused variables from tox.ini

Change-Id: Ia56048d901f2fa0099341f349b02c7ac76a40b82
This commit is contained in:
Andreas Jaeger 2020-04-07 13:09:25 +02:00
parent 67f767bf8a
commit 60ab492106
4 changed files with 1 additions and 20 deletions

View File

@ -3,5 +3,4 @@
# process, which may cause wedges in the gate later.
openstackdocstheme>=1.27.1 # Apache-2.0
doc8>=0.6.0 # Apache-2.0
sphinx!=1.6.6,!=1.6.7,>=1.6.2,<2.0.0;python_version=='2.7' # BSD
sphinx!=1.6.6,!=1.6.7,>=1.6.2;python_version>='3.4' # BSD
sphinx!=1.6.6,!=1.6.7,>=1.6.2 # BSD

View File

@ -11,11 +11,3 @@ classifier =
License :: OSI Approved :: Apache Software License
Operating System :: POSIX :: Linux
Topic :: Documentation
[build_sphinx]
warning-is-error = 1
build-dir = build
source-dir = source
[bdist_wheel]
universal = 1

View File

@ -14,17 +14,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
# THIS FILE IS MANAGED BY THE GLOBAL REQUIREMENTS REPO - DO NOT EDIT
import setuptools
# In python < 2.7.4, a lazy loading of package `pbr` will break
# setuptools if some other modules registered functions in `atexit`.
# solution from: http://bugs.python.org/issue15881#msg170215
try:
import multiprocessing # noqa
except ImportError:
pass
setuptools.setup(
setup_requires=['pbr'],
pbr=True)

View File

@ -6,7 +6,6 @@ envlist = docs
[testenv]
basepython = python3
setenv = VIRTUAL_ENV={envdir}
passenv = *_proxy *_PROXY ZUUL_*
[testenv:docs]
deps =