Drop py27/py35
Drop py27 and py35 testing, for Ussuri those are dropped already. Update for current django 22 testing. Remove py27 cruft. Change-Id: Icde1a7be481a56ca2d0c64a651ad7d2a7f895441
This commit is contained in:
parent
f655ea66c8
commit
32ec8b47b1
@ -7,6 +7,6 @@
|
|||||||
- hosts: all
|
- hosts: all
|
||||||
roles:
|
roles:
|
||||||
- role: fetch-tox-output
|
- role: fetch-tox-output
|
||||||
tox_envlist: pep8,py27-local,py35-local,py35dj20-local,eslint,karma,karma-local,docs-local,releasenotes
|
tox_envlist: pep8,py36-local,py36dj22-local,eslint,karma,karma-local,docs-local,releasenotes
|
||||||
zuul_work_dir: "{{ zuul.project.src_dir }}/.tox/checkbuild/cafe-ui"
|
zuul_work_dir: "{{ zuul.project.src_dir }}/.tox/checkbuild/cafe-ui"
|
||||||
|
|
||||||
|
@ -6,6 +6,7 @@ description-file =
|
|||||||
author = OpenStack
|
author = OpenStack
|
||||||
author-email = openstack-discuss@lists.openstack.org
|
author-email = openstack-discuss@lists.openstack.org
|
||||||
home-page = http://www.openstack.org/
|
home-page = http://www.openstack.org/
|
||||||
|
python-requires = >=3.6
|
||||||
classifier =
|
classifier =
|
||||||
Environment :: OpenStack
|
Environment :: OpenStack
|
||||||
Intended Audience :: Information Technology
|
Intended Audience :: Information Technology
|
||||||
@ -13,9 +14,9 @@ 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 :: Only
|
||||||
|
Programming Language :: Python :: Implementation :: CPython
|
||||||
Programming Language :: Python :: 3.6
|
Programming Language :: Python :: 3.6
|
||||||
|
|
||||||
[files]
|
[files]
|
||||||
|
@ -11,17 +11,8 @@
|
|||||||
# See the License for the specific language governing permissions and
|
# See the License for the specific language governing permissions and
|
||||||
# limitations under the License.
|
# limitations under the License.
|
||||||
|
|
||||||
# THIS FILE IS MANAGED BY THE GLOBAL REQUIREMENTS REPO - DO NOT EDIT
|
|
||||||
import setuptools
|
import setuptools
|
||||||
|
|
||||||
# In python < 2.7.4, a lazy loading of package `pbr` will break
|
|
||||||
# setuptools if some other modules registered functions in `atexit`.
|
|
||||||
# solution from: http://bugs.python.org/issue15881#msg170215
|
|
||||||
try:
|
|
||||||
import multiprocessing # noqa
|
|
||||||
except ImportError:
|
|
||||||
pass
|
|
||||||
|
|
||||||
setuptools.setup(
|
setuptools.setup(
|
||||||
setup_requires=['pbr>=2.0.0'],
|
setup_requires=['pbr>=2.0.0'],
|
||||||
pbr=True)
|
pbr=True)
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
[tox]
|
[tox]
|
||||||
envlist = pep8,py27-local,py36-local,py3-dj111-local,eslint,karma-local,docs-local,releasenotes
|
envlist = pep8,py36-local,py3-dj20-local,eslint,karma-local,docs-local,releasenotes
|
||||||
minversion = 2.3.2
|
minversion = 2.3.2
|
||||||
skipsdist = True
|
skipsdist = True
|
||||||
|
|
||||||
@ -45,32 +45,23 @@ commands =
|
|||||||
coverage xml --omit '.tox/cover/*' -o 'cover/coverage.xml'
|
coverage xml --omit '.tox/cover/*' -o 'cover/coverage.xml'
|
||||||
coverage html --omit '.tox/cover/*' -d 'cover/htmlcov'
|
coverage html --omit '.tox/cover/*' -d 'cover/htmlcov'
|
||||||
|
|
||||||
# NOTE(shu-mutow): On CI infra, horizon will be installed
|
|
||||||
# according to job setting. but on local, we need to install
|
|
||||||
# horizon from master branch.
|
|
||||||
[testenv:py27-local]
|
|
||||||
basepython = python2.7
|
|
||||||
commands =
|
|
||||||
{[testenv:hz-local]commands}
|
|
||||||
{[testenv]commands}
|
|
||||||
|
|
||||||
[testenv:py36-local]
|
[testenv:py36-local]
|
||||||
basepython = python3.6
|
basepython = python3.6
|
||||||
commands =
|
commands =
|
||||||
{[testenv:hz-local]commands}
|
{[testenv:hz-local]commands}
|
||||||
{[testenv]commands}
|
{[testenv]commands}
|
||||||
|
|
||||||
[testenv:py3-dj111]
|
[testenv:py3-dj22]
|
||||||
basepython = python3
|
basepython = python3
|
||||||
commands =
|
commands =
|
||||||
pip install django>=1.11,<2
|
pip install django>=2.2,<3
|
||||||
{[testenv]commands}
|
{[testenv]commands}
|
||||||
|
|
||||||
[testenv:py3-dj111-local]
|
[testenv:py3-dj22-local]
|
||||||
basepython = python3
|
basepython = python3
|
||||||
commands =
|
commands =
|
||||||
{[testenv:hz-local]commands}
|
{[testenv:hz-local]commands}
|
||||||
pip install django>=1.11,<2
|
pip install django>=2.2,<3
|
||||||
{[testenv]commands}
|
{[testenv]commands}
|
||||||
|
|
||||||
[testenv:eslint]
|
[testenv:eslint]
|
||||||
|
Loading…
x
Reference in New Issue
Block a user