[ussuri][goal] Drop python 2.7 support and testing

OpenStack is dropping the py2.7 support in ussuri cycle.

Complete discussion & schedule can be found in
- http://lists.openstack.org/pipermail/openstack-discuss/2019-October/010142.html
- https://etherpad.openstack.org/p/drop-python2-support

Ussuri Communtiy-wide goal:
https://governance.openstack.org/tc/goals/selected/ussuri/drop-py27.html

Change-Id: Ie1e6a0b1aac4aca3f7f6a3ef7113ceee28233463
This commit is contained in:
Andreas Jaeger 2020-02-03 13:51:37 +01:00
parent 4a0ae55492
commit cbf98fdc5c
5 changed files with 11 additions and 27 deletions

View File

@ -1,5 +1,4 @@
- project: - project:
templates: templates:
- openstack-python-jobs
- openstack-python3-ussuri-jobs - openstack-python3-ussuri-jobs
- publish-openstack-docs-pti - publish-openstack-docs-pti

View File

@ -0,0 +1,5 @@
---
upgrade:
- |
Python 2.7 support has been dropped. The minimum version of Python now
supported by whereto is Python 3.6.

View File

@ -6,6 +6,7 @@ description-file =
author = OpenStack author = OpenStack
author-email = openstack-discuss@lists.openstack.org author-email = openstack-discuss@lists.openstack.org
home-page = https://docs.openstack.org/whereto/latest/ home-page = https://docs.openstack.org/whereto/latest/
python-requires = >=3.6
classifier = classifier =
Environment :: OpenStack Environment :: OpenStack
Intended Audience :: Information Technology Intended Audience :: Information Technology
@ -13,8 +14,6 @@ classifier =
License :: OSI Approved :: Apache Software License License :: OSI Approved :: Apache Software License
Operating System :: POSIX :: Linux Operating System :: POSIX :: Linux
Programming Language :: Python Programming Language :: Python
Programming Language :: Python :: 2
Programming Language :: Python :: 2.7
Programming Language :: Python :: 3 Programming Language :: Python :: 3
Programming Language :: Python :: 3.6 Programming Language :: Python :: 3.6
Programming Language :: Python :: 3.7 Programming Language :: Python :: 3.7
@ -27,15 +26,6 @@ packages =
console_scripts = console_scripts =
whereto = whereto.app:main whereto = whereto.app:main
[build_sphinx]
all-files = 1
warning-is-error = 1
source-dir = doc/source
build-dir = doc/build
[upload_sphinx]
upload-dir = doc/build/html
[compile_catalog] [compile_catalog]
directory = whereto/locale directory = whereto/locale
domain = whereto domain = whereto
@ -49,6 +39,3 @@ input_file = whereto/locale/whereto.pot
keywords = _ gettext ngettext l_ lazy_gettext keywords = _ gettext ngettext l_ lazy_gettext
mapping_file = babel.cfg mapping_file = babel.cfg
output_file = whereto/locale/whereto.pot output_file = whereto/locale/whereto.pot
[wheel]
universal = 1

View File

@ -5,8 +5,7 @@
hacking>=0.12.0,<0.13 # Apache-2.0 hacking>=0.12.0,<0.13 # Apache-2.0
coverage>=4.0,!=4.4 # Apache-2.0 coverage>=4.0,!=4.4 # Apache-2.0
sphinx>=1.8.0,<2.0.0;python_version=='2.7' # BSD sphinx>=1.8.0,!=2.1.0 # BSD
sphinx>=1.8.0,!=2.1.0;python_version>='3.4' # BSD
oslotest>=1.10.0 # Apache-2.0 oslotest>=1.10.0 # Apache-2.0
testrepository>=0.0.18 # Apache-2.0/BSD testrepository>=0.0.18 # Apache-2.0/BSD
testtools>=1.4.0 # MIT testtools>=1.4.0 # MIT

14
tox.ini
View File

@ -1,11 +1,12 @@
[tox] [tox]
minversion = 2.0 minversion = 3.1.1
envlist = py27,py37,pep8 envlist = py37,pep8
skipsdist = True skipsdist = True
ignore_basepython_conflict = True
[testenv] [testenv]
basepython = python3
usedevelop = True usedevelop = True
install_command = pip install {opts} {packages}
setenv = setenv =
VIRTUAL_ENV={envdir} VIRTUAL_ENV={envdir}
PYTHONWARNINGS=default::DeprecationWarning PYTHONWARNINGS=default::DeprecationWarning
@ -18,37 +19,30 @@ commands =
coverage report --show-missing coverage report --show-missing
[testenv:pep8] [testenv:pep8]
basepython = python3
commands = flake8 {posargs} commands = flake8 {posargs}
[testenv:venv] [testenv:venv]
# The sphinxcontrib.autoprogram extension requires python 3's version # The sphinxcontrib.autoprogram extension requires python 3's version
# of argparse, so force python 3 here to ensure the check job that # of argparse, so force python 3 here to ensure the check job that
# builds the docs on OpenStack infrastructure uses python 3. # builds the docs on OpenStack infrastructure uses python 3.
basepython = python3
commands = {posargs} commands = {posargs}
[testenv:bindep] [testenv:bindep]
basepython = python3
deps = bindep deps = bindep
commands = bindep test commands = bindep test
[testenv:cover] [testenv:cover]
basepython = python3
commands = python setup.py test --coverage --testr-args='{posargs}' commands = python setup.py test --coverage --testr-args='{posargs}'
[testenv:docs] [testenv:docs]
basepython = python3
commands = commands =
sphinx-build --keep-going -b html -W doc/source doc/build/html sphinx-build --keep-going -b html -W doc/source doc/build/html
[testenv:releasenotes] [testenv:releasenotes]
basepython = python3
commands = commands =
sphinx-build -a -E -W -d releasenotes/build/doctrees --keep-going -b html releasenotes/source releasenotes/build/html sphinx-build -a -E -W -d releasenotes/build/doctrees --keep-going -b html releasenotes/source releasenotes/build/html
[testenv:debug] [testenv:debug]
basepython = python3
commands = oslo_debug_helper {posargs} commands = oslo_debug_helper {posargs}
[flake8] [flake8]