openstack/magnum-ui
Code Issues Proposed changes

Merge "Drop Django 1.11 support"

Browse Source
This commit is contained in:
Zuul 2020-01-14 02:02:54 +00:00 committed by Gerrit Code Review
commit 6e69d5552e
3 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lower-constraints.txt
View File

@ -14,7 +14,7 @@ cryptography==2.1.4
debtcollector==1.19.0 debtcollector==1.19.0
decorator==4.2.1 decorator==4.2.1
deprecation==2.0 deprecation==2.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
@ -28,7 +28,7 @@ fixtures==3.0.0
flake8==2.5.5 flake8==2.5.5
futurist==1.6.0 futurist==1.6.0
hacking==0.12.0 hacking==0.12.0
horizon==15.0.0.0b1 horizon==17.1.0
idna==2.6 idna==2.6
imagesize==1.0.0 imagesize==1.0.0
iso8601==0.1.12 iso8601==0.1.12
@ -76,11 +76,11 @@ pyOpenSSL==17.5.0
pyparsing==2.2.0 pyparsing==2.2.0
pyperclip==1.6.0 pyperclip==1.6.0
pyScss==1.3.4 pyScss==1.3.4
python-cinderclient==3.5.0 python-cinderclient==5.0.0
python-dateutil==2.7.0 python-dateutil==2.7.0
python-glanceclient==2.9.1 python-glanceclient==2.9.1
python-heatclient==1.18.0 python-heatclient==1.18.0
python-keystoneclient==3.15.0 python-keystoneclient==3.22.0
python-magnumclient==2.15.0 # Apache-2.0 python-magnumclient==2.15.0 # Apache-2.0
python-mimeparse==1.6.0 python-mimeparse==1.6.0
python-neutronclient==6.7.0 python-neutronclient==6.7.0

2
requirements.txt
View File

@ -11,4 +11,4 @@ pbr!=2.1.0,>=2.0.0 # Apache-2.0
python-magnumclient>=2.15.0 # Apache-2.0 python-magnumclient>=2.15.0 # Apache-2.0
python-heatclient>=1.18.0 python-heatclient>=1.18.0
horizon>=15.0.0.0b1 # Apache-2.0 horizon>=17.1.0 # Apache-2.0

4
tox.ini
View File

@ -1,5 +1,5 @@
[tox] [tox]
envlist = pep8,,py3-{dj111,dj22},eslint,karma-local,docs-local,releasenotes,lower-constraints-local envlist = pep8,eslint,karma-local,docs-local,releasenotes,lower-constraints-local
minversion = 2.3.2 minversion = 2.3.2
skipsdist = True skipsdist = True
@ -17,8 +17,6 @@ deps =
-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 {posargs} --settings=magnum_ui.test.settings python manage.py test {posargs} --settings=magnum_ui.test.settings
# For installation of horizon on local # For installation of horizon on local