diff --git a/.travis.yml b/.travis.yml index 10f25e2e..e74d37bf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,4 @@ dist: xenial -sudo: True language: python cache: pip addons: @@ -14,51 +13,12 @@ matrix: include: - { python: "3.5", env: TOXENV=py35-django111 } - { python: "3.6", env: TOXENV=py36-django111 } - - { python: "3.5", env: TOXENV=py35-django20 } - - { python: "3.6", env: TOXENV=py36-django20 } - { python: "3.5", env: TOXENV=py35-django21 } - { python: "3.6", env: TOXENV=py36-django21 } + - { python: "3.7", env: TOXENV=py37-django21 } - { python: "3.5", env: TOXENV=py35-django22 } - { python: "3.6", env: TOXENV=py36-django22 } - - # https://github.com/travis-ci/travis-ci/issues/9815 - - env: TOXENV=py37-django20 - python: "3.7" - dist: xenial - sudo: true - addons: - postgresql: "9.4" - apt: - packages: - - postgresql-9.4-postgis-2.4 - services: - - postgresql - - # https://github.com/travis-ci/travis-ci/issues/9815 - - env: TOXENV=py37-django21 - python: "3.7" - dist: xenial - sudo: true - addons: - postgresql: "9.4" - apt: - packages: - - postgresql-9.4-postgis-2.4 - services: - - postgresql - - # https://github.com/travis-ci/travis-ci/issues/9815 - - env: TOXENV=py37-django22 - python: "3.7" - dist: xenial - sudo: true - addons: - postgresql: "9.4" - apt: - packages: - - postgresql-9.4-postgis-2.4 - services: - - postgresql + - { python: "3.7", env: TOXENV=py37-django22 } branches: only: diff --git a/README.rst b/README.rst index b428cea7..e70436db 100644 --- a/README.rst +++ b/README.rst @@ -39,6 +39,7 @@ Compatibility with DRF, Django and Python =============== ============================ ==================== ================================== DRF-gis version DRF version Django version Python version +**0.15.x** **3.3** to **3.9** **1.11** to **2.2** **3.4** to **3.7** **0.14.x** **3.3** to **3.9** **1.11** to **2.1** **3.4** to **3.7** **0.13.x** **3.3** to **3.8** **1.11** to **2.0** **2.7** to **3.6** **0.12.x** **3.1** to **3.7** **1.11** to **2.0** **2.7** to **3.6** diff --git a/tox.ini b/tox.ini index 4b03f5d5..d7f1cfe0 100644 --- a/tox.ini +++ b/tox.ini @@ -1,9 +1,7 @@ [tox] envlist = py{35,36,py3}-django111{,-pytest} - py{35,36,37,py3}-django20{,-pytest} - py{35,36,37,py3}-django21{,-pytest} - py{35,36,37,py3}-django22{,-pytest} + py{35,36,37,py3}-django{21, 22}{,-pytest} [testenv] usedevelop = true @@ -18,7 +16,6 @@ commands = deps = django111: Django~=1.11 - django20: Django~=2.0 django21: Django~=2.1 django22: Django~=2.2 djangorestframework~=3.9