openstack
/
vitrage-dashboard
Code Issues Proposed changes

Drop Django 1.11 support 

Django 1.11 ends its extended support in April 2020 (which is before
Ussuri release), so horizon drops Django 1.11 support in Ussuri.

tox envs for non-primary Django versions are no longer needed in tox.ini
as testing environments for non-primary Django versions are setup in
the zuul jobs now.

horizon>=17.1.0 is required to use Django 2.2.
requirements.txt is updated accordingly.

Depends-On: https://review.opendev.org/#/c/700733/
Change-Id: I7dd429b23f2d28999dc30e13d3717d8087f202aa
This commit is contained in:
manchandavishal 2020-01-02 20:52:33 +00:00 committed by Eyal
parent 96f8abebcc
commit 938fa9aab4
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
requirements.txt
View File

@ -6,7 +6,7 @@ pbr!=2.1.0,>=2.0.0 # Apache-2.0
# Horizon Core Requirements
django-compressor>=2.0 # MIT
iso8601>=0.1.11 # MIT
horizon>=14.0.0.0b1 # Apache-2.0
horizon>=17.1.0 # Apache-2.0
XStatic-Angular>=1.5.8.0 # MIT License
XStatic-Angular-Bootstrap>=2.2.0.0 # MIT License
XStatic-Bootstrap-Datepicker>=1.3.1.0 # Apache 2.0 License

5
tox.ini
View File

@ -1,7 +1,8 @@
[tox]
minversion = 2.3.2
envlist = py37,py36,py3-{dj111,dj22},pep8,npm
envlist = py37,py36,pep8,npm
skipsdist = True
ignore_basepython_conflict = True
[testenv]
basepython = python3
@ -15,8 +16,6 @@ deps =
-r{toxinidir}/test-requirements.txt
-r{toxinidir}/requirements.txt
commands =
dj111: pip install django>=1.11,<2
dj22: pip install django>=2.2,<2.3
{envpython} {toxinidir}/manage.py test vitrage_dashboard {posargs} --exclude-tag integration {posargs}
[testenv:integration]