summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2018-06-14 02:11:29 +0000
committerGerrit Code Review <review@openstack.org>2018-06-14 02:11:29 +0000
commita37b49fb4e0535f02a1f4437c1595f468291be2b (patch)
treef6df9498ab96d1e5bb0f8f0da14143f5ff8ee74a
parent1dfb76f6ecef426dab1ccaee211457b02e576435 (diff)
parent850e8741a3683b0b6cbcdca3f5a2cc437e04aca8 (diff)
Merge "Add python3 django 1.11 job instead of django 2.0 job"
-rw-r--r--.zuul.yaml8
-rw-r--r--tox.ini56
2 files changed, 6 insertions, 58 deletions
diff --git a/.zuul.yaml b/.zuul.yaml
index 58d8a82..bc79248 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -2,12 +2,8 @@
2 check: 2 check:
3 jobs: 3 jobs:
4 - openstack-tox-lower-constraints 4 - openstack-tox-lower-constraints
5 - horizon-openstack-tox-py35dj20: 5 - horizon-openstack-tox-python3-django111
6 required-projects:
7 openstack/horizon
8 gate: 6 gate:
9 jobs: 7 jobs:
10 - openstack-tox-lower-constraints 8 - openstack-tox-lower-constraints
11 - horizon-openstack-tox-py35dj20: 9 - horizon-openstack-tox-python3-django111
12 required-projects:
13 openstack/horizon
diff --git a/tox.ini b/tox.ini
index 48589bf..62f455a 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
1[tox] 1[tox]
2envlist = py27dj18,py27dj19,py27dj110,py27dj111,py35dj18,py35dj19,py35dj110,py35dj111,pep8,releasenotes 2envlist = py27,py35,py3-dj111,pep8,releasenotes
3minversion = 2.3.2 3minversion = 2.3.2
4skipsdist = True 4skipsdist = True
5 5
@@ -36,62 +36,14 @@ commands =
36 coverage xml 36 coverage xml
37 coverage html 37 coverage html
38 38
39[testenv:py27dj18]
40basepython = python2.7
41commands =
42 pip install django>=1.8,<1.9
43 {[unit_tests]commands}
44
45[testenv:py27dj19]
46basepython = python2.7
47commands =
48 pip install django>=1.9,<1.10
49 {[unit_tests]commands}
50
51[testenv:py27dj110]
52basepython = python2.7
53commands =
54 pip install django>=1.10,<1.11
55 {[unit_tests]commands}
56
57[testenv:py27dj111]
58basepython = python2.7
59commands =
60 pip install django>=1.11,<2.0
61 {[unit_tests]commands}
62
63[testenv:py35] 39[testenv:py35]
64basepython = python3.5 40basepython = python3.5
65commands = {[unit_tests]commands} 41commands = {[unit_tests]commands}
66 42
67[testenv:py35dj18] 43[testenv:py3-dj111]
68basepython = python3.5 44basepython = python3
69commands =
70 pip install django>=1.8,<1.9
71 {[unit_tests]commands}
72
73[testenv:py35dj19]
74basepython = python3.5
75commands =
76 pip install django>=1.9,<1.10
77 {[unit_tests]commands}
78
79[testenv:py35dj110]
80basepython = python3.5
81commands =
82 pip install django>=1.10,<1.11
83 {[unit_tests]commands}
84
85[testenv:py35dj111]
86basepython = python3.5
87commands =
88 pip install django>=1.11,<2.0
89 {[unit_tests]commands}
90
91[testenv:py35dj20]
92basepython = python3.5
93commands = 45commands =
94 pip install django>=2.0,<2.1 46 pip install django>=1.11,<2
95 {[unit_tests]commands} 47 {[unit_tests]commands}
96 48
97[testenv:docs] 49[testenv:docs]