[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

Update boto,pbr minimal requirement for python3 support.

Change-Id: I23c273d0aa57e1400b383357883f298b8288897d
This commit is contained in:
Andreas Jaeger 2020-02-04 20:05:07 +01:00
parent 1bca92b1c1
commit e3457fcf7d
7 changed files with 12 additions and 33 deletions

View File

@ -2,7 +2,6 @@
templates: templates:
- check-requirements - check-requirements
- 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
- publish-to-pypi - publish-to-pypi

View File

@ -1,4 +1,3 @@
openstackdocstheme>=1.11.0 # Apache-2.0 openstackdocstheme>=1.11.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
sphinxcontrib-httpdomain>=1.7.0 sphinxcontrib-httpdomain>=1.7.0

View File

@ -1,7 +1,7 @@
boto==2.13.3 boto==2.32.1
hacking==0.9.0 hacking==0.9.0
mock==1.0 mock==1.0
pbr==0.8 pbr==2.0.0
psutil==1.1.1 psutil==1.1.1
six==1.9.0 six==1.9.0
stestr==2.0.0 stestr==2.0.0

View File

@ -1,4 +1,4 @@
pbr!=2.1.0,>=0.8 pbr!=2.1.0,>=2.0.0
boto>=2.13.3 boto>=2.32.1
psutil>=1.1.1 psutil>=1.1.1
six>=1.9.0 six>=1.9.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://www.openstack.org/ home-page = http://www.openstack.org/
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
@ -29,18 +28,3 @@ scripts =
bin/cfn-init bin/cfn-init
bin/cfn-push-stats bin/cfn-push-stats
bin/cfn-signal bin/cfn-signal
[global]
setup-hooks =
pbr.hooks.setup_hook
[wheel]
universal = 1
[build_sphinx]
source-dir = doc/source
build-dir = doc/build
all_files = 1
[upload_sphinx]
upload-dir = doc/build/html

View File

@ -18,5 +18,5 @@
import setuptools import setuptools
setuptools.setup( setuptools.setup(
setup_requires=['pbr'], setup_requires=['pbr>=2.0.0'],
pbr=True) pbr=True)

13
tox.ini
View File

@ -1,20 +1,20 @@
[tox] [tox]
envlist = py27,py37,pep8 envlist = py37,pep8
ignore_basepython_conflict = true
[testenv] [testenv]
basepython = python3
setenv = VIRTUAL_ENV={envdir} setenv = VIRTUAL_ENV={envdir}
install_command = pip install -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} {opts} {packages} deps =-c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
deps = -r{toxinidir}/requirements.txt -r{toxinidir}/requirements.txt
-r{toxinidir}/test-requirements.txt -r{toxinidir}/test-requirements.txt
commands = stestr run --slowest {posargs} commands = stestr run --slowest {posargs}
[testenv:pep8] [testenv:pep8]
basepython = python3
commands = flake8 commands = flake8
flake8 --filename=cfn-* bin flake8 --filename=cfn-* bin
[testenv:cover] [testenv:cover]
basepython = python3
setenv = setenv =
{[testenv]setenv} {[testenv]setenv}
PYTHON=coverage run --source heat_cfntools --parallel-mode PYTHON=coverage run --source heat_cfntools --parallel-mode
@ -25,7 +25,6 @@ commands =
coverage xml -o cover/coverage.xml coverage xml -o cover/coverage.xml
[testenv:venv] [testenv:venv]
basepython = python3
commands = {posargs} commands = {posargs}
[flake8] [flake8]
@ -33,12 +32,10 @@ show-source = true
exclude=.venv,.git,.tox,dist,doc,*lib/python*,*egg,tools exclude=.venv,.git,.tox,dist,doc,*lib/python*,*egg,tools
[testenv:docs] [testenv:docs]
basepython = python3
deps = -r{toxinidir}/doc/requirements.txt deps = -r{toxinidir}/doc/requirements.txt
commands = sphinx-build -W -b html doc/source doc/build/html commands = sphinx-build -W -b html doc/source doc/build/html
[testenv:lower-constraints] [testenv:lower-constraints]
basepython = python3
deps = deps =
-c{toxinidir}/lower-constraints.txt -c{toxinidir}/lower-constraints.txt
-r{toxinidir}/requirements.txt -r{toxinidir}/requirements.txt