[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

Increase requests lower requirement since oslo.config needs 2.18.0.
Fix idna lower-constraint to satisfy requests.

Change-Id: I753e09613b50e099060e2c85eb80d06d8b257858
This commit is contained in:
Andreas Jaeger 2020-02-04 20:09:18 +01:00
parent a299c09d7a
commit 2ceec3b348
8 changed files with 19 additions and 31 deletions

View File

@ -2,21 +2,20 @@
templates: templates:
- openstack-cover-jobs - openstack-cover-jobs
- openstack-lower-constraints-jobs - openstack-lower-constraints-jobs
- openstack-python-jobs
- openstack-python3-ussuri-jobs - openstack-python3-ussuri-jobs
- publish-openstack-docs-pti - publish-openstack-docs-pti
- check-requirements - check-requirements
check: check:
jobs: jobs:
- heat-translator-tox-py27-tp: - heat-translator-tox-py37-tp:
voting: false voting: false
- job: - job:
name: heat-translator-tox-py27-tp name: heat-translator-tox-py37-tp
parent: openstack-tox parent: openstack-tox-py37
description: | description: |
Run tests for heat-translator project. Run tests for heat-translator project.
Uses tox with the ``py27-tp`` environment. Uses tox with the ``py37-tp`` environment.
vars: vars:
tox_envlist: py27-tp tox_envlist: py37-tp

View File

@ -2,5 +2,4 @@
# of appearance. Changing the order has an impact on the overall integration # of appearance. Changing the order has an impact on the overall integration
# process, which may cause wedges in the gate later. # process, which may cause wedges in the gate later.
openstackdocstheme>=1.20.0 # Apache-2.0 openstackdocstheme>=1.20.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,!=2.1.0,>=1.6.2 # BSD
sphinx!=1.6.6,!=1.6.7,!=2.1.0,>=1.6.2;python_version>='3.4' # BSD

View File

@ -16,7 +16,7 @@ extras==1.0.0
fixtures==3.0.0 fixtures==3.0.0
flake8==2.5.5 flake8==2.5.5
hacking==0.12.0 hacking==0.12.0
idna==2.6 idna==2.5
imagesize==0.7.1 imagesize==0.7.1
iso8601==0.1.11 iso8601==0.1.11
Jinja2==2.10 Jinja2==2.10
@ -64,7 +64,7 @@ python-subunit==1.0.0
python-swiftclient==3.2.0 python-swiftclient==3.2.0
pytz==2013.6 pytz==2013.6
PyYAML==3.12 PyYAML==3.12
requests==2.14.2 requests==2.18.0
requestsexceptions==1.2.0 requestsexceptions==1.2.0
simplejson==3.5.1 simplejson==3.5.1
six==1.10.0 six==1.10.0

View File

@ -12,6 +12,6 @@ keystoneauth1>=3.4.0 # Apache-2.0
python-novaclient>=9.1.0 # Apache-2.0 python-novaclient>=9.1.0 # Apache-2.0
python-heatclient>=1.10.0 # Apache-2.0 python-heatclient>=1.10.0 # Apache-2.0
python-glanceclient>=2.8.0 # Apache-2.0 python-glanceclient>=2.8.0 # Apache-2.0
requests>=2.14.2 # Apache-2.0 requests>=2.18.0 # Apache-2.0
oslo.log>=3.36.0 # Apache-2.0 oslo.log>=3.36.0 # Apache-2.0

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 = http://docs.openstack.org/heat-translator/ home-page = http://docs.openstack.org/heat-translator/
python-requires = >=3.6
classifier = classifier =
Environment :: OpenStack Environment :: OpenStack
Intended Audience :: Information Technology Intended Audience :: Information Technology
@ -13,11 +14,11 @@ 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
Programming Language :: Python :: 3 :: Only
Programming Language :: Python :: Implementation :: CPython
[files] [files]
packages = packages =

View File

@ -16,14 +16,6 @@
# THIS FILE IS MANAGED BY THE GLOBAL REQUIREMENTS REPO - DO NOT EDIT # THIS FILE IS MANAGED BY THE GLOBAL REQUIREMENTS REPO - DO NOT EDIT
import setuptools 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( setuptools.setup(
setup_requires=['pbr>=2.0.0'], setup_requires=['pbr>=2.0.0'],
pbr=True) pbr=True)

17
tox.ini
View File

@ -1,11 +1,12 @@
[tox] [tox]
minversion = 2.0 minversion = 3.1.0
envlist = py27,py37,pep8 envlist = py37,pep8
ignore_basepython_conflict = true
skipsdist = True skipsdist = 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
@ -17,29 +18,25 @@ deps =
commands = python setup.py test --slowest --testr-args='{posargs}' commands = python setup.py test --slowest --testr-args='{posargs}'
[testenv:pep8] [testenv:pep8]
basepython = python3
commands = flake8 commands = flake8
[testenv:venv] [testenv:venv]
basepython = python3
commands = {posargs} commands = {posargs}
[testenv:cover] [testenv:cover]
basepython = python3
commands = python setup.py test --coverage --coverage-package-name=translator --testr-args='{posargs}' commands = python setup.py test --coverage --coverage-package-name=translator --testr-args='{posargs}'
[testenv:docs] [testenv:docs]
basepython = python3
deps = -r{toxinidir}/doc/requirements.txt deps = -r{toxinidir}/doc/requirements.txt
commands = sphinx-build -b html doc/source doc/build/html commands = sphinx-build -b html doc/source doc/build/html
[testenv:debug] [testenv:debug]
basepython = python3
commands = oslo_debug_helper -t translator/tests {posargs} commands = oslo_debug_helper -t translator/tests {posargs}
[testenv:py27-tp] [testenv:py37-tp]
basepython = python37
commands = commands =
./run_py27-tosca-parser-master.sh ./run_py-tosca-parser-master.sh
python setup.py test --slowest --testr-args='{posargs}' python setup.py test --slowest --testr-args='{posargs}'
[flake8] [flake8]