openstack/heat-dashboard
Code Issues Proposed changes

Merge "Drop Django 1.11 support"

Browse Source
This commit is contained in:
Zuul 2020-01-21 08:01:26 +00:00 committed by Gerrit Code Review
commit 5326586380
3 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lower-constraints.txt
View File

@ -14,7 +14,7 @@ cryptography==2.1
debtcollector==1.2.0 debtcollector==1.2.0
decorator==3.4.0 decorator==3.4.0
deprecation==1.0 deprecation==1.0
Django==1.11 Django==2.2
django-appconf==1.0.2 django-appconf==1.0.2
django-babel==0.6.2 django-babel==0.6.2
django-compressor==2.0 django-compressor==2.0
@ -31,7 +31,7 @@ flake8-import-order==0.12
futurist==1.2.0 futurist==1.2.0
greenlet==0.4.10 greenlet==0.4.10
hacking==1.1.0 hacking==1.1.0
horizon==14.0.0.0b3 horizon==17.1.0
idna==2.6 idna==2.6
iso8601==0.1.11 iso8601==0.1.11
Jinja2==2.10 Jinja2==2.10
@ -66,7 +66,7 @@ oslo.policy==1.30.0
oslo.serialization==2.18.0 oslo.serialization==2.18.0
oslo.service==1.24.0 oslo.service==1.24.0
oslo.utils==3.33.0 oslo.utils==3.33.0
osprofiler==1.4.0 osprofiler==2.3.0
Paste==2.0.2 Paste==2.0.2
PasteDeploy==1.5.0 PasteDeploy==1.5.0
pbr==2.0.0 pbr==2.0.0
@ -85,11 +85,11 @@ pyOpenSSL==17.1.0
pyparsing==2.1.0 pyparsing==2.1.0
pyperclip==1.5.27 pyperclip==1.5.27
pyScss==1.3.4 pyScss==1.3.4
python-cinderclient==3.3.0 python-cinderclient==5.0.0
python-dateutil==2.5.3 python-dateutil==2.5.3
python-glanceclient==2.8.0 python-glanceclient==2.8.0
python-heatclient==1.10.0 python-heatclient==1.10.0
python-keystoneclient==3.15.0 python-keystoneclient==3.22.0
python-mimeparse==1.6.0 python-mimeparse==1.6.0
python-neutronclient==6.7.0 python-neutronclient==6.7.0
python-novaclient==9.1.0 python-novaclient==9.1.0

2
requirements.txt
View File

@ -12,7 +12,7 @@ python-heatclient>=1.10.0 # Apache-2.0
# This will be installed from git in OpenStack CI if the job setting # This will be installed from git in OpenStack CI if the job setting
# required-projects for horizon: # required-projects for horizon:
horizon>=14.0.0.0b3 # Apache-2.0 horizon>=17.1.0 # Apache-2.0
xstatic-angular-uuid>=0.0.4.0 # MIT xstatic-angular-uuid>=0.0.4.0 # MIT
xstatic-angular-vis>=4.16.0.0 # MIT xstatic-angular-vis>=4.16.0.0 # MIT

4
tox.ini
View File

@ -1,5 +1,5 @@
[tox] [tox]
envlist = py36,py37,py3-{dj111,dj22},pep8,releasenotes envlist = py36,py37,pep8,releasenotes
minversion = 3.1.1 minversion = 3.1.1
skipsdist = True skipsdist = True
ignore_basepython_conflict = True ignore_basepython_conflict = True
@ -19,8 +19,6 @@ deps = -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/
-r{toxinidir}/requirements.txt -r{toxinidir}/requirements.txt
-r{toxinidir}/test-requirements.txt -r{toxinidir}/test-requirements.txt
commands = commands =
dj111: pip install django>=1.11,<2
dj22: pip install django>=2.2,<2.3
python manage.py test heat_dashboard.test --settings=heat_dashboard.test.settings --exclude-tag integration python manage.py test heat_dashboard.test --settings=heat_dashboard.test.settings --exclude-tag integration
[testenv:integration] [testenv:integration]