Skip to content

Commit cade8de

Browse files
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. For more info. please refer [1], [2]. [1] https://review.opendev.org/#/c/700733/ [2] https://etherpad.openstack.org/p/Enable_Django22_support_in_Horizon_Plugin Change-Id: I6f393b85306e514f9e00567dfd2b9940d6f26253
1 parent 5493889 commit cade8de

File tree

3 files changed

+2
-7
lines changed

3 files changed

+2
-7
lines changed

requirements.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,6 @@
55
pbr!= 2.1.0,>=2.0.0
66
Babel>=1.3
77
python-cloudkittyclient>=0.5.0
8+
horizon>=17.1.0 # Apache-2.0
89
XStatic-D3>=3.5.17.0
910
XStatic-Rickshaw>=1.5

test-requirements.txt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,6 @@
22
# of appearance. Changing the order has an impact on the overall integration
33
# process, which may cause wedges in the gate later.
44
hacking>=1.1.0,<1.2.0 # Apache-2.0
5-
6-
# Require Horizon
7-
-e git://github.com/openstack/horizon.git#egg=horizon
8-
95
coverage>=3.6
106
python-subunit>=0.0.18
117
oslotest>=1.10.0 # Apache-2.0

tox.ini

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[tox]
22
minversion = 2.0
3-
envlist = py36,py37,py3-{dj111,dj22},pypy,pep8
3+
envlist = py36,py37,pep8
44
skipsdist = True
55

66
[testenv]
@@ -12,8 +12,6 @@ setenv =
1212
deps = -r{toxinidir}/requirements.txt
1313
-r{toxinidir}/test-requirements.txt
1414
commands =
15-
dj111: pip install django>=1.11,<2
16-
dj22: pip install django>=2.2,<2.3
1715
stestr run --slowest {posargs}
1816

1917
[testenv:pep8]

0 commit comments

Comments
 (0)