From 88904c2746842f91f9c363f3bebd6b0473cd7af8 Mon Sep 17 00:00:00 2001 From: Stanislav Filin Date: Tue, 16 Jan 2018 20:45:36 +0200 Subject: [PATCH 1/3] Add Django 2.0 support Signed-off-by: Stanislav Filin --- .travis.yml | 1 + Dockerfile | 18 ++++++++++++++++++ polymorphic_tree/tests/models.py | 24 ++++++++++++++++-------- tox.ini | 2 ++ 4 files changed, 37 insertions(+), 8 deletions(-) create mode 100644 Dockerfile diff --git a/.travis.yml b/.travis.yml index f1a3072..fe79abd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,6 +9,7 @@ env: - PACKAGES="django>=1.8,<1.9" - PACKAGES="django>=1.10,<1.11" - PACKAGES="django>=1.11,<1.12" +- PACKAGES="django==2.0" before_install: - pip install codecov install: diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..019510e --- /dev/null +++ b/Dockerfile @@ -0,0 +1,18 @@ +FROM python:3 + +RUN pip3 install --upgrade pip + +RUN apt-get -y update +RUN apt-get -y upgrade +RUN apt-get -y install gettext + +# Initialize +WORKDIR /data/app +# Prepare +COPY . /data/app/ + +RUN pip install -e . + +RUN pip install tox django + +RUN tox diff --git a/polymorphic_tree/tests/models.py b/polymorphic_tree/tests/models.py index 17ea50d..cd4efb5 100644 --- a/polymorphic_tree/tests/models.py +++ b/polymorphic_tree/tests/models.py @@ -18,7 +18,8 @@ class PlainC(PlainB): class Model2A(ShowFieldContent, PolymorphicMPTTModel): - parent = PolymorphicTreeForeignKey('self', blank=True, null=True, related_name='children', verbose_name='parent') + parent = PolymorphicTreeForeignKey('self', blank=True, null=True, related_name='children', verbose_name='parent', + on_delete=models.CASCADE) field1 = models.CharField(max_length=10) @@ -35,8 +36,10 @@ class Model2D(Model2C): class One2OneRelatingModel(PolymorphicMPTTModel): - parent = PolymorphicTreeForeignKey('self', blank=True, null=True, related_name='children', verbose_name='parent') - one2one = models.OneToOneField(Model2A) + parent = PolymorphicTreeForeignKey('self', blank=True, null=True, related_name='children', verbose_name='parent', + on_delete=models.CASCADE) + one2one = models.OneToOneField(Model2A, + on_delete=models.CASCADE) field1 = models.CharField(max_length=10) @@ -45,7 +48,8 @@ class One2OneRelatingModelDerived(One2OneRelatingModel): class Base(ShowFieldContent, PolymorphicMPTTModel): - parent = PolymorphicTreeForeignKey('self', blank=True, null=True, related_name='children', verbose_name='parent') + parent = PolymorphicTreeForeignKey('self', blank=True, null=True, related_name='children', verbose_name='parent', + on_delete=models.CASCADE) field_b = models.CharField(max_length=10) @@ -71,7 +75,8 @@ class ModelWithCustomParentName(PolymorphicMPTTModel): blank=True, null=True, related_name='subordinate', - verbose_name='Chief') + verbose_name='Chief', + on_delete=models.CASCADE) field5 = models.CharField(max_length=10) class MPTTMeta: @@ -97,7 +102,8 @@ class ModelWithValidation(PolymorphicMPTTModel): parent = PolymorphicTreeForeignKey('self', blank=True, null=True, - related_name='children') + related_name='children', + on_delete=models.CASCADE) field6 = models.CharField(max_length=10) @@ -126,7 +132,8 @@ class ModelWithInvalidMove(PolymorphicMPTTModel): parent = PolymorphicTreeForeignKey('self', blank=True, null=True, - related_name='children') + related_name='children', + on_delete=models.CASCADE) field7 = models.CharField(max_length=10) @@ -139,7 +146,8 @@ class ModelMustBeChildRoot(PolymorphicMPTTModel): """Model that must be a child""" can_be_root = True - parent = PolymorphicTreeForeignKey('self', blank=True, null=True, related_name='children') + parent = PolymorphicTreeForeignKey('self', blank=True, null=True, related_name='children', + on_delete=models.CASCADE) field8 = models.CharField(max_length=10) diff --git a/tox.ini b/tox.ini index 021ae83..7198aff 100644 --- a/tox.ini +++ b/tox.ini @@ -4,6 +4,7 @@ envlist= py34-django{18,110,111}, py35-django{18,110,111}, py36-django{111}, + py36-django{20}, ; docs, [testenv] @@ -13,6 +14,7 @@ deps = django18: Django >= 1.8, < 1.9 django110: Django >= 1.10, < 1.11 django111: Django >= 1.11, < 1.12 + django20: Django == 2.0 py26: mock py27: mock ; django-dev: https://github.com/django/django/tarball/master From bb3da9d844e96088e8499cc0075c00e510a9cf6a Mon Sep 17 00:00:00 2001 From: Stanislav Filin Date: Tue, 16 Jan 2018 20:57:48 +0200 Subject: [PATCH 2/3] delete Dockerfile Signed-off-by: Stanislav Filin --- Dockerfile | 18 ------------------ 1 file changed, 18 deletions(-) delete mode 100644 Dockerfile diff --git a/Dockerfile b/Dockerfile deleted file mode 100644 index 019510e..0000000 --- a/Dockerfile +++ /dev/null @@ -1,18 +0,0 @@ -FROM python:3 - -RUN pip3 install --upgrade pip - -RUN apt-get -y update -RUN apt-get -y upgrade -RUN apt-get -y install gettext - -# Initialize -WORKDIR /data/app -# Prepare -COPY . /data/app/ - -RUN pip install -e . - -RUN pip install tox django - -RUN tox From a854591c7b84831133826bbcf8e281f4c257b2ef Mon Sep 17 00:00:00 2001 From: Stanislav Filin Date: Thu, 18 Jan 2018 11:12:02 +0200 Subject: [PATCH 3/3] Fix .travis.yml and tox.ini Signed-off-by: Stanislav Filin --- .travis.yml | 2 +- tox.ini | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index fe79abd..a25fbc2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,7 +9,7 @@ env: - PACKAGES="django>=1.8,<1.9" - PACKAGES="django>=1.10,<1.11" - PACKAGES="django>=1.11,<1.12" -- PACKAGES="django==2.0" +- PACKAGES="django>=2.0,<2.1" before_install: - pip install codecov install: diff --git a/tox.ini b/tox.ini index 7198aff..0e072f8 100644 --- a/tox.ini +++ b/tox.ini @@ -2,9 +2,8 @@ envlist= py27-django{18,110,111}, py34-django{18,110,111}, - py35-django{18,110,111}, - py36-django{111}, - py36-django{20}, + py35-django{18,110,111,20}, + py36-django{111,20}, ; docs, [testenv] @@ -14,7 +13,7 @@ deps = django18: Django >= 1.8, < 1.9 django110: Django >= 1.10, < 1.11 django111: Django >= 1.11, < 1.12 - django20: Django == 2.0 + django20: Django >= 2.0, <2.1 py26: mock py27: mock ; django-dev: https://github.com/django/django/tarball/master