diff --git a/.zuul.yaml b/.zuul.yaml index 472a386..6b336cf 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -9,9 +9,8 @@ - project: templates: - nodejs8-jobs - - openstack-python-jobs - publish-openstack-docs-pti - - openstack-python3-train-jobs + - openstack-python3-ussuri-jobs periodic: jobs: - periodic-package-stackviz-element diff --git a/doc/requirements.txt b/doc/requirements.txt index af1aeb8..0e74ac4 100644 --- a/doc/requirements.txt +++ b/doc/requirements.txt @@ -3,5 +3,4 @@ # process, which may cause wedges in the gate later. openstackdocstheme>=1.18.1 # Apache-2.0 reno>=2.5.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,>=1.6.2;python_version>='3.4' # BSD +sphinx!=1.6.6,!=1.6.7,>=1.6.2 # BSD diff --git a/releasenotes/notes/drop-py-2-7-c598a08abac28b1d.yaml b/releasenotes/notes/drop-py-2-7-c598a08abac28b1d.yaml new file mode 100644 index 0000000..2b1c82e --- /dev/null +++ b/releasenotes/notes/drop-py-2-7-c598a08abac28b1d.yaml @@ -0,0 +1,5 @@ +--- +upgrade: + - | + Python 2.7 support has been dropped. The minimum version + of Python now supported by stackviz is Python 3.6. diff --git a/setup.cfg b/setup.cfg index 6e7a344..a5479a8 100644 --- a/setup.cfg +++ b/setup.cfg @@ -6,6 +6,7 @@ description-file = author = OpenStack author-email = openstack-discuss@lists.openstack.org home-page = https://docs.openstack.org/stackviz/latest/ +python-requires = >=3.6 classifier = Environment :: OpenStack Intended Audience :: Information Technology @@ -13,8 +14,6 @@ classifier = License :: OSI Approved :: Apache Software License Operating System :: POSIX :: Linux Programming Language :: Python - Programming Language :: Python :: 2 - Programming Language :: Python :: 2.7 Programming Language :: Python :: 3 Programming Language :: Python :: 3.6 Programming Language :: Python :: 3.7 diff --git a/tox.ini b/tox.ini index 5438b2a..854efe5 100644 --- a/tox.ini +++ b/tox.ini @@ -1,10 +1,12 @@ [tox] -minversion = 2.0 -envlist = py36,py37,py27,pypy,pep8 +minversion = 3.1.1 +envlist = py36,py37,pypy,pep8 skipsdist = True +ignore_basepython_conflict = True [testenv] +basepython = python3 setenv = VIRTUAL_ENV={envdir} OS_LOG_CAPTURE=1 @@ -21,19 +23,15 @@ commands = stestr --test-path ./stackviz/tests run {posargs} [testenv:pep8] -basepython = python3 commands = flake8 [testenv:venv] -basepython = python3 commands = {posargs} [testenv:cover] -basepython = python3 commands = python setup.py test --coverage --testr-args='{posargs}' [testenv:docs] -basepython = python3 deps = -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} -r{toxinidir}/requirements.txt @@ -44,7 +42,6 @@ commands = whitelist_externals = rm [testenv:debug] -basepython = python3 commands = oslo_debug_helper {posargs} [flake8]