diff --git a/.zuul.yaml b/.zuul.yaml index da33ec2..76f118c 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -3,6 +3,5 @@ - check-requirements - horizon-non-primary-django-jobs - openstack-lower-constraints-jobs - - openstack-python-jobs-horizon - openstack-python3-ussuri-jobs-horizon - openstack-python3-ussuri-jobs diff --git a/lower-constraints.txt b/lower-constraints.txt index bdd6e4c..9abe39f 100644 --- a/lower-constraints.txt +++ b/lower-constraints.txt @@ -100,7 +100,7 @@ semantic-version==2.6.0 simplejson==3.13.2 six==1.11.0 snowballstemmer==1.2.1 -Sphinx==1.6.5 +Sphinx==1.6.2 sphinxcontrib-httpdomain==1.6.1 sphinxcontrib-pecanwsme==0.8.0 sphinxcontrib-websupport==1.0.1 diff --git a/releasenotes/notes/drop-py-2-7-241c1a021379927d.yaml b/releasenotes/notes/drop-py-2-7-241c1a021379927d.yaml new file mode 100644 index 0000000..c2f9b4e --- /dev/null +++ b/releasenotes/notes/drop-py-2-7-241c1a021379927d.yaml @@ -0,0 +1,6 @@ +--- +upgrade: + - | + Python 2.7 support has been dropped. Last release of solum-dashboard + to support python 2.7 is OpenStack Train. The minimum version of Python now + supported by solum-dashboard is Python 3.6. diff --git a/requirements.txt b/requirements.txt index c778a81..815e252 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,7 +3,6 @@ # process, which may cause wedges in the gate later. pbr!=2.1.0,>=3.1.1 # Apache-2.0 # Horizon Core Requirements -Django<2,>=1.11;python_version<'3.0' # BSD Django<2.1,>=1.11;python_version>='3.0' # BSD django-compressor>=2.2 # MIT oslo.log>=3.37.0 # Apache-2.0 diff --git a/setup.cfg b/setup.cfg index 83e9e7d..cd41c74 100644 --- a/setup.cfg +++ b/setup.cfg @@ -5,8 +5,6 @@ description-file = README.rst license = Apache Software License classifier = 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 15aa291..cf52b87 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -13,7 +13,7 @@ stestr>=2.0.0 # Apache-2.0 testtools>=2.3.0 # MIT unittest2>=1.1.0 # BSD -sphinx!=1.6.6,!=1.6.7,>=1.6.5 # 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 sphinxcontrib-pecanwsme>=0.8.0 # Apache-2.0 sphinxcontrib-httpdomain>=1.6.1 # BSD diff --git a/tox.ini b/tox.ini index 84cc53d..d931378 100644 --- a/tox.ini +++ b/tox.ini @@ -1,9 +1,10 @@ [tox] minversion = 1.6 skipsdist = True -envlist = py27,py37,py3-{dj111,dj22},pep8 +envlist = py37,py3-{dj111,dj22},pep8 [testenv] +basepython = python3 usedevelop = True install_command = pip install {opts} {packages} setenv = @@ -21,7 +22,6 @@ commands = stestr slowest [testenv:cover] -basepython = python3 setenv = {[testenv]setenv} PYTHON=coverage run --source solumdashboard --parallel-mode @@ -32,11 +32,9 @@ commands = coverage xml -o cover/coverage.xml [testenv:pep8] -basepython = python3 commands = flake8 [testenv:venv] -basepython = python3 commands = {posargs} [flake8] @@ -45,11 +43,9 @@ builtins = _ exclude=.git,.tox,dist,doc,*lib/python*,*egg,tools,horizon,node_modules [testenv:docs] -basepython = python3 commands = python setup.py build_sphinx [testenv:lower-constraints] -basepython = python3 deps = -c{toxinidir}/lower-constraints.txt -r{toxinidir}/test-requirements.txt