From 0c22293dc456f2215c45374d4fb12f095cadd448 Mon Sep 17 00:00:00 2001 From: Rustem Saiargaliev Date: Tue, 3 Dec 2019 20:23:35 +0100 Subject: [PATCH 1/6] Switch to tox-travis --- .travis.yml | 38 ++++++-------------------------------- tox.ini | 6 ++++++ 2 files changed, 12 insertions(+), 32 deletions(-) diff --git a/.travis.yml b/.travis.yml index 25d7d60a..661955e5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,44 +1,18 @@ language: python +python: + - "3.5" + - "3.6" + - "3.7" cache: pip dist: xenial branches: only: - master -jobs: - include: - - env: TOXENV=flake8 - python: 3.7 - - env: TOXENV=black - python: 3.7 - - env: TOXENV=py35-django111-{postgresql,sqlite} - python: 3.5 - - env: TOXENV=py36-django111-{postgresql,sqlite} - python: 3.6 - - env: TOXENV=py37-django111-{postgresql,sqlite} - python: 3.7 - - env: TOXENV=py35-django20-{postgresql,sqlite} - python: 3.5 - - env: TOXENV=py36-django20-{postgresql,sqlite} - python: 3.6 - - env: TOXENV=py37-django20-{postgresql,sqlite} - python: 3.7 - - env: TOXENV=py35-django21-{postgresql,sqlite} - python: 3.5 - - env: TOXENV=py36-django21-{postgresql,sqlite} - python: 3.6 - - env: TOXENV=py37-django21-{postgresql,sqlite} - python: 3.7 - - env: TOXENV=py35-django22-{postgresql,sqlite} - python: 3.5 - - env: TOXENV=py36-django22-{postgresql,sqlite} - python: 3.6 - - env: TOXENV=py37-django22-{postgresql,sqlite} - python: 3.7 before_install: - sudo apt-get update && sudo apt-get build-dep python-imaging - sudo service postgresql restart install: - - pip install tox + - pip install tox-travis addons: postgresql: "9.6" apt: @@ -51,4 +25,4 @@ before_script: - psql template1 -c "create extension postgis;" - psql template1 -c "create extension citext;" script: - - tox + - tox -v diff --git a/tox.ini b/tox.ini index 19bd0e69..f29fd6c0 100644 --- a/tox.ini +++ b/tox.ini @@ -6,6 +6,12 @@ envlist = flake8 black +[travis] +python = + 3.5: py35 + 3.6: py36,flake8,black + 3.7: py37 + [testenv] setenv = PYTHONPATH={toxinidir} From 79cfbd9f891d9e410ab5595d9c4642f9b2c0940b Mon Sep 17 00:00:00 2001 From: Rustem Saiargaliev Date: Tue, 3 Dec 2019 20:38:34 +0100 Subject: [PATCH 2/6] Playing around with travis config --- .travis.yml | 6 +++--- tox.ini | 13 ++++--------- 2 files changed, 7 insertions(+), 12 deletions(-) diff --git a/.travis.yml b/.travis.yml index 661955e5..09bf2d8d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,10 +14,10 @@ before_install: install: - pip install tox-travis addons: - postgresql: "9.6" + postgresql: "11" apt: packages: - - postgresql-9.6-postgis-2.4 + - postgresql-11-postgis-2.5 services: - postgresql before_script: @@ -25,4 +25,4 @@ before_script: - psql template1 -c "create extension postgis;" - psql template1 -c "create extension citext;" script: - - tox -v + - tox diff --git a/tox.ini b/tox.ini index f29fd6c0..655027a7 100644 --- a/tox.ini +++ b/tox.ini @@ -1,10 +1,9 @@ [tox] envlist = - py35-django{111,20,21,22}-{postgresql,sqlite} - py36-django{111,20,21,22}-{postgresql,sqlite} - py37-django{111,20,21,22}-{postgresql,sqlite} - flake8 - black +; py{35,36,37}-django{111,20,21,22}-{postgresql,sqlite} + py36-django22-postgresql +; flake8 +; black [travis] python = @@ -18,10 +17,6 @@ setenv = postgresql: TEST_DB=postgis sqlite: TEST_DB=sqlite sqlite: USE_TZ=True -basepython = - py35: python3.5 - py36: python3.6 - py37: python3.7 deps = pillow pytest From 8719a83f513b6b9019f4fe8e8c66c442f520280c Mon Sep 17 00:00:00 2001 From: Rustem Saiargaliev Date: Tue, 3 Dec 2019 20:41:34 +0100 Subject: [PATCH 3/6] Drop before_install --- .travis.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 09bf2d8d..4de1ca15 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,9 +8,6 @@ dist: xenial branches: only: - master -before_install: - - sudo apt-get update && sudo apt-get build-dep python-imaging - - sudo service postgresql restart install: - pip install tox-travis addons: From 38d2c492d0fefe733f2f777641535a4ae8548bd9 Mon Sep 17 00:00:00 2001 From: Rustem Saiargaliev Date: Tue, 3 Dec 2019 20:47:34 +0100 Subject: [PATCH 4/6] PG 10 --- .travis.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4de1ca15..2fb5dfee 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,13 +8,16 @@ dist: xenial branches: only: - master +before_install: + - sudo apt-get update && sudo apt-get build-dep python-imaging + - sudo service postgresql restart install: - pip install tox-travis addons: - postgresql: "11" + postgresql: "10" apt: packages: - - postgresql-11-postgis-2.5 + - postgresql-10-postgis-2.5 services: - postgresql before_script: @@ -22,4 +25,4 @@ before_script: - psql template1 -c "create extension postgis;" - psql template1 -c "create extension citext;" script: - - tox + - tox -v From 485a9ef94f2b9dfa33e10b8c6d9eb4ff86cc8dc2 Mon Sep 17 00:00:00 2001 From: Rustem Saiargaliev Date: Tue, 3 Dec 2019 21:04:31 +0100 Subject: [PATCH 5/6] More --- .travis.yml | 4 ++-- tox.ini | 7 +++---- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2fb5dfee..661955e5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,10 +14,10 @@ before_install: install: - pip install tox-travis addons: - postgresql: "10" + postgresql: "9.6" apt: packages: - - postgresql-10-postgis-2.5 + - postgresql-9.6-postgis-2.4 services: - postgresql before_script: diff --git a/tox.ini b/tox.ini index 655027a7..06f4857c 100644 --- a/tox.ini +++ b/tox.ini @@ -1,9 +1,8 @@ [tox] envlist = -; py{35,36,37}-django{111,20,21,22}-{postgresql,sqlite} - py36-django22-postgresql -; flake8 -; black + py{35,36,37}-django{111,20,21,22}-{postgresql,sqlite} + flake8 + black [travis] python = From c7a8ec2cb90aea7c28ef6fcfd79725318aa2d5b3 Mon Sep 17 00:00:00 2001 From: Rustem Saiargaliev Date: Tue, 3 Dec 2019 21:12:12 +0100 Subject: [PATCH 6/6] Fix Django 2.2 in tox --- tox.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index 06f4857c..63c908c8 100644 --- a/tox.ini +++ b/tox.ini @@ -23,7 +23,7 @@ deps = django111: Django>=1.11,<1.12 django20: Django==2.0 django21: Django==2.1 - django22: Django>=2.2 + django22: Django==2.2 postgresql: psycopg2-binary commands = pytest