diff --git a/.travis.yml b/.travis.yml index d0afb29f..8ac25126 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,6 @@ dist: xenial language: python python: - - "2.7" - "3.6" install: pip install tox-travis diff --git a/README.rst b/README.rst index a9ee4342..98ab73b8 100644 --- a/README.rst +++ b/README.rst @@ -17,6 +17,8 @@ New in 1.8 ========== * Category.slug becomes unique. If there are any duplicates in category slugs, the migration will add sequence number to them. +* Support for Django 3.1 +* Removed support for Python 2.7 New in 1.7 ========== diff --git a/categories/__init__.py b/categories/__init__.py index 4f81cc9c..7808fc02 100644 --- a/categories/__init__.py +++ b/categories/__init__.py @@ -1,7 +1,7 @@ __version_info__ = { 'major': 1, - 'minor': 7, - 'micro': 1, + 'minor': 8, + 'micro': 0, 'releaselevel': 'final', 'serial': 1 } diff --git a/categories/migrations/0004_auto_20200517_1832.py b/categories/migrations/0004_auto_20200517_1832.py new file mode 100644 index 00000000..ec3f2a06 --- /dev/null +++ b/categories/migrations/0004_auto_20200517_1832.py @@ -0,0 +1,20 @@ +# Generated by Django 3.0.6 on 2020-05-17 18:32 + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('contenttypes', '0002_remove_content_type_name'), + ('categories', '0003_auto_20200306_1050'), + ] + + operations = [ + migrations.AlterField( + model_name='categoryrelation', + name='content_type', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='contenttypes.ContentType', verbose_name='content type'), + ), + ] diff --git a/categories/registration.py b/categories/registration.py index a4d6eb1a..e26bb12c 100644 --- a/categories/registration.py +++ b/categories/registration.py @@ -1,7 +1,8 @@ """ These functions handle the adding of fields to other models """ -from django.db.models import FieldDoesNotExist, ForeignKey, ManyToManyField, CASCADE +from django.db.models import ForeignKey, ManyToManyField, CASCADE +from django.core.exceptions import FieldDoesNotExist from . import fields # from settings import self._field_registry, self._model_registry from django.utils.translation import ugettext_lazy as _ diff --git a/requirements.txt b/requirements.txt index c8f4509a..0d767c53 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,2 +1,2 @@ -django-mptt>=0.9.0,<0.11 +django-mptt==0.11.0 unicode-slugify==0.1.3 diff --git a/tox.ini b/tox.ini index e918ef5f..bff4fb57 100644 --- a/tox.ini +++ b/tox.ini @@ -1,9 +1,8 @@ [tox] envlist = begin - py27-lint - py27-django{111} - py36-django{111,2,21,22,3} + py36-lint + py36-django{111,2,21,22,3,31} coverage-report [testenv] @@ -12,6 +11,7 @@ deps= django21: Django>=2.1,<2.2 django22: Django>=2.2,<2.3 django3: Django>=3.0,<3.1 + django31: Django>=3.1,<3.2 django111: Django>=1.11,<1.12 coverage pillow @@ -25,7 +25,7 @@ commands= [testenv:begin] commands = coverage erase -[testenv:py27-lint] +[testenv:py36-lint] deps= flake8