Skip to content

Commit be59ba5

Browse files
author
Hugo Osvaldo Barrera
committed
Run tests with newer Python versions
We also need different Ubuntu dists for different pythons on travis.
1 parent 6e59ee0 commit be59ba5

File tree

2 files changed

+57
-3
lines changed

2 files changed

+57
-3
lines changed

.travis.yml

Lines changed: 53 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
]
66
},
77
"cache": "pip",
8-
"dist": "trusty",
8+
"dist": "bionic",
99
"git": {
1010
"submodules": false
1111
},
@@ -26,10 +26,12 @@
2626
"python": "3.5"
2727
},
2828
{
29+
"dist": "trusty",
2930
"env": "BUILD=test-storage DAV_SERVER=radicale REQUIREMENTS=release ",
3031
"python": "3.5"
3132
},
3233
{
34+
"dist": "trusty",
3335
"env": "BUILD=test-storage DAV_SERVER=xandikos REQUIREMENTS=release ",
3436
"python": "3.5"
3537
},
@@ -38,10 +40,12 @@
3840
"python": "3.5"
3941
},
4042
{
43+
"dist": "trusty",
4144
"env": "BUILD=test-storage DAV_SERVER=radicale REQUIREMENTS=minimal ",
4245
"python": "3.5"
4346
},
4447
{
48+
"dist": "trusty",
4549
"env": "BUILD=test-storage DAV_SERVER=xandikos REQUIREMENTS=minimal ",
4650
"python": "3.5"
4751
},
@@ -74,6 +78,54 @@
7478
"env": "BUILD=test-storage DAV_SERVER=xandikos REQUIREMENTS=minimal ",
7579
"python": "3.6"
7680
},
81+
{
82+
"env": "BUILD=test REQUIREMENTS=release",
83+
"python": "3.7"
84+
},
85+
{
86+
"env": "BUILD=test-storage DAV_SERVER=radicale REQUIREMENTS=release ",
87+
"python": "3.7"
88+
},
89+
{
90+
"env": "BUILD=test-storage DAV_SERVER=xandikos REQUIREMENTS=release ",
91+
"python": "3.7"
92+
},
93+
{
94+
"env": "BUILD=test REQUIREMENTS=minimal",
95+
"python": "3.7"
96+
},
97+
{
98+
"env": "BUILD=test-storage DAV_SERVER=radicale REQUIREMENTS=minimal ",
99+
"python": "3.7"
100+
},
101+
{
102+
"env": "BUILD=test-storage DAV_SERVER=xandikos REQUIREMENTS=minimal ",
103+
"python": "3.7"
104+
},
105+
{
106+
"env": "BUILD=test REQUIREMENTS=release",
107+
"python": "3.8"
108+
},
109+
{
110+
"env": "BUILD=test-storage DAV_SERVER=radicale REQUIREMENTS=release ",
111+
"python": "3.8"
112+
},
113+
{
114+
"env": "BUILD=test-storage DAV_SERVER=xandikos REQUIREMENTS=release ",
115+
"python": "3.8"
116+
},
117+
{
118+
"env": "BUILD=test REQUIREMENTS=minimal",
119+
"python": "3.8"
120+
},
121+
{
122+
"env": "BUILD=test-storage DAV_SERVER=radicale REQUIREMENTS=minimal ",
123+
"python": "3.8"
124+
},
125+
{
126+
"env": "BUILD=test-storage DAV_SERVER=xandikos REQUIREMENTS=minimal ",
127+
"python": "3.8"
128+
},
77129
{
78130
"env": "BUILD=test ETESYNC_TESTS=true REQUIREMENTS=latest",
79131
"python": "3.6"

scripts/make_travisconf.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
import itertools
44
import json
55

6-
python_versions = ("3.5", "3.6")
6+
python_versions = ("3.5", "3.6", "3.7", "3.8")
77
latest_python = "3.6"
88

99
cfg = {}
1010

1111
cfg['sudo'] = True
12-
cfg['dist'] = 'trusty'
12+
cfg['dist'] = 'bionic'
1313
cfg['language'] = 'python'
1414
cfg['cache'] = 'pip'
1515

@@ -61,6 +61,8 @@
6161
f"DAV_SERVER={dav_server} "
6262
f"REQUIREMENTS={requirements} ")
6363
}
64+
if python == '3.5':
65+
job['dist'] = 'trusty'
6466

6567
build_prs = dav_server not in ("fastmail", "davical", "icloud")
6668
if not build_prs:

0 commit comments

Comments
 (0)