Browse Source

Cleanup py27 support

This repo is now testing only with Python 3, so let's make
a few cleanups:
- Remove python 2.7 stanza from setup.py
- Add requires on python >= 3.6 to setup.cfg so that pypi and pip
  know about the requirement
- Remove obsolete sections from setup.cfg
- Update classifiers
- Update requirements, no need for python_version anymore
- Use newer openstackdocstheme version
- Add basepython to tox.ini

Change-Id: I4b731354119ebc3a7519da420121404aa2fbb640
changes/97/719597/2
Andreas Jaeger 1 year ago
parent
commit
8cb9338a98
  1. 5
      doc/requirements.txt
  2. 2
      lower-constraints.txt
  3. 25
      setup.cfg
  4. 9
      setup.py
  5. 5
      test-requirements.txt
  6. 4
      tox.ini

5
doc/requirements.txt

@ -1,7 +1,6 @@
# this is required for the docs build jobs
sphinx>=1.8.0,<2.0.0;python_version=='2.7' # BSD
sphinx>=1.8.0,!=2.1.0;python_version>='3.4' # BSD
openstackdocstheme>=1.29.2 # Apache-2.0
sphinx>=1.8.0,!=2.1.0 # BSD
openstackdocstheme>=1.31.2 # Apache-2.0
reno>=2.11.3 # Apache-2.0
doc8>=0.8.0 # Apache-2.0
bashate>=0.6.0 # Apache-2.0

2
lower-constraints.txt

@ -49,7 +49,7 @@ msgpack==0.5.6
munch==2.2.0
netaddr==0.7.18
netifaces==0.10.6
openstackdocstheme==1.20.0
openstackdocstheme==1.31.2
openstacksdk==0.36.0
os-client-config==1.29.0
os-net-config==7.1.0

25
setup.cfg

@ -6,6 +6,7 @@ description-file =
author = OpenStack
author-email = openstack-discuss@lists.openstack.org
home-page = https://docs.openstack.org/tripleo-validations/latest/
python-requires = >=3.6
classifier =
Environment :: OpenStack
Intended Audience :: Information Technology
@ -13,6 +14,8 @@ classifier =
License :: OSI Approved :: Apache Software License
Operating System :: POSIX :: Linux
Programming Language :: Python
Programming Language :: Python :: Implementation :: CPython
Programming Language :: Python :: 3 :: Only
Programming Language :: Python :: 3
Programming Language :: Python :: 3.6
Programming Language :: Python :: 3.7
@ -33,25 +36,3 @@ data_files =
share/openstack-tripleo-validations/callback_plugins = callback_plugins/*
share/openstack-tripleo-validations/lookup_plugins = lookup_plugins/*
share/openstack-tripleo-validations/library = library/*
[build_sphinx]
source-dir = doc/source
build-dir = doc/build
all_files = 1
[upload_sphinx]
upload-dir = doc/build/html
[compile_catalog]
directory = tripleo-validations/locale
domain = tripleo-validations
[update_catalog]
domain = tripleo-validations
output_dir = tripleo-validations/locale
input_file = tripleo-validations/locale/tripleo-validations.pot
[extract_messages]
keywords = _ gettext ngettext l_ lazy_gettext
mapping_file = babel.cfg
output_file = tripleo-validations/locale/tripleo-validations.pot

9
setup.py

@ -13,17 +13,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>=2.0.0'],
pbr=True)

5
test-requirements.txt

@ -2,13 +2,12 @@
# of appearance. Changing the order has an impact on the overall integration
# process, which may cause wedges in the gate later.
openstackdocstheme>=1.20.0 # Apache-2.0
openstackdocstheme>=1.31.2 # Apache-2.0
hacking>=3.0,<3.1.0 # Apache-2.0
coverage!=4.4,>=4.0 # Apache-2.0
python-subunit>=1.0.0 # Apache-2.0/BSD
sphinx>=1.8.0,<2.0.0;python_version=='2.7' # BSD
sphinx>=1.8.0,!=2.1.0;python_version>='3.4' # BSD
sphinx>=1.8.0,!=2.1.0 # BSD
oslotest>=3.2.0 # Apache-2.0
testrepository>=0.0.18 # Apache-2.0/BSD
testscenarios>=0.4 # Apache-2.0/BSD

4
tox.ini

@ -1,9 +1,11 @@
[tox]
minversion = 2.0
minversion = 3.1.1
envlist = linters,docs,py37,molecule
skipdist = True
ignore_basepython_conflict = True
[testenv]
basepython = python3
usedevelop = True
passenv = *
setenv =

Loading…
Cancel
Save