diff --git a/.travis.yml b/.travis.yml index c320375..9edc4d6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,32 +11,33 @@ addons: matrix: fast_finish: true include: - # Django 1.11: Python 2.7, 3.5, or 3.6 - - { env: TOXENV=py27-django111, python: 2.7 } - - { env: TOXENV=py35-django111, python: 3.5 } - - { env: TOXENV=py36-django111, python: 3.6 } - - { env: TOXENV=py36-django111-postgres DB=postgres, python: 3.6 } - # Django 2.0: Python 3.5, or 3.6 - - { env: TOXENV=py35-django20, python: 3.5 } - - { env: TOXENV=py36-django20, python: 3.6 } - - { env: TOXENV=py36-django20-postgres DB=postgres, python: 3.6 } - # Django 2.1: Python 3.6, or 3.7 + # Django 2.1: Python 3.5, 3.6, or 3.7 + - { env: TOXENV=py35-django21, python: 3.5 } - { env: TOXENV=py36-django21, python: 3.6 } - { env: TOXENV=py37-django21, python: 3.7 } - { env: TOXENV=py37-django21-postgres DB=postgres, python: 3.7 } - # Django 2.2: Python 3.6, or 3.7 + # Django 2.2: Python 3.5, 3.6, 3.7 or 3.8 + - { env: TOXENV=py35-django22, python: 3.5 } - { env: TOXENV=py36-django22, python: 3.6 } - { env: TOXENV=py37-django22, python: 3.7 } - - { env: TOXENV=py37-django22-postgres DB=postgres, python: 3.7 } + - { env: TOXENV=py38-django22, python: 3.8 } + - { env: TOXENV=py38-django22-postgres DB=postgres, python: 3.8 } + # Django 3.0: Python 3.6, 3.7 or 3.8 + - { env: TOXENV=py36-django30, python: 3.6 } + - { env: TOXENV=py37-django30, python: 3.7 } + - { env: TOXENV=py38-django30, python: 3.8 } + - { env: TOXENV=py38-django30-postgres DB=postgres, python: 3.8 } # Django development master (direct from GitHub source): - { env: TOXENV=py36-djangomaster, python: 3.6 } - { env: TOXENV=py37-djangomaster, python: 3.7 } - - { env: TOXENV=py37-djangomaster-postgres DB=postgres, python: 3.7 } + - { env: TOXENV=py38-djangomaster, python: 3.8 } + - { env: TOXENV=py38-djangomaster-postgres DB=postgres, python: 3.8 } allow_failures: - env: TOXENV=py36-djangomaster - env: TOXENV=py37-djangomaster - - env: TOXENV=py37-djangomaster-postgres DB=postgres + - env: TOXENV=py38-djangomaster + - env: TOXENV=py38-djangomaster-postgres DB=postgres cache: directories: diff --git a/README.rst b/README.rst index 76a95b9..2905e12 100644 --- a/README.rst +++ b/README.rst @@ -62,7 +62,7 @@ Django to perform an ``INNER JOIN`` to fetch the model fields from the database. While taking this in mind, there are valid reasons for using subclassed models. That's what this library is designed for! -The current release of *django-polymorphic* supports Django 1.11, 2.0, 2.1, 2.2 and Python 2.7 and 3.5+ is supported. +The current release of *django-polymorphic* supports Django 2.1, 2.2, 3.0 and Python 3.5+ is supported. For older Django versions, install *django-polymorphic==1.3*. For more information, see the `documentation at Read the Docs `_. diff --git a/setup.cfg b/setup.cfg index a805f90..74740de 100644 --- a/setup.cfg +++ b/setup.cfg @@ -14,18 +14,18 @@ classifiers = Development Status :: 5 - Production/Stable Environment :: Web Environment Framework :: Django - Framework :: Django :: 1.11 - Framework :: Django :: 2.0 Framework :: Django :: 2.1 Framework :: Django :: 2.2 + Framework :: Django :: 3.0 Intended Audience :: Developers License :: OSI Approved :: BSD License Operating System :: OS Independent - Programming Language :: Python :: 2.7 Programming Language :: Python :: 3 + Programming Language :: Python :: 3 :: Only Programming Language :: Python :: 3.5 Programming Language :: Python :: 3.6 Programming Language :: Python :: 3.7 + Programming Language :: Python :: 3.8 Topic :: Database [options] diff --git a/tox.ini b/tox.ini index 8ccc8fe..abe33ca 100644 --- a/tox.ini +++ b/tox.ini @@ -1,9 +1,9 @@ [tox] envlist = - py27-django{111} - py35-django{111,20} - py36-django{111,20,21,22,master} - py37-django{21,22,master} + py35-django{21,22,master} + py36-django{21,22,30,master} + py37-django{21,22,30,master} + py38-django{21,22,30,master} docs [testenv] @@ -14,10 +14,9 @@ setenv = deps = coverage dj-database-url - django111: Django >= 1.11, < 2.0 - django20: Django ~= 2.0 django21: Django ~= 2.1 django22: Django ~= 2.2 + django30: Django ~= 3.0 djangomaster: https://github.com/django/django/archive/master.tar.gz postgres: psycopg2 commands =