Stop testing python 2

Since it's no longer supported past Train, let's stop
running the tests.

Co-authored-by: Ajay Kumar <ajay.k@india.nec.com>

Change-Id: If81d0a45c423c173aa3c40dd2cfce37462dbf900
This commit is contained in:
Brian Haley 2019-11-06 16:23:35 +08:00
parent fa68dd2c12
commit c9a1c39eee
5 changed files with 7 additions and 17 deletions

View File

@ -1,4 +1,3 @@
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;python_version>='3.4' # BSD sphinx!=1.6.6,!=1.6.7,!=2.1.0,>=1.6.2;python_version>='3.4' # BSD
openstackdocstheme>=1.20.0 # Apache-2.0 openstackdocstheme>=1.20.0 # Apache-2.0
sphinxcontrib-apidoc>=0.2.1 # BSD sphinxcontrib-apidoc>=0.2.1 # BSD

View File

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

View File

@ -16,8 +16,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
@ -26,9 +24,6 @@ classifier =
packages = packages =
octavia_lib octavia_lib
[wheel]
universal = 1
[compile_catalog] [compile_catalog]
directory = octavia_lib/locale directory = octavia_lib/locale
domain = octavia_lib domain = octavia_lib

12
tox.ini
View File

@ -1,9 +1,10 @@
[tox] [tox]
minversion = 2.5.0 minversion = 2.5.0
envlist = docs,py27,py37,pep8 envlist = docs,py37,pep8
skipsdist = True skipsdist = True
[testenv] [testenv]
basepython = python3
usedevelop = True usedevelop = True
install_command = pip install {opts} {packages} install_command = pip install {opts} {packages}
setenv = setenv =
@ -20,7 +21,6 @@ deps =
commands = stestr run {posargs} commands = stestr run {posargs}
[testenv:pep8] [testenv:pep8]
basepython = python3
commands = flake8 {posargs} commands = flake8 {posargs}
doc8 --ignore-path doc/source/contributor/modules \ doc8 --ignore-path doc/source/contributor/modules \
doc/source octavia_lib HACKING.rst README.rst doc/source octavia_lib HACKING.rst README.rst
@ -29,11 +29,9 @@ commands = flake8 {posargs}
{toxinidir}/tools/coding-checks.sh --pylint '{posargs}' {toxinidir}/tools/coding-checks.sh --pylint '{posargs}'
[testenv:venv] [testenv:venv]
basepython = python3
commands = {posargs} commands = {posargs}
[testenv:cover] [testenv:cover]
basepython = python3
setenv = setenv =
VIRTUAL_ENV={envdir} VIRTUAL_ENV={envdir}
PYTHON=coverage run --source octavia_lib --parallel-mode PYTHON=coverage run --source octavia_lib --parallel-mode
@ -45,7 +43,6 @@ commands =
coverage report --fail-under=95 --skip-covered coverage report --fail-under=95 --skip-covered
[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 =
@ -53,7 +50,6 @@ commands =
sphinx-build -W -b html doc/source doc/build/html sphinx-build -W -b html doc/source doc/build/html
[testenv:pdf-docs] [testenv:pdf-docs]
basepython = python3
deps = {[testenv:docs]deps} deps = {[testenv:docs]deps}
whitelist_externals = whitelist_externals =
make make
@ -64,13 +60,11 @@ commands =
make -C doc/build/pdf make -C doc/build/pdf
[testenv:releasenotes] [testenv:releasenotes]
basepython = python3
deps = {[testenv:docs]deps} deps = {[testenv:docs]deps}
commands = commands =
sphinx-build -a -E -W -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html sphinx-build -a -E -W -d releasenotes/build/doctrees -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]
@ -89,7 +83,6 @@ local-check-factory = octavia_lib.hacking.checks.factory
max-line-length = 79 max-line-length = 79
[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
@ -99,7 +92,6 @@ commands =
sh -c 'OS_TEST_PATH={toxinidir}/octavia_lib/tests/unit stestr run {posargs}' sh -c 'OS_TEST_PATH={toxinidir}/octavia_lib/tests/unit stestr run {posargs}'
[testenv:requirements] [testenv:requirements]
basepython = python3
deps = deps =
-egit+https://opendev.org/openstack/requirements#egg=openstack-requirements -egit+https://opendev.org/openstack/requirements#egg=openstack-requirements
whitelist_externals = sh whitelist_externals = sh

View File

@ -3,7 +3,6 @@
- check-requirements - check-requirements
- 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
- release-notes-jobs-python3 - release-notes-jobs-python3