diff --git a/.zuul.yaml b/.zuul.yaml index 29cc5df..7506adb 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -5,7 +5,6 @@ - horizon-nodejs10-jobs - openstack-cover-jobs-horizon - openstack-lower-constraints-jobs - - openstack-python-jobs-horizon - openstack-python3-ussuri-jobs-horizon - publish-openstack-docs-pti - release-notes-jobs-python3 diff --git a/karma.conf.js b/karma.conf.js index f437037..eb4eb88 100644 --- a/karma.conf.js +++ b/karma.conf.js @@ -20,7 +20,7 @@ var path = require('path'); module.exports = function (config) { // This tox venv is setup in the post-install npm step - var toxPath = '.tox/py27/lib/python2.7/site-packages/'; + var toxPath = '.tox/py36/lib/python3.6/site-packages/'; var xstaticPath = toxPath + 'xstatic/pkg/'; config.set({ diff --git a/manage.py b/manage.py index 3cb4f27..4de9337 100755 --- a/manage.py +++ b/manage.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # Copyright 2014 Hewlett-Packard Development Company, L.P. # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/package.json b/package.json index 6ee7760..90dd47d 100644 --- a/package.json +++ b/package.json @@ -16,7 +16,7 @@ "karma-ng-html2js-preprocessor": "1.0.0" }, "scripts": { - "postinstall": "if [ ! -d .venv ]; then tox -epy27 --notest; fi", + "postinstall": "if [ ! -d .venv ]; then tox -epy36 --notest; fi", "lint": "eslint --no-color designatedashboard/static", "lintq": "eslint --quiet designatedashboard/static", "test": "karma start karma.conf.js --single-run" diff --git a/releasenotes/notes/drop-py-2-7-ae8cade4a0ee1da8.yaml b/releasenotes/notes/drop-py-2-7-ae8cade4a0ee1da8.yaml new file mode 100644 index 0000000..bf21537 --- /dev/null +++ b/releasenotes/notes/drop-py-2-7-ae8cade4a0ee1da8.yaml @@ -0,0 +1,6 @@ +--- +upgrade: + - | + Python 2.7 support has been dropped. Last release of designate-dashboard + to support python 2.7 is OpenStack Train. The minimum version of Python now + supported by designate-dashboard is Python 3.6. diff --git a/setup.cfg b/setup.cfg index 576b326..cd3a5b0 100644 --- a/setup.cfg +++ b/setup.cfg @@ -13,8 +13,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/test-requirements.txt b/test-requirements.txt index f772b1f..aef19c9 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -10,7 +10,6 @@ pylint==1.4.5 # GPLv2 testrepository>=0.0.18 # Apache-2.0/BSD testtools>=2.2.0 # MIT unittest2>=1.1.0 # BSD -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 openstackdocstheme>=1.18.1 # Apache-2.0 reno>=2.5.0 # Apache-2.0 diff --git a/tox.ini b/tox.ini index 94e96ec..af0de76 100644 --- a/tox.ini +++ b/tox.ini @@ -1,9 +1,10 @@ [tox] minversion = 1.6 -envlist = py27,py37,py3-{dj111,dj22},pep8 +envlist = py37,py3-{dj111,dj22},pep8 skipsdist = True [testenv] +basepython = python3 usedevelop = True setenv = VIRTUAL_ENV={envdir} NOSE_WITH_OPENSTACK=1 @@ -26,15 +27,12 @@ commands = passenv = http_proxy HTTP_PROXY https_proxy HTTPS_PROXY no_proxy NO_PROXY [testenv:pep8] -basepython = python3 commands = flake8 [testenv:venv] -basepython = python3 commands = {posargs} [testenv:cover] -basepython = python3 commands = coverage erase coverage run {toxinidir}/manage.py test designatedashboard --settings=designatedashboard.tests.settings {posargs} @@ -42,12 +40,10 @@ commands = coverage html --include 'designatedashboard/*' -d cover [testenv:docs] -basepython = python3 deps = -r{toxinidir}/doc/requirements.txt commands = sphinx-build -W -b html -d doc/build/doctrees doc/source doc/build/html [testenv:pdf-docs] -basepython = python3 deps = -r{toxinidir}/doc/requirements.txt envdir = {toxworkdir}/docs whitelist_externals = @@ -67,11 +63,9 @@ builtins = _ exclude=.venv,.git,.tox,dist,doc,*openstack/common*,*lib/python*,*egg,build,releasenotes,node_modules [testenv:releasenotes] -basepython = python3 commands = sphinx-build -a -E -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html [testenv:lower-constraints] -basepython = python3 deps = -c{toxinidir}/lower-constraints.txt -r{toxinidir}/test-requirements.txt