Skip to content

Commit 8ceb7f4

Browse files
authored
Merge pull request #26 from charettes/python-3.6
Switch to Python 3.6
2 parents 022307d + e3e2402 commit 8ceb7f4

File tree

2 files changed

+12
-38
lines changed

2 files changed

+12
-38
lines changed

.env

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
PYTHON_VERSION=3.5
1+
PYTHON_VERSION=3.6
22
POSTGRES_VERSION=9.6
33
POSTGIS_VERSION=2.5
44
MYSQL_VERSION=8
55
MARIADB_VERSION=10.3
6-
PIP_CACHE_VOLUME=pip-cache
6+
PIP_CACHE_VOLUME=pip-cache

.travis.yml

Lines changed: 10 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -12,29 +12,21 @@ env:
1212
- COMPOSE_APP=docs
1313

1414
# Quick Runs. Lowest supported database and Python version.
15-
- COMPOSE_APP=sqlite PYTHON_VERSION=3.5
16-
- COMPOSE_APP=sqlite-gis PYTHON_VERSION=3.5
17-
- COMPOSE_APP=postgres PYTHON_VERSION=3.5 POSTGRES_VERSION=9.4
18-
- COMPOSE_APP=postgres-gis PYTHON_VERSION=3.5 POSTGRES_VERSION=9.4 POSTGIS_VERSION=2.4
19-
- COMPOSE_APP=mysql PYTHON_VERSION=3.5 MYSQL_VERSION=5.6
20-
- COMPOSE_APP=mysql-gis PYTHON_VERSION=3.5 MYSQL_VERSION=5.6
21-
- COMPOSE_APP=mariadb PYTHON_VERSION=3.5 MARIADB_VERSION=10.1
15+
- COMPOSE_APP=sqlite PYTHON_VERSION=3.6
16+
- COMPOSE_APP=sqlite-gis PYTHON_VERSION=3.6
17+
- COMPOSE_APP=postgres PYTHON_VERSION=3.6 POSTGRES_VERSION=9.4
18+
- COMPOSE_APP=postgres-gis PYTHON_VERSION=3.6 POSTGRES_VERSION=9.4 POSTGIS_VERSION=2.4
19+
- COMPOSE_APP=mysql PYTHON_VERSION=3.6 MYSQL_VERSION=5.6
20+
- COMPOSE_APP=mysql-gis PYTHON_VERSION=3.6 MYSQL_VERSION=5.6
21+
- COMPOSE_APP=mariadb PYTHON_VERSION=3.6 MARIADB_VERSION=10.1
2222

2323
# Sqlite
24-
- COMPOSE_APP=sqlite PYTHON_VERSION=3.6
2524
- COMPOSE_APP=sqlite PYTHON_VERSION=3.7
2625

2726
# Sqlite gis:
28-
- COMPOSE_APP=sqlite-gis PYTHON_VERSION=3.6
2927
- COMPOSE_APP=sqlite-gis PYTHON_VERSION=3.7
3028

3129
# Postgres:
32-
- COMPOSE_APP=postgres PYTHON_VERSION=3.5 POSTGRES_VERSION=9.5
33-
- COMPOSE_APP=postgres PYTHON_VERSION=3.5 POSTGRES_VERSION=9.6
34-
- COMPOSE_APP=postgres PYTHON_VERSION=3.5 POSTGRES_VERSION=10
35-
- COMPOSE_APP=postgres PYTHON_VERSION=3.5 POSTGRES_VERSION=11
36-
37-
- COMPOSE_APP=postgres PYTHON_VERSION=3.6 POSTGRES_VERSION=9.4
3830
- COMPOSE_APP=postgres PYTHON_VERSION=3.6 POSTGRES_VERSION=9.5
3931
- COMPOSE_APP=postgres PYTHON_VERSION=3.6 POSTGRES_VERSION=9.6
4032
- COMPOSE_APP=postgres PYTHON_VERSION=3.6 POSTGRES_VERSION=10
@@ -47,12 +39,6 @@ env:
4739
- COMPOSE_APP=postgres PYTHON_VERSION=3.7 POSTGRES_VERSION=11
4840

4941
# Postgres gis:
50-
- COMPOSE_APP=postgres-gis PYTHON_VERSION=3.5 POSTGRES_VERSION=9.5 POSTGIS_VERSION=2.4
51-
- COMPOSE_APP=postgres-gis PYTHON_VERSION=3.5 POSTGRES_VERSION=9.6 POSTGIS_VERSION=2.4
52-
- COMPOSE_APP=postgres-gis PYTHON_VERSION=3.5 POSTGRES_VERSION=10 POSTGIS_VERSION=2.4
53-
- COMPOSE_APP=postgres-gis PYTHON_VERSION=3.5 POSTGRES_VERSION=11 POSTGIS_VERSION=2.5
54-
55-
- COMPOSE_APP=postgres-gis PYTHON_VERSION=3.6 POSTGRES_VERSION=9.4 POSTGIS_VERSION=2.4
5642
- COMPOSE_APP=postgres-gis PYTHON_VERSION=3.6 POSTGRES_VERSION=9.5 POSTGIS_VERSION=2.4
5743
- COMPOSE_APP=postgres-gis PYTHON_VERSION=3.6 POSTGRES_VERSION=9.6 POSTGIS_VERSION=2.4
5844
- COMPOSE_APP=postgres-gis PYTHON_VERSION=3.6 POSTGRES_VERSION=10 POSTGIS_VERSION=2.4
@@ -65,10 +51,6 @@ env:
6551
- COMPOSE_APP=postgres-gis PYTHON_VERSION=3.7 POSTGRES_VERSION=11 POSTGIS_VERSION=2.5
6652

6753
# MySQL:
68-
- COMPOSE_APP=mysql PYTHON_VERSION=3.5 MYSQL_VERSION=5.7
69-
- COMPOSE_APP=mysql PYTHON_VERSION=3.5 MYSQL_VERSION=8.0
70-
71-
- COMPOSE_APP=mysql PYTHON_VERSION=3.6 MYSQL_VERSION=5.6
7254
- COMPOSE_APP=mysql PYTHON_VERSION=3.6 MYSQL_VERSION=5.7
7355
- COMPOSE_APP=mysql PYTHON_VERSION=3.6 MYSQL_VERSION=8.0
7456

@@ -77,10 +59,6 @@ env:
7759
- COMPOSE_APP=mysql PYTHON_VERSION=3.7 MYSQL_VERSION=8.0
7860

7961
# MySQL gis:
80-
- COMPOSE_APP=mysql-gis PYTHON_VERSION=3.5 MYSQL_VERSION=5.7
81-
- COMPOSE_APP=mysql-gis PYTHON_VERSION=3.5 MYSQL_VERSION=8.0
82-
83-
- COMPOSE_APP=mysql-gis PYTHON_VERSION=3.6 MYSQL_VERSION=5.6
8462
- COMPOSE_APP=mysql-gis PYTHON_VERSION=3.6 MYSQL_VERSION=5.7
8563
- COMPOSE_APP=mysql-gis PYTHON_VERSION=3.6 MYSQL_VERSION=8.0
8664

@@ -89,10 +67,6 @@ env:
8967
- COMPOSE_APP=mysql-gis PYTHON_VERSION=3.7 MYSQL_VERSION=8.0
9068

9169
# MariaDB:
92-
- COMPOSE_APP=mariadb PYTHON_VERSION=3.5 MARIADB_VERSION=10.2
93-
- COMPOSE_APP=mariadb PYTHON_VERSION=3.5 MARIADB_VERSION=10.3
94-
95-
- COMPOSE_APP=mariadb PYTHON_VERSION=3.6 MARIADB_VERSION=10.1
9670
- COMPOSE_APP=mariadb PYTHON_VERSION=3.6 MARIADB_VERSION=10.2
9771
- COMPOSE_APP=mariadb PYTHON_VERSION=3.6 MARIADB_VERSION=10.3
9872

@@ -101,12 +75,12 @@ env:
10175
- COMPOSE_APP=mariadb PYTHON_VERSION=3.7 MARIADB_VERSION=10.3
10276

10377
# Browsers:
104-
- COMPOSE_APP=chrome PYTHON_VERSION=3.5
105-
- COMPOSE_APP=firefox PYTHON_VERSION=3.5
78+
- COMPOSE_APP=chrome PYTHON_VERSION=3.6
79+
- COMPOSE_APP=firefox PYTHON_VERSION=3.6
10680

10781
matrix:
10882
allow_failures:
109-
- env: COMPOSE_APP=firefox PYTHON_VERSION=3.5
83+
- env: COMPOSE_APP=firefox PYTHON_VERSION=3.6
11084

11185
before_install:
11286
- echo 'DOCKER_OPTS="${DOCKER_OPTS} --registry-mirror=https://mirror.gcr.io"' | sudo tee -a /etc/default/docker

0 commit comments

Comments
 (0)