diff --git a/.zuul.yaml b/.zuul.yaml index d5b4315..fa02cf4 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -21,6 +21,8 @@ cloudkitty: https://opendev.org/openstack/cloudkitty devstack_localrc: CLOUDKITTY_FETCHER: keystone + DEVSTACK_GATE_USE_PYTHON3: "True" + USE_PYTHON3: True devstack_services: ck-api: true horizon: false @@ -39,34 +41,11 @@ vars: tox_envlist: functional-v2 -- job: - name: cloudkittyclient-devstack-functional-base-py3 - parent: cloudkittyclient-devstack-functional-base - description: | - Job for cloudkittyclient functional tests, ran in python3. - vars: - devstack_localrc: - DEVSTACK_GATE_USE_PYTHON3: "True" - USE_PYTHON3: "True" - -- job: - name: cloudkittyclient-devstack-functional-v1-client-py3 - parent: cloudkittyclient-devstack-functional-base-py3 - vars: - tox_envlist: functional-v1 - -- job: - name: cloudkittyclient-devstack-functional-v2-client-py3 - parent: cloudkittyclient-devstack-functional-base-py3 - vars: - tox_envlist: functional-v2 - - project: templates: - openstack-lower-constraints-jobs - check-requirements - openstack-cover-jobs - - openstack-python-jobs - openstack-python3-ussuri-jobs - openstackclient-plugin-jobs - publish-openstack-docs-pti @@ -76,17 +55,9 @@ voting: true - cloudkittyclient-devstack-functional-v2-client: voting: true - - cloudkittyclient-devstack-functional-v1-client-py3: - voting: true - - cloudkittyclient-devstack-functional-v2-client-py3: - voting: true gate: jobs: - cloudkittyclient-devstack-functional-v1-client: voting: true - cloudkittyclient-devstack-functional-v2-client: voting: true - - cloudkittyclient-devstack-functional-v1-client-py3: - voting: true - - cloudkittyclient-devstack-functional-v2-client-py3: - voting: true diff --git a/doc/requirements.txt b/doc/requirements.txt index 535c7ed..77fff43 100644 --- a/doc/requirements.txt +++ b/doc/requirements.txt @@ -3,8 +3,7 @@ # process, which may cause wedges in the gate later. openstackdocstheme>=1.30.0 # Apache-2.0 -sphinx>=1.8.0,<2.0.0;python_version=='2.7' # BSD -sphinx>=1.8.0,!=2.1.0;python_version>='3.4' # BSD +sphinx>=1.8.0,!=2.1.0 # BSD sphinxcontrib-svg2pdfconverter>=0.1.0 # BSD reno>=2.5.0 # Apache-2.0 cliff>=2.11.0 # Apache-2.0 diff --git a/releasenotes/notes/drop-py27-27ea9fb3e40d4987.yaml b/releasenotes/notes/drop-py27-27ea9fb3e40d4987.yaml new file mode 100644 index 0000000..9c1cf8b --- /dev/null +++ b/releasenotes/notes/drop-py27-27ea9fb3e40d4987.yaml @@ -0,0 +1,7 @@ +--- +upgrade: + - | + Python 2.7 support has been dropped. The last release of + ``cloudkittyclient`` to support python 2.7 is OpenStack Train (3.1.0). + The minimum version of Python now supported by ``cloudkittyclient`` + is Python 3.6. diff --git a/setup.cfg b/setup.cfg index eaf878f..84aedd6 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/python-cloudkittyclient/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 a665605..995395d 100644 --- a/tox.ini +++ b/tox.ini @@ -1,9 +1,11 @@ [tox] -minversion = 2.0 -envlist = py27,py36,py37,pypy,pep8 +minversion = 3.1.1 +envlist = py36,py37,pep8 skipsdist = True +ignore_basepython_conflict = True [testenv] +basepython = python3 usedevelop = True install_command = pip install -U {opts} {packages} setenv = @@ -13,7 +15,6 @@ deps = -r{toxinidir}/requirements.txt commands = stestr run {posargs} [testenv:cover] -basepython = python3 setenv = VIRTUAL_ENV={envdir} PYTHON=coverage run --source cloudkittyclient --parallel-mode @@ -25,7 +26,6 @@ commands = coverage report [testenv:debug] -basepython = python3 commands = oslo_debug_helper -t cloudkittyclient/tests {posargs} [testenv:functional-v1] @@ -39,20 +39,16 @@ setenv = OS_RATING_API_VERSION=2 commands = stestr run --concurrency=1 --test-path ./cloudkittyclient/tests/functional/v2 [testenv:pep8] -basepython = python3 commands = flake8 [testenv:venv] -basepython = python3 commands = {posargs} [testenv:docs] -basepython = python3 deps = -r{toxinidir}/doc/requirements.txt commands = sphinx-build --keep-going -b html doc/source doc/build/html [testenv:pdf-docs] -basepython = python3 envdir = {toxworkdir}/docs deps = {[testenv:docs]deps} whitelist_externals = @@ -73,7 +69,6 @@ exclude=.venv,.git,.tox,dist,doc,*lib/python*,*egg,build,releasenotes import_exceptions = cloudkittyclient.i18n [testenv:releasenotes] -basepython = python3 deps = -c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/master/upper-constraints.txt} -r{toxinidir}/doc/requirements.txt @@ -81,7 +76,6 @@ commands = sphinx-build -a -E -W -d releasenotes/build/doctrees --keep-going -b html releasenotes/source releasenotes/build/html [testenv:lower-constraints] -basepython = python3 deps = -c{toxinidir}/lower-constraints.txt -r{toxinidir}/test-requirements.txt