diff --git a/.travis.yml b/.travis.yml index 03cfd93..c320375 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,26 +1,8 @@ # https://travis-ci.org/django-polymorphic/django-polymorphic dist: xenial -cache: pip sudo: false language: python -python: "3.6" - -env: - - TOXENV=py27-django111 - - TOXENV=py35-django111 - - TOXENV=py35-django20 - - TOXENV=py35-djangomaster - - TOXENV=py36-django111 - - TOXENV=py36-django20 - - TOXENV=py36-django21 - - TOXENV=py36-django22 - - TOXENV=py36-djangomaster - # XXX: Use a matrix to build these? - - TOXENV=py36-django111-postgres DB=postgres - - TOXENV=py36-django20-postgres DB=postgres - - TOXENV=py36-djangomaster-postgres DB=postgres - services: - postgres addons: @@ -29,14 +11,12 @@ addons: matrix: fast_finish: true include: - # Django 1.11: Python 2.7, 3.4, 3.5, or 3.6 + # Django 1.11: Python 2.7, 3.5, or 3.6 - { env: TOXENV=py27-django111, python: 2.7 } - - { env: TOXENV=py34-django111, python: 3.4 } - { 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.4, 3.5, or 3.6 - - { env: TOXENV=py34-django20, python: 3.4 } + # 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 } @@ -49,16 +29,14 @@ matrix: - { env: TOXENV=py37-django22, python: 3.7 } - { env: TOXENV=py37-django22-postgres DB=postgres, python: 3.7 } # Django development master (direct from GitHub source): - - { env: TOXENV=py35-djangomaster, python: 3.5 } - { env: TOXENV=py36-djangomaster, python: 3.6 } - { env: TOXENV=py37-djangomaster, python: 3.7 } - { env: TOXENV=py37-djangomaster-postgres DB=postgres, python: 3.7 } allow_failures: - - { env: TOXENV=py35-djangomaster, python: 3.5 } - - { 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=py36-djangomaster + - env: TOXENV=py37-djangomaster + - env: TOXENV=py37-djangomaster-postgres DB=postgres cache: directories: diff --git a/README.rst b/README.rst index e45b971..09f0699 100644 --- a/README.rst +++ b/README.rst @@ -60,7 +60,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.4+ is supported. +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. For older Django versions, install *django-polymorphic==1.3*. For more information, see the `documentation at Read the Docs `_. diff --git a/docs/quickstart.rst b/docs/quickstart.rst index 91ca7b3..c40cb06 100644 --- a/docs/quickstart.rst +++ b/docs/quickstart.rst @@ -12,7 +12,7 @@ Update the settings file:: 'django.contrib.contenttypes', ) -The current release of *django-polymorphic* supports Django 1.11, 2.0 and Python 2.7 and 3.4+ is supported. +The current release of *django-polymorphic* supports Django 1.11, 2.0 and Python 2.7 and 3.5+ is supported. For older Django versions, use *django-polymorphic==1.3*. Making Your Models Polymorphic diff --git a/setup.cfg b/setup.cfg index e9e04db..ac733b4 100644 --- a/setup.cfg +++ b/setup.cfg @@ -23,7 +23,6 @@ classifiers = Operating System :: OS Independent Programming Language :: Python :: 2.7 Programming Language :: Python :: 3 - Programming Language :: Python :: 3.4 Programming Language :: Python :: 3.5 Programming Language :: Python :: 3.6 Programming Language :: Python :: 3.7 diff --git a/tox.ini b/tox.ini index aa04975..005cd78 100644 --- a/tox.ini +++ b/tox.ini @@ -1,8 +1,7 @@ [tox] envlist = py27-django{111} - py34-django{111,20} - py35-django{111,20,master} + py35-django{111,20} py36-django{111,20,21,22,master} py37-django{21,22,master} docs