Browse Source

Merge "Add python3 django 1.11 job instead of django 2.0 job"

tags/1.3.0
Zuul 1 year ago
parent
commit
a37b49fb4e
2 changed files with 6 additions and 58 deletions
  1. 2
    6
      .zuul.yaml
  2. 4
    52
      tox.ini

+ 2
- 6
.zuul.yaml View File

@@ -2,12 +2,8 @@
2 2
     check:
3 3
       jobs:
4 4
         - openstack-tox-lower-constraints
5
-        - horizon-openstack-tox-py35dj20:
6
-            required-projects:
7
-              openstack/horizon
5
+        - horizon-openstack-tox-python3-django111
8 6
     gate:
9 7
       jobs:
10 8
         - openstack-tox-lower-constraints
11
-        - horizon-openstack-tox-py35dj20:
12
-            required-projects:
13
-              openstack/horizon
9
+        - horizon-openstack-tox-python3-django111

+ 4
- 52
tox.ini View File

@@ -1,5 +1,5 @@
1 1
 [tox]
2
-envlist = py27dj18,py27dj19,py27dj110,py27dj111,py35dj18,py35dj19,py35dj110,py35dj111,pep8,releasenotes
2
+envlist = py27,py35,py3-dj111,pep8,releasenotes
3 3
 minversion = 2.3.2
4 4
 skipsdist = True
5 5
 
@@ -36,62 +36,14 @@ commands =
36 36
   coverage xml
37 37
   coverage html
38 38
 
39
-[testenv:py27dj18]
40
-basepython = python2.7
41
-commands =
42
-  pip install django>=1.8,<1.9
43
-  {[unit_tests]commands}
44
-
45
-[testenv:py27dj19]
46
-basepython = python2.7
47
-commands =
48
-  pip install django>=1.9,<1.10
49
-  {[unit_tests]commands}
50
-
51
-[testenv:py27dj110]
52
-basepython = python2.7
53
-commands =
54
-  pip install django>=1.10,<1.11
55
-  {[unit_tests]commands}
56
-
57
-[testenv:py27dj111]
58
-basepython = python2.7
59
-commands =
60
-  pip install django>=1.11,<2.0
61
-  {[unit_tests]commands}
62
-
63 39
 [testenv:py35]
64 40
 basepython = python3.5
65 41
 commands = {[unit_tests]commands}
66 42
 
67
-[testenv:py35dj18]
68
-basepython = python3.5
69
-commands =
70
-  pip install django>=1.8,<1.9
71
-  {[unit_tests]commands}
72
-
73
-[testenv:py35dj19]
74
-basepython = python3.5
75
-commands =
76
-  pip install django>=1.9,<1.10
77
-  {[unit_tests]commands}
78
-
79
-[testenv:py35dj110]
80
-basepython = python3.5
81
-commands =
82
-  pip install django>=1.10,<1.11
83
-  {[unit_tests]commands}
84
-
85
-[testenv:py35dj111]
86
-basepython = python3.5
87
-commands =
88
-  pip install django>=1.11,<2.0
89
-  {[unit_tests]commands}
90
-
91
-[testenv:py35dj20]
92
-basepython = python3.5
43
+[testenv:py3-dj111]
44
+basepython = python3
93 45
 commands =
94
-  pip install django>=2.0,<2.1
46
+  pip install django>=1.11,<2
95 47
   {[unit_tests]commands}
96 48
 
97 49
 [testenv:docs]

Loading…
Cancel
Save