prepare 0.6.2

barseghyanartur · barseghyanartur · commit 66d060c7a0b2 · 2017-12-29T23:21:46.000+01:00
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -15,6 +15,14 @@ are used for versioning (schema follows below):
   0.3.4 to 0.4).
 - All backwards incompatible changes are mentioned in this document.
 
+0.6.2
+-----
+2017-12-29
+
+- Update example project (and the tests that are dependant on the example
+  project) to work with Django 2.0.
+- Set minimal requirement for ``django-elasticsearch-dsl`` to 3.0.
+
 0.6.1
 -----
 2017-11-28
diff --git a/docs/changelog.rst b/docs/changelog.rst
@@ -15,6 +15,14 @@ are used for versioning (schema follows below):
   0.3.4 to 0.4).
 - All backwards incompatible changes are mentioned in this document.
 
+0.6.2
+-----
+2017-12-29
+
+- Update example project (and the tests that are dependant on the example
+  project) to work with Django 2.0.
+- Set minimal requirement for ``django-elasticsearch-dsl`` to 3.0.
+
 0.6.1
 -----
 2017-11-28
diff --git a/examples/requirements/django_1_10.txt b/examples/requirements/django_1_10.txt
@@ -6,5 +6,6 @@ django-debug-toolbar==1.5
 django-debug-toolbar-force==0.1.1
 django-elasticsearch-debug-toolbar==1.0.4
 django-ormex==0.2
+djangorestframework==3.6.2
 drf-extensions==0.3.1
 sqlparse==0.2.2
diff --git a/examples/requirements/django_1_11.txt b/examples/requirements/django_1_11.txt
@@ -6,5 +6,6 @@ django-debug-toolbar==1.5
 django-debug-toolbar-force==0.1.1
 django-elasticsearch-debug-toolbar==1.0.4
 django-ormex==0.2
+djangorestframework==3.7.7
 drf-extensions==0.3.1
 sqlparse==0.2.2
diff --git a/examples/requirements/django_1_8.txt b/examples/requirements/django_1_8.txt
@@ -6,5 +6,6 @@ django-debug-toolbar==1.4
 django-debug-toolbar-force==0.1.1
 django-elasticsearch-debug-toolbar==1.0.4
 django-ormex==0.2
+djangorestframework==3.6.2
 drf-extensions==0.3.1
 sqlparse==0.1.9
diff --git a/examples/requirements/django_1_9.txt b/examples/requirements/django_1_9.txt
@@ -6,6 +6,7 @@ django-debug-toolbar==1.5
 django-debug-toolbar-force==0.1.1
 django-elasticsearch-debug-toolbar==1.0.4
 django-ormex==0.2
+djangorestframework==3.6.2
 drf-extensions==0.3.1
 sqlparse==0.2.2
 
diff --git a/examples/requirements/django_2_0.txt b/examples/requirements/django_2_0.txt
@@ -0,0 +1,11 @@
+-r common.txt
+-r test.txt
+
+Django>=2.0,<2.1
+django-debug-toolbar>=1.6
+django-debug-toolbar-force>=0.1.1
+django-elasticsearch-debug-toolbar>=1.2.0
+django-ormex>=0.2
+djangorestframework==3.7.7
+drf-extensions>=0.3.1
+sqlparse>=0.2.2
diff --git a/examples/simple/books/migrations/0001_initial.py b/examples/simple/books/migrations/0001_initial.py
@@ -54,7 +54,7 @@ class Migration(migrations.Migration):
             name='OrderLine',
             fields=[
                 ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-                ('book', models.ForeignKey(to='books.Book')),
+                ('book', models.ForeignKey(to='books.Book', on_delete=models.CASCADE)),
             ],
             options={
                 'ordering': ['order__created'],
@@ -83,11 +83,11 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='order',
             name='owner',
-            field=models.ForeignKey(to=settings.AUTH_USER_MODEL),
+            field=models.ForeignKey(to=settings.AUTH_USER_MODEL, on_delete=models.CASCADE),
         ),
         migrations.AddField(
             model_name='book',
             name='publisher',
-            field=models.ForeignKey(to='books.Publisher'),
+            field=models.ForeignKey(to='books.Publisher', on_delete=models.CASCADE),
         ),
     ]
diff --git a/examples/simple/books/migrations/0004_auto_20170322_2001.py b/examples/simple/books/migrations/0004_auto_20170322_2001.py
@@ -29,11 +29,11 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='book',
             name='publisher',
-            field=models.ForeignKey(related_name='books', to='books.Publisher'),
+            field=models.ForeignKey(related_name='books', to='books.Publisher', on_delete=models.CASCADE),
         ),
         migrations.AlterField(
             model_name='orderline',
             name='book',
-            field=models.ForeignKey(related_name='order_lines', to='books.Book'),
+            field=models.ForeignKey(related_name='order_lines', to='books.Book', on_delete=models.CASCADE),
         ),
     ]
diff --git a/examples/simple/books/models/address.py b/examples/simple/books/models/address.py
@@ -15,7 +15,7 @@ class Address(models.Model):
     house_number = models.CharField(max_length=60)
     appendix = models.CharField(max_length=30, null=True, blank=True)
     zip_code = models.CharField(max_length=60)
-    city = models.ForeignKey('books.City')
+    city = models.ForeignKey('books.City', on_delete=models.CASCADE)
 
     latitude = models.DecimalField(null=True,
                                    blank=True,
diff --git a/examples/simple/books/models/book.py b/examples/simple/books/models/book.py
@@ -18,18 +18,26 @@ class Book(models.Model):
     description = models.TextField(null=True, blank=True)
     summary = models.TextField(null=True, blank=True)
     authors = models.ManyToManyField('books.Author', related_name='books')
-    publisher = models.ForeignKey('books.Publisher', related_name='books')
+    publisher = models.ForeignKey(
+        'books.Publisher',
+        related_name='books',
+        on_delete=models.CASCADE
+    )
     publication_date = models.DateField()
-    state = models.CharField(max_length=100,
-                             choices=BOOK_PUBLISHING_STATUS_CHOICES,
-                             default=BOOK_PUBLISHING_STATUS_DEFAULT)
+    state = models.CharField(
+        max_length=100,
+        choices=BOOK_PUBLISHING_STATUS_CHOICES,
+        default=BOOK_PUBLISHING_STATUS_DEFAULT
+    )
     isbn = models.CharField(max_length=100, unique=True)
     price = models.DecimalField(max_digits=10, decimal_places=2)
     pages = models.PositiveIntegerField(default=200)
     stock_count = models.PositiveIntegerField(default=30)
-    tags = models.ManyToManyField('books.Tag',
-                                  related_name='books',
-                                  blank=True)
+    tags = models.ManyToManyField(
+        'books.Tag',
+        related_name='books',
+        blank=True
+    )
 
     class Meta(object):
         """Meta options."""
diff --git a/examples/simple/books/models/city.py b/examples/simple/books/models/city.py
@@ -15,17 +15,21 @@ class City(models.Model):
 
     name = models.CharField(max_length=255)
     info = models.TextField(null=True, blank=True)
-    country = models.ForeignKey('books.Country')
-    latitude = models.DecimalField(null=True,
-                                   blank=True,
-                                   decimal_places=15,
-                                   max_digits=19,
-                                   default=0)
-    longitude = models.DecimalField(null=True,
-                                    blank=True,
-                                    decimal_places=15,
-                                    max_digits=19,
-                                    default=0)
+    country = models.ForeignKey('books.Country', on_delete=models.CASCADE)
+    latitude = models.DecimalField(
+        null=True,
+        blank=True,
+        decimal_places=15,
+        max_digits=19,
+        default=0
+    )
+    longitude = models.DecimalField(
+        null=True,
+        blank=True,
+        decimal_places=15,
+        max_digits=19,
+        default=0
+    )
 
     class Meta(object):
         """Meta options."""
diff --git a/examples/simple/books/models/country.py b/examples/simple/books/models/country.py
@@ -13,16 +13,20 @@ class Country(models.Model):
 
     name = models.CharField(max_length=255)
     info = models.TextField(null=True, blank=True)
-    latitude = models.DecimalField(null=True,
-                                   blank=True,
-                                   decimal_places=15,
-                                   max_digits=19,
-                                   default=0)
-    longitude = models.DecimalField(null=True,
-                                    blank=True,
-                                    decimal_places=15,
-                                    max_digits=19,
-                                    default=0)
+    latitude = models.DecimalField(
+        null=True,
+        blank=True,
+        decimal_places=15,
+        max_digits=19,
+        default=0
+    )
+    longitude = models.DecimalField(
+        null=True,
+        blank=True,
+        decimal_places=15,
+        max_digits=19,
+        default=0
+    )
 
     class Meta(object):
         """Meta options."""
diff --git a/examples/simple/books/models/order.py b/examples/simple/books/models/order.py
@@ -11,7 +11,10 @@
 class Order(models.Model):
     """Order."""
 
-    owner = models.ForeignKey(settings.AUTH_USER_MODEL)
+    owner = models.ForeignKey(
+        settings.AUTH_USER_MODEL,
+        on_delete=models.CASCADE
+    )
     lines = models.ManyToManyField('books.OrderLine', blank=True)
     created = models.DateField(auto_now_add=True)
     updated = models.DateField(auto_now=True)
diff --git a/examples/simple/books/models/order_line.py b/examples/simple/books/models/order_line.py
@@ -11,7 +11,11 @@
 class OrderLine(models.Model):
     """Order line."""
 
-    book = models.ForeignKey('books.Book', related_name='order_lines')
+    book = models.ForeignKey(
+        'books.Book',
+        related_name='order_lines',
+        on_delete=models.CASCADE
+    )
 
     class Meta(object):
         """Meta options."""
diff --git a/examples/simple/books/models/publisher.py b/examples/simple/books/models/publisher.py
@@ -16,16 +16,20 @@ class Publisher(models.Model):
     state_province = models.CharField(max_length=30)
     country = models.CharField(max_length=50)
     website = models.URLField()
-    latitude = models.DecimalField(null=True,
-                                   blank=True,
-                                   decimal_places=15,
-                                   max_digits=19,
-                                   default=0)
-    longitude = models.DecimalField(null=True,
-                                    blank=True,
-                                    decimal_places=15,
-                                    max_digits=19,
-                                    default=0)
+    latitude = models.DecimalField(
+        null=True,
+        blank=True,
+        decimal_places=15,
+        max_digits=19,
+        default=0
+    )
+    longitude = models.DecimalField(
+        null=True,
+        blank=True,
+        decimal_places=15,
+        max_digits=19,
+        default=0
+    )
 
     class Meta(object):
         """Meta options."""
diff --git a/examples/simple/search_indexes/rest_framework_extensions_routers_compat.py b/examples/simple/search_indexes/rest_framework_extensions_routers_compat.py
diff --git a/examples/simple/search_indexes/urls.py b/examples/simple/search_indexes/urls.py
diff --git a/examples/simple/urls.py b/examples/simple/urls.py
diff --git a/setup.py b/setup.py
diff --git a/src/django_elasticsearch_dsl_drf/__init__.py b/src/django_elasticsearch_dsl_drf/__init__.py
diff --git a/tox.ini b/tox.ini
