openstack/vitrage-dashboard
Code Issues Proposed changes

Merge "Drop Django 1.11 support"

Browse Source
This commit is contained in:
Zuul 2020-01-07 15:09:20 +00:00 committed by Gerrit Code Review
commit c829088a91
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 # Horizon Core Requirements
django-compressor>=2.0 # MIT django-compressor>=2.0 # MIT
iso8601>=0.1.11 # 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>=1.5.8.0 # MIT License
XStatic-Angular-Bootstrap>=2.2.0.0 # MIT License XStatic-Angular-Bootstrap>=2.2.0.0 # MIT License
XStatic-Bootstrap-Datepicker>=1.3.1.0 # Apache 2.0 License XStatic-Bootstrap-Datepicker>=1.3.1.0 # Apache 2.0 License

5
tox.ini
View File

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