prepare 0.7

Author: barseghyanartur

CHANGELOG.rst

@@ -15,6 +15,17 @@ are used for versioning (schema follows below):
   0.3.4 to 0.4).
 - All backwards incompatible changes are mentioned in this document.
 
+0.7
+---
+2018-03-08
+
+.. note::
+
+    Dear ladies, congratulations on `International Women's Day
+    <https://en.wikipedia.org/wiki/International_Women%27s_Day>`_
+
+- CoreAPI/CoreSchema support.
+
 0.6.4
 -----
 2018-03-05

CREDITS.rst

@@ -34,6 +34,8 @@ Contributors
 ------------
 Thanks to the following people for their contributions:
 
-- [Jean-David Fiquet](https://github.com/barseghyanartur/django-elasticsearch-dsl-drf/commits?author=id13)
+- `Jean-David Fiquet <https://github.com/barseghyanartur/django-elasticsearch-dsl-drf/commits?author=id13>`_
   for his valuable contributions to the ``geo-spatial`` features, ``highlight``
   backend, ``nested search`` and a number of other additions/fixes.
+- `Mateusz Mejsner <https://github.com/barseghyanartur/django-elasticsearch-dsl-drf/commits?author=macher91>`_
+  for CoreAPI and CoreSchema support.

examples/requirements/coreapi_coreschema.txt

@@ -0,0 +1,2 @@
+coreapi
+coreschema

examples/requirements/none.txt

@@ -0,0 +1 @@
+

examples/requirements/test.txt

@@ -7,6 +7,6 @@ pytest-django==2.9.1
 pytest-ordering==0.5
 pytest==3.0.2
 selenium==2.53.6
-tox==2.3.1
-coreapi==2.3.3
-coreschema==0.0.4
+tox==2.9.1
+#coreapi==2.3.3
+#coreschema==0.0.4

setup.py

@@ -2,7 +2,7 @@
 
 from setuptools import find_packages, setup
 
-version = '0.6.4'
+version = '0.7'
 
 DOCS_TRANSFORMATIONS = (
     (

src/django_elasticsearch_dsl_drf/__init__.py

@@ -3,7 +3,7 @@
 """
 
 __title__ = 'django-elasticsearch-dsl-drf'
-__version__ = '0.6.4'
+__version__ = '0.7'
 __author__ = 'Artur Barseghyan <[email protected]>'
 __copyright__ = '2017-2018 Artur Barseghyan'
 __license__ = 'GPL 2.0/LGPL 2.1'

src/django_elasticsearch_dsl_drf/tests/base.py

@@ -3,6 +3,7 @@
 """
 
 import logging
+import pip
 
 from django.test import TransactionTestCase
 import pytest
@@ -17,10 +18,23 @@
 __all__ = (
     'BaseRestFrameworkTestCase',
     'BaseTestCase',
+    'INSTALLED_PACKAGES',
+    'CORE_API_IS_INSTALLED',
+    'CORE_SCHEMA_IS_INSTALLED',
+    'CORE_API_AND_CORE_SCHEMA_ARE_INSTALLED',
+    'CORE_API_AND_CORE_SCHEMA_MISSING_MSG',
 )
 
 LOGGER = logging.getLogger(__name__)
-
+_INSTALLED_PACKAGES = pip.get_installed_distributions()
+INSTALLED_PACKAGES = [pkg.project_name for pkg in _INSTALLED_PACKAGES]
+CORE_API_IS_INSTALLED = 'coreapi' in INSTALLED_PACKAGES
+CORE_SCHEMA_IS_INSTALLED = 'coreschema' in INSTALLED_PACKAGES
+CORE_API_AND_CORE_SCHEMA_ARE_INSTALLED = (
+    CORE_API_IS_INSTALLED and CORE_SCHEMA_IS_INSTALLED
+)
+CORE_API_AND_CORE_SCHEMA_MISSING_MSG = "Skipped because coreapi or " \
+                                       "coreschema are not installed!"
 
 @pytest.mark.django_db
 class BaseRestFrameworkTestCase(TransactionTestCase):

src/django_elasticsearch_dsl_drf/tests/test_filtering_common.py

@@ -13,10 +13,14 @@
 from rest_framework import status
 
 from books import constants
-from ..filter_backends import FilteringFilterBackend
 from search_indexes.viewsets import BookDocumentViewSet
 
-from .base import BaseRestFrameworkTestCase
+from ..filter_backends import FilteringFilterBackend
+from .base import (
+    BaseRestFrameworkTestCase,
+    CORE_API_AND_CORE_SCHEMA_ARE_INSTALLED,
+    CORE_API_AND_CORE_SCHEMA_MISSING_MSG,
+)
 from .data_mixins import AddressesMixin, BooksMixin
 
 __title__ = 'django_elasticsearch_dsl_drf.tests.test_filtering'
@@ -530,12 +534,16 @@ def test_various_complex_fields(self):
         response = self.client.get(self.city_detail_url, data)
         self.assertEqual(response.status_code, status.HTTP_200_OK)
 
+    @unittest.skipIf(not CORE_API_AND_CORE_SCHEMA_ARE_INSTALLED,
+                     CORE_API_AND_CORE_SCHEMA_MISSING_MSG)
     def test_schema_fields_with_filter_fields_list(self):
         """Test schema field generator"""
         fields = self.backend.get_schema_fields(self.view)
         fields = [f.name for f in fields]
         self.assertEqual(fields, list(self.view.filter_fields.keys()))
 
+    @unittest.skipIf(not CORE_API_AND_CORE_SCHEMA_ARE_INSTALLED,
+                     CORE_API_AND_CORE_SCHEMA_MISSING_MSG)
     def test_schema_field_not_required(self):
         """Test schema fields always not required"""
         fields = self.backend.get_schema_fields(self.view)

src/django_elasticsearch_dsl_drf/tests/test_ordering_common.py

@@ -14,11 +14,16 @@
 
 from rest_framework import status
 
-import factories
 from django_elasticsearch_dsl_drf.filter_backends import OrderingFilterBackend
+
+import factories
 from search_indexes.viewsets import BookDocumentViewSet
 
-from .base import BaseRestFrameworkTestCase
+from .base import (
+    BaseRestFrameworkTestCase,
+    CORE_API_AND_CORE_SCHEMA_ARE_INSTALLED,
+    CORE_API_AND_CORE_SCHEMA_MISSING_MSG,
+)
 
 if DJANGO_GTE_1_10:
     from django.urls import reverse
@@ -186,12 +191,16 @@ def test_book_order_by_non_existent_field(self):
                                     self.books_url,
                                     check_ordering=False)
 
+    @unittest.skipIf(not CORE_API_AND_CORE_SCHEMA_ARE_INSTALLED,
+                     CORE_API_AND_CORE_SCHEMA_MISSING_MSG)
     def test_schema_fields_with_filter_fields_list(self):
         """Test schema field generator"""
         fields = self.backend.get_schema_fields(self.view)
         fields = [f.name for f in fields]
         self.assertEqual(fields, ['ordering'])
 
+    @unittest.skipIf(not CORE_API_AND_CORE_SCHEMA_ARE_INSTALLED,
+                     CORE_API_AND_CORE_SCHEMA_MISSING_MSG)
     def test_schema_field_not_required(self):
         """Test schema fields always not required"""
         fields = self.backend.get_schema_fields(self.view)