diff --git a/.travis.yml b/.travis.yml index 3ab9ad2..1cc05ea 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,8 +4,6 @@ matrix: include: - python: 2.7 env: DJANGO=1.10 - - python: 3.4 - env: DJANGO=1.10 - python: 3.5 env: DJANGO=1.10 - python: 3.6 @@ -13,15 +11,13 @@ matrix: - python: 2.7 env: DJANGO=1.11 - - python: 3.4 - env: DJANGO=1.11 - python: 3.5 env: DJANGO=1.11 - python: 3.6 env: DJANGO=1.11 + - python: 3.7 + env: DJANGO=1.11 - - python: 3.4 - env: DJANGO=2.0 - python: 3.5 env: DJANGO=2.0 - python: 3.6 @@ -42,6 +38,8 @@ matrix: env: DJANGO=2.2 - python: 3.7 env: DJANGO=2.2 + - python: 3.8 + env: DJANGO=2.2 - python: 3.6 env: DJANGO=3.0 diff --git a/CHANGELOG.md b/CHANGELOG.md index ab7875f..8ea43ad 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,7 @@ # 0.4.0 - Added Django 3.0 to support matrix. +- Remove Python 3.4 from support matrix. # 0.3.0 diff --git a/README.rst b/README.rst index 4ab03aa..1dfd420 100644 --- a/README.rst +++ b/README.rst @@ -45,16 +45,14 @@ Compatibility +----------------+--------------------------------+ | Python version | Django versions | +================+================================+ -| 3.8 | 3.0 | +| 3.8 | 2.2, 3.0 | +----------------+--------------------------------+ -| 3.7 | 2.0, 2.1, 2.2, 3.0 | +| 3.7 | 1.11, 2.0, 2.1, 2.2, 3.0 | +----------------+--------------------------------+ | 3.6 | 1.10, 1.11, 2.0, 2.1, 2.2, 3.0 | +----------------+--------------------------------+ | 3.5 | 1.10, 1.11, 2.0, 2.1, 2.2 | +----------------+--------------------------------+ -| 3.4 | 1.10, 1.11, 2.0 | -+----------------+--------------------------------+ | 2.7 | 1.10, 1.11 | +----------------+--------------------------------+ diff --git a/tox.ini b/tox.ini index b2fa445..09ded93 100644 --- a/tox.ini +++ b/tox.ini @@ -1,8 +1,7 @@ [tox] envlist = - py{27,34,35,36}-{dj110,dj111}-{db,cached_db}, - py{34,35,36,37}-dj20-{db,cached_db}, - py{35,36,37}-{dj21,dj22}-{db,cached_db}, + py{27,35,36}-{dj110,dj111}-{db,cached_db}, + py{35,36,37}-{dj20,dj21,dj22}-{db,cached_db}, py{36,37,38}-{dj30}-{db,cached_db}, py{36,37,38}-{djmaster}-{db,cached_db}