prepare 0.16.2

Author: barseghyanartur

CHANGELOG.rst

@@ -15,6 +15,13 @@ are used for versioning (schema follows below):
   0.3.4 to 0.4).
 - All backwards incompatible changes are mentioned in this document.
 
+0.16.2
+------
+2018-09-21
+
+- Tested yet untested ``pip_helpers`` module.
+- More tests.
+
 0.16.1
 ------
 2018-09-18

docs/changelog.rst

@@ -15,11 +15,18 @@ are used for versioning (schema follows below):
   0.3.4 to 0.4).
 - All backwards incompatible changes are mentioned in this document.
 
+0.16.2
+------
+2018-09-21
+
+- Tested yet untested ``pip_helpers`` module.
+- More tests.
+
 0.16.1
 ------
 2018-09-18
 
-- Make it possible to control the size of the functional queries.
+- Make it possible to control the size of the functional suggester queries.
 
 0.16
 ----

setup.py

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

src/django_elasticsearch_dsl_drf/__init__.py

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

src/django_elasticsearch_dsl_drf/pip_helpers.py

@@ -24,7 +24,7 @@ def get_installed_packages(with_versions=False):
     """
     reqs = subprocess.check_output([sys.executable, '-m', 'pip', 'freeze'])
     if with_versions:
-        return set([r.decode().split('==') for r in reqs.split()])
+        return set([tuple(r.decode().split('==')) for r in reqs.split()])
     else:
         return set([r.decode().split('==')[0] for r in reqs.split()])
 

src/django_elasticsearch_dsl_drf/tests/__init__.py

@@ -14,6 +14,7 @@
 from .test_ordering_common import TestOrdering
 from .test_ordering_geo_spatial import TestOrderingGeoSpatial
 from .test_pagination import TestPagination
+from .test_pip_helpers import TestPipHelpers
 from .test_search import TestSearch
 from .test_search_multi_match import TestMultiMatchSearch
 from .test_search_simple_query_string import TestSimpleQueryStringSearch
@@ -42,6 +43,7 @@
     'TestOrdering',
     'TestOrderingGeoSpatial',
     'TestPagination',
+    'TestPipHelpers',
     'TestSearch',
     'TestSerializers',
     'TestSuggesters',

src/django_elasticsearch_dsl_drf/tests/test_pip_helpers.py

@@ -0,0 +1,69 @@
+# -*- coding: utf-8 -*-
+"""
+Test pip_helpers.
+"""
+
+from __future__ import absolute_import, unicode_literals
+
+import unittest
+
+import django
+import pytest
+
+from ..pip_helpers import check_if_installed, get_installed_packages
+
+__title__ = 'django_elasticsearch_dsl_drf.tests.test_pip_helpers'
+__author__ = 'Artur Barseghyan <[email protected]>'
+__copyright__ = '2017-2018 Artur Barseghyan'
+__license__ = 'GPL 2.0/LGPL 2.1'
+__all__ = (
+    'TestPipHelpers',
+)
+
+
+@pytest.mark.django_db
+class TestPipHelpers(unittest.TestCase):
+    """Test pip_helpers."""
+
+    @classmethod
+    def setUpClass(cls):
+        cls.mapping = {
+            'country': {
+                'name': 'Netherlands',
+                'province': {
+                    'name': 'North Holland',
+                    'city': {
+                        'name': 'Amsterdam',
+                    }
+                }
+            }
+        }
+
+    def test_get_installed_packages(self):
+        """Test `get_installed_packages`.
+
+        :return:
+        """
+        installed_packages = get_installed_packages()
+        self.assertIn('Django', installed_packages)
+        self.assertIn('elasticsearch', installed_packages)
+        self.assertIn('elasticsearch-dsl', installed_packages)
+
+    def test_get_installed_packages_with_versions(self):
+        """Test `get_installed_packages`.
+
+        :return:
+        """
+        installed_packages = get_installed_packages(with_versions=True)
+        django_version = '{}.{}.{}'.format(*django.VERSION[:3])
+        self.assertIn(('Django', django_version), installed_packages)
+
+    def test_check_if_installed(self):
+        """Test `check_if_installed`.
+
+        :return:
+        """
+        self.assertTrue(check_if_installed('Django'))
+        self.assertTrue(check_if_installed('elasticsearch'))
+        self.assertTrue(check_if_installed('elasticsearch-dsl'))
+        self.assertFalse(check_if_installed('django-fobi'))

src/django_elasticsearch_dsl_drf/tests/test_wrappers.py

@@ -23,7 +23,7 @@
 
 @pytest.mark.django_db
 class TestWrappers(unittest.TestCase):
-    """Test helpers."""
+    """Test wrappers."""
 
     @classmethod
     def setUpClass(cls):