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

This commit is contained in:
Zuul 2020-01-16 08:34:14 +00:00 committed by Gerrit Code Review
commit 4ff7674029
4 changed files with 8 additions and 13 deletions

View File

@ -1,7 +1,6 @@
# The order of packages is significant, because pip processes them in the order # The order of packages is significant, because pip processes them in the order
# 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.
sphinx>=1.6.5,!=1.6.6,!=1.6.7,<2.0.0;python_version=='2.7' # BSD
sphinx>=1.6.5,!=1.6.6,!=1.6.7,!=2.1.0;python_version>='3.4' # BSD sphinx>=1.6.5,!=1.6.6,!=1.6.7,!=2.1.0;python_version>='3.4' # BSD
sphinxcontrib-apidoc>=0.2.0 # BSD sphinxcontrib-apidoc>=0.2.0 # BSD
openstackdocstheme>=1.20.0 # Apache-2.0 openstackdocstheme>=1.20.0 # Apache-2.0

View File

@ -0,0 +1,6 @@
---
upgrade:
- |
Python 2.7 support has been dropped. Last release of freezer
to support py2.7 is OpenStack Train. The minimum version of Python now
supported by freezer is Python 3.6.

View File

@ -8,8 +8,6 @@ home-page = https://docs.openstack.org/freezer/latest/
license = Apache-2 license = Apache-2
classifier = classifier =
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

12
tox.ini
View File

@ -1,8 +1,9 @@
[tox] [tox]
envlist = py27,py37,pep8,pylint,docs envlist = py37,pep8,pylint,docs
skipsdist = True skipsdist = True
[testenv] [testenv]
basepython = python3
usedevelop = True usedevelop = True
deps = deps =
-c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
@ -46,12 +47,8 @@ python_files = test_*.py
norecursedirs = .tox .venv norecursedirs = .tox .venv
[testenv:venv] [testenv:venv]
basepython = python3
commands = {posargs} commands = {posargs}
[testenv:py27]
basepython = python2.7
[testenv:py37] [testenv:py37]
basepython = python3.7 basepython = python3.7
@ -59,7 +56,6 @@ basepython = python3.7
basepython = python3.6 basepython = python3.6
[testenv:docs] [testenv:docs]
basepython = python3
deps = -r{toxinidir}/doc/requirements.txt deps = -r{toxinidir}/doc/requirements.txt
whitelist_externals = rm whitelist_externals = rm
commands = commands =
@ -68,13 +64,11 @@ commands =
[testenv:pep8] [testenv:pep8]
basepython = python3
commands = commands =
flake8 freezer flake8 freezer
doc8 {posargs} doc8 {posargs}
[testenv:pylint] [testenv:pylint]
basepython = python3
commands = pylint --rcfile .pylintrc freezer commands = pylint --rcfile .pylintrc freezer
[flake8] [flake8]
@ -88,7 +82,6 @@ ignore = D000,D001
ignore-path = .venv,.git,.tox,.tmp,*freezer/locale*,*lib/python*,freezer.egg*,doc/build,releasenotes/*,doc/source/contributor/api ignore-path = .venv,.git,.tox,.tmp,*freezer/locale*,*lib/python*,freezer.egg*,doc/build,releasenotes/*,doc/source/contributor/api
[testenv:releasenotes] [testenv:releasenotes]
basepython = python3
deps = -r{toxinidir}/doc/requirements.txt deps = -r{toxinidir}/doc/requirements.txt
whitelist_externals = rm whitelist_externals = rm
commands = commands =
@ -96,7 +89,6 @@ commands =
sphinx-build -a -E -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html sphinx-build -a -E -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html
[testenv:lower-constraints] [testenv:lower-constraints]
basepython = python3
deps = deps =
-c{toxinidir}/lower-constraints.txt -c{toxinidir}/lower-constraints.txt
-r{toxinidir}/test-requirements.txt -r{toxinidir}/test-requirements.txt