Merge "Drop python 2.7 support and testing"

This commit is contained in:
Zuul 2019-12-28 17:09:56 +00:00 committed by Gerrit Code Review
commit 50c31953a8
4 changed files with 11 additions and 16 deletions

View File

@ -2,6 +2,5 @@
templates: templates:
- check-requirements - check-requirements
- horizon-non-primary-django-jobs - horizon-non-primary-django-jobs
- openstack-python-jobs-horizon
- openstack-python3-ussuri-jobs - openstack-python3-ussuri-jobs
- release-notes-jobs-python3 - release-notes-jobs-python3

View File

@ -0,0 +1,6 @@
---
upgrade:
- |
Python 2.7 support has been dropped. Last release of trove-dashboard
to support py2.7 is OpenStack Train. The minimum version of Python now
supported by trove-dashboard is Python 3.6.

View File

@ -13,8 +13,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

18
tox.ini
View File

@ -1,10 +1,12 @@
[tox] [tox]
minversion = 1.6 minversion = 3.1.1
envlist = py27,py37,py3-{dj111,dj22},pep8 envlist = py37,py3-{dj111,dj22},pep8
skipsdist = True skipsdist = True
ignore_basepython_conflict = True
[testenv] [testenv]
usedevelop = True usedevelop = True
basepython = python3
install_command = pip install {opts} {packages} install_command = pip install {opts} {packages}
setenv = setenv =
VIRTUAL_ENV={envdir} VIRTUAL_ENV={envdir}
@ -16,35 +18,25 @@ commands =
dj22: pip install django>=2.2,<2.3 dj22: pip install django>=2.2,<2.3
/bin/bash run_tests.sh -N --no-pep8 {posargs} /bin/bash run_tests.sh -N --no-pep8 {posargs}
[testenv:py27]
setenv = DJANGO_SETTINGS_MODULE=trove_dashboard.test.settings
[testenv:pep8] [testenv:pep8]
basepython = python3
commands = flake8 commands = flake8
[testenv:venv] [testenv:venv]
basepython = python3
commands = {posargs} commands = {posargs}
[testenv:py27integration] [testenv:integration]
basepython = python2.7
commands = /bin/bash run_tests.sh -N --integration --selenium-headless {posargs} commands = /bin/bash run_tests.sh -N --integration --selenium-headless {posargs}
[testenv:cover] [testenv:cover]
basepython = python3
commands = python setup.py testr --coverage --testr-args={posargs} commands = python setup.py testr --coverage --testr-args={posargs}
[testenv:docs] [testenv:docs]
basepython = python3
commands = python setup.py build_sphinx commands = python setup.py build_sphinx
[testenv:debug] [testenv:debug]
basepython = python3
commands = oslo_debug_helper {posargs} commands = oslo_debug_helper {posargs}
[testenv:releasenotes] [testenv:releasenotes]
basepython = python3
commands = sphinx-build -a -E -W -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html commands = sphinx-build -a -E -W -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html
[flake8] [flake8]