drf-haystack 1.8.13__tar.gz → 1.9__tar.gz

{drf-haystack-1.8.13/drf_haystack.egg-info → drf_haystack-1.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: drf-haystack
-Version: 1.8.13
+Version: 1.9
 Summary: Makes Haystack play nice with Django REST Framework
 Home-page: https://github.com/rhblind/drf-haystack
 Download-URL: https://github.com/rhblind/drf-haystack.git
@@ -17,9 +17,9 @@ Classifier: Programming Language :: Python :: 3
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Requires-Python: >=3.7
 License-File: LICENSE.txt
-Requires-Dist: Django<4.3,>=2.2
-Requires-Dist: djangorestframework<=3.14,>=3.7
-Requires-Dist: django-haystack<=3.2.1,>=2.8
+Requires-Dist: Django<5.2,>=2.2
+Requires-Dist: djangorestframework<3.16,>=3.12
+Requires-Dist: django-haystack<3.4,>=2.8
 Requires-Dist: python-dateutil
 
 Implements a ViewSet, FiltersBackends and Serializers in order to play nice with Haystack.

{drf-haystack-1.8.13 → drf_haystack-1.9}/Pipfile

@@ -4,9 +4,9 @@ verify_ssl = true
 name = "pypi"
 
 [packages]
-django = ">=2.2,<=4.2.3"
-django-haystack = ">=2.8,<=3.2.1"
-djangorestframework = ">=3.7.0,<=3.14"
+django = ">=2.2,<5.2"
+django-haystack = ">=2.8,<3.4"
+djangorestframework = ">=3.12.0,<3.16"
 python-dateutil = "*"
 
 [dev-packages]

{drf-haystack-1.8.13 → drf_haystack-1.9}/README.md

@@ -20,9 +20,9 @@ Supported versions
 ------------------
 
 - Python 3.7 and above
-- Django >=2.2,<4.3
-- Haystack 2.8, 3.2
-- Django REST Framework >=3.7.0,<=3.13
+- Django >=2.2,<5.2
+- Haystack >=2.8,<3.4
+- Django REST Framework >=3.12.0,<3.16
 - elasticsearch >=2.0.0,<=8.3.3,
 
 

{drf-haystack-1.8.13 → drf_haystack-1.9}/docs/07_faceting.rst

@@ -218,7 +218,7 @@ Any view that inherits the :class:`drf_haystack.mixins.FacetMixin` will have a s
     class has a couple of hooks for dealing with faceting, namely:
 
         - :attr:`drf_haystack.mixins.FacetMixin.facet_filter_backends` - A list of filter backends that will be used to
-          apply faceting to the queryset. Defaults to :class:drf_haystack.filters.HaystackFacetFilter`, which should be
+          apply faceting to the queryset. Defaults to :class:`drf_haystack.filters.HaystackFacetFilter`, which should be
           sufficient in most cases.
         - :attr:`drf_haystack.mixins.FacetMixin.facet_serializer_class` - The :class:`drf_haystack.serializers.HaystackFacetSerializer`
           instance that will be used for serializing the result.
@@ -241,8 +241,8 @@ Any view that inherits the :class:`drf_haystack.mixins.FacetMixin` will have a s
 In order to set up a view which can respond to regular queries under ie ``^search/$`` and faceted queries under
 ``^search/facets/$``, we could do something like this.
 
-We can also change the query param text from ``selected_facets`` to our own choice like ``params`` or ``p``. For this 
-to make happen please provide ``facet_query_params_text`` attribute as shown in the example. 
+We can also change the query param text from ``selected_facets`` to our own choice like ``params`` or ``p``. For this
+to make happen please provide ``facet_query_params_text`` attribute as shown in the example.
 
 .. code-block:: python
 

{drf-haystack-1.8.13 → drf_haystack-1.9}/docs/index.rst

@@ -105,6 +105,21 @@ Thanks guys!
 Changelog
 =========
 
+v1.9
+------
+*Release date: 2023-10-04*
+
+    - Return an empty query object instead of an empty list when no filter is passed (:drf-issue:`202`).
+    - add "id" as an optional value of the serializer fields returning the haystack internal id (:drf-issue:`193`).
+    - Update supported versions of main dependencies (Django >=2.2,<5.2; djangorestframework >=3.12.0,<3.16; django-haystack >=2.8,<3.4).
+
+v1.8.13
+------
+*Release date: 2023-10-04*
+
+    - Support patch versions of Django 4.2.x.
+    - Upgrade a few dependencies.
+
 v1.8.12
 ------
 *Release date: 2023-01-03*

{drf-haystack-1.8.13 → drf_haystack-1.9}/drf_haystack/__init__.py

@@ -3,7 +3,7 @@
 from __future__ import unicode_literals
 
 __title__ = "drf-haystack"
-__version__ = "1.8.13"
+__version__ = "1.9"
 __author__ = "Rolf Haavard Blindheim"
 __license__ = "MIT License"
 

{drf-haystack-1.8.13 → drf_haystack-1.9}/drf_haystack/query.py

@@ -155,10 +155,10 @@ class FilterQueryBuilder(BaseQueryBuilder):
                     applicable_filters.append(term)
 
         applicable_filters = six.moves.reduce(
-            self.default_operator, filter(lambda x: x, applicable_filters)) if applicable_filters else []
+            self.default_operator, filter(lambda x: x, applicable_filters)) if applicable_filters else self.view.query_object()
 
         applicable_exclusions = six.moves.reduce(
-            self.default_operator, filter(lambda x: x, applicable_exclusions)) if applicable_exclusions else []
+            self.default_operator, filter(lambda x: x, applicable_exclusions)) if applicable_exclusions else self.view.query_object()
 
         return applicable_filters, applicable_exclusions
 

{drf-haystack-1.8.13 → drf_haystack-1.9/drf_haystack.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: drf-haystack
-Version: 1.8.13
+Version: 1.9
 Summary: Makes Haystack play nice with Django REST Framework
 Home-page: https://github.com/rhblind/drf-haystack
 Download-URL: https://github.com/rhblind/drf-haystack.git
@@ -17,9 +17,9 @@ Classifier: Programming Language :: Python :: 3
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Requires-Python: >=3.7
 License-File: LICENSE.txt
-Requires-Dist: Django<4.3,>=2.2
-Requires-Dist: djangorestframework<=3.14,>=3.7
-Requires-Dist: django-haystack<=3.2.1,>=2.8
+Requires-Dist: Django<5.2,>=2.2
+Requires-Dist: djangorestframework<3.16,>=3.12
+Requires-Dist: django-haystack<3.4,>=2.8
 Requires-Dist: python-dateutil
 
 Implements a ViewSet, FiltersBackends and Serializers in order to play nice with Haystack.

drf_haystack-1.9/drf_haystack.egg-info/requires.txt

@@ -0,0 +1,4 @@
+Django<5.2,>=2.2
+djangorestframework<3.16,>=3.12
+django-haystack<3.4,>=2.8
+python-dateutil

{drf-haystack-1.8.13 → drf_haystack-1.9}/setup.py

@@ -7,6 +7,7 @@ try:
     from setuptools import setup
 except ImportError:
     from ez_setup import use_setuptools
+
     use_setuptools()
     from setuptools import setup
 
@@ -18,6 +19,7 @@ def get_version(package):
     init_py = open(os.path.join(package, "__init__.py")).read()
     return re.search("__version__ = ['\"]([^'\"]+)['\"]", init_py).group(1)
 
+
 setup(
     name="drf-haystack",
     version=get_version("drf_haystack"),
@@ -33,15 +35,12 @@ setup(
     ],
     include_package_data=True,
     install_requires=[
-        "Django>=2.2,<4.3",
-        "djangorestframework>=3.7,<=3.14",
-        "django-haystack>=2.8,<=3.2.1",
-        "python-dateutil"
-    ],
-    tests_require=[
-        "nose",
-        "coverage"
+        "Django>=2.2,<5.2",
+        "djangorestframework>=3.12,<3.16",
+        "django-haystack>=2.8,<3.4",
+        "python-dateutil",
     ],
+    tests_require=["nose", "coverage"],
     zip_safe=False,
     test_suite="tests.run_tests.start",
     classifiers=[
@@ -54,5 +53,5 @@ setup(
         "Programming Language :: Python :: 3",
         "Topic :: Software Development :: Libraries :: Python Modules",
     ],
-    python_requires=">=3.7"
+    python_requires=">=3.7",
 )

{drf-haystack-1.8.13 → drf_haystack-1.9}/tests/test_serializers.py

@@ -9,7 +9,7 @@ import json
 from datetime import datetime, timedelta
 
 import six
-from django.conf.urls import url, include
+from django.urls import path, include
 from django.core.exceptions import ImproperlyConfigured
 from django.http import QueryDict
 from django.test import TestCase, SimpleTestCase, override_settings
@@ -90,7 +90,7 @@ router.register("search-person-mlt", viewset=SearchPersonMLTViewSet, basename="s
 router.register("search-person-facet", viewset=SearchPersonFacetViewSet, basename="search-person-facet")
 
 urlpatterns = [
-    url(r"^", include(router.urls))
+    path(r"^", include(router.urls))
 ]
 
 

{drf-haystack-1.8.13 → drf_haystack-1.9}/tests/urls.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-from django.conf.urls import include, url
+from django.urls import include, path
 
 from rest_framework import routers
 
@@ -11,5 +11,5 @@ router.register("search-person-facet", viewset=SearchPersonFacetViewSet, basenam
 router.register("search-person-mlt", viewset=SearchPersonMLTViewSet, basename="search-person-mlt")
 
 urlpatterns = [
-    url(r"^", include(router.urls))
+    path(r"^", include(router.urls))
 ]

drf-haystack-1.8.13/drf_haystack.egg-info/requires.txt

@@ -1,4 +0,0 @@
-Django<4.3,>=2.2
-djangorestframework<=3.14,>=3.7
-django-haystack<=3.2.1,>=2.8
-python-dateutil