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 and lower-constraints.txt are updated accordingly. for more info. please refer [1]. This patch also drop django-babel as horizon already swiched from django-babel to enmerkar. congress-dashboard requirement.txt needs to sync the change to fix gate failure. enmerkar, a successor of django-babel will be installed via horizon, so we don't need to have it in requirements.txt explicitly. Depends-On: https://review.opendev.org/#/c/700733/ [1] https://etherpad.openstack.org/p/Enable_Django22_support_in_Horizon_Plugin Change-Id: I105be486e98b856839214e72a363674cd5c23b9f
This commit is contained in:
parent
44bd4e5deb
commit
15afe9c6a5
@ -13,10 +13,9 @@ debtcollector==1.19.0
|
|||||||
decorator==4.2.1
|
decorator==4.2.1
|
||||||
deprecation==2.0
|
deprecation==2.0
|
||||||
django-appconf==1.0.2
|
django-appconf==1.0.2
|
||||||
django-babel==0.6.2
|
|
||||||
django-compressor==2.0
|
django-compressor==2.0
|
||||||
django-pyscss==2.0.2
|
django-pyscss==2.0.2
|
||||||
Django==1.11
|
Django==2.2
|
||||||
docutils==0.11
|
docutils==0.11
|
||||||
dogpile.cache==0.6.5
|
dogpile.cache==0.6.5
|
||||||
dulwich==0.19.0
|
dulwich==0.19.0
|
||||||
@ -26,6 +25,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==17.1.0
|
||||||
idna==2.6
|
idna==2.6
|
||||||
iso8601==0.1.12
|
iso8601==0.1.12
|
||||||
jmespath==0.9.3
|
jmespath==0.9.3
|
||||||
@ -56,7 +56,7 @@ oslo.policy==1.34.0
|
|||||||
oslo.serialization==2.25.0
|
oslo.serialization==2.25.0
|
||||||
oslo.utils==3.36.0
|
oslo.utils==3.36.0
|
||||||
oslotest==3.2.0
|
oslotest==3.2.0
|
||||||
osprofiler==2.0.0
|
osprofiler==2.3.0
|
||||||
packaging==17.1
|
packaging==17.1
|
||||||
pbr==2.0.0
|
pbr==2.0.0
|
||||||
pep8==1.5.7
|
pep8==1.5.7
|
||||||
@ -73,7 +73,7 @@ pyScss==1.3.4
|
|||||||
python-congressclient==1.9.0
|
python-congressclient==1.9.0
|
||||||
python-dateutil==2.7.0
|
python-dateutil==2.7.0
|
||||||
python-glanceclient==2.9.1
|
python-glanceclient==2.9.1
|
||||||
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==10.1.0
|
python-novaclient==10.1.0
|
||||||
|
@ -8,8 +8,7 @@
|
|||||||
#
|
#
|
||||||
# PBR should always appear first
|
# PBR should always appear first
|
||||||
pbr!=2.1.0,>=2.0.0 # Apache-2.0
|
pbr!=2.1.0,>=2.0.0 # Apache-2.0
|
||||||
Django>=1.11;python_version>='3.0' # BSD
|
|
||||||
django-babel>=0.6.2 # BSD
|
|
||||||
django-compressor>=2.0 # MIT
|
django-compressor>=2.0 # MIT
|
||||||
keystoneauth1>=3.4.0 # Apache-2.0
|
keystoneauth1>=3.4.0 # Apache-2.0
|
||||||
python-congressclient<2000,>=1.9.0 # Apache-2.0
|
python-congressclient<2000,>=1.9.0 # Apache-2.0
|
||||||
|
horizon>=17.1.0 # Apache-2.0
|
||||||
|
@ -12,6 +12,3 @@ hacking>=1.1.0,<1.2.0 # Apache-2.0
|
|||||||
#Testing Requirements
|
#Testing Requirements
|
||||||
coverage!=4.4,>=4.0 # Apache-2.0
|
coverage!=4.4,>=4.0 # Apache-2.0
|
||||||
oslotest>=3.2.0 # Apache-2.0
|
oslotest>=3.2.0 # Apache-2.0
|
||||||
|
|
||||||
# Include horizon as test requirement
|
|
||||||
http://tarballs.openstack.org/horizon/horizon-master.tar.gz#egg=horizon
|
|
||||||
|
4
tox.ini
4
tox.ini
@ -1,5 +1,5 @@
|
|||||||
[tox]
|
[tox]
|
||||||
envlist = py37,py36,py3-{dj111,dj22},pep8
|
envlist = py37,py36,pep8
|
||||||
minversion = 2.0
|
minversion = 2.0
|
||||||
skipsdist = True
|
skipsdist = True
|
||||||
|
|
||||||
@ -11,8 +11,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=congress_dashboard.test.settings
|
python manage.py test {posargs} --settings=congress_dashboard.test.settings
|
||||||
|
|
||||||
[testenv:pep8]
|
[testenv:pep8]
|
||||||
|
Loading…
x
Reference in New Issue
Block a user