Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package python-django-haystack for
openSUSE:Factory checked in at 2024-02-11 15:46:19
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-django-haystack (Old)
and /work/SRC/openSUSE:Factory/.python-django-haystack.new.1815 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-django-haystack"
Sun Feb 11 15:46:19 2024 rev:10 rq:1145943 version:3.2.1
Changes:
--------
---
/work/SRC/openSUSE:Factory/python-django-haystack/python-django-haystack.changes
2024-01-14 19:03:18.415009964 +0100
+++
/work/SRC/openSUSE:Factory/.python-django-haystack.new.1815/python-django-haystack.changes
2024-02-11 15:46:23.904453155 +0100
@@ -1,0 +2,5 @@
+Fri Feb 9 12:32:21 UTC 2024 - Markéta Machová <mmach...@suse.com>
+
+- Add upstream patch unittest312.patch to fix unittest asserts
+
+-------------------------------------------------------------------
New:
----
unittest312.patch
BETA DEBUG BEGIN:
New:
- Add upstream patch unittest312.patch to fix unittest asserts
BETA DEBUG END:
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-django-haystack.spec ++++++
--- /var/tmp/diff_new_pack.qNJDBw/_old 2024-02-11 15:46:25.128497165 +0100
+++ /var/tmp/diff_new_pack.qNJDBw/_new 2024-02-11 15:46:25.128497165 +0100
@@ -27,6 +27,8 @@
# pkg_resources is broken since the flufl.lock update in Factory
# https://github.com/django-haystack/django-haystack/pull/1935
Patch: gh-pr-1935_importlib.patch
+# PATCH-FIX-UPSTREAM
https://github.com/django-haystack/django-haystack/commit/3a566a50e4963bed4fb8853eca60bc894b0b7fc5
Fix unittest assert calls for Python 3.12
+Patch: unittest312.patch
BuildRequires: %{python_module setuptools_scm}
BuildRequires: %{python_module setuptools}
BuildRequires: fdupes
++++++ unittest312.patch ++++++
>From 3a566a50e4963bed4fb8853eca60bc894b0b7fc5 Mon Sep 17 00:00:00 2001
From: Christian Clauss <ccla...@me.com>
Date: Mon, 1 Jan 2024 19:53:28 +0100
Subject: [PATCH] Fix unittest assert calls for Python 3.12
---
test_haystack/test_managers.py | 4 ++--
test_haystack/test_query.py | 20 ++++++++++----------
2 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/test_haystack/test_managers.py b/test_haystack/test_managers.py
index 3784217cd..cc600752e 100644
--- a/test_haystack/test_managers.py
+++ b/test_haystack/test_managers.py
@@ -242,11 +242,11 @@ def spelling_suggestion(self):
def test_values(self):
sqs = self.search_index.objects.auto_query("test").values("id")
- self.assert_(isinstance(sqs, ValuesSearchQuerySet))
+ self.assertIsInstance(sqs, ValuesSearchQuerySet)
def test_valueslist(self):
sqs = self.search_index.objects.auto_query("test").values_list("id")
- self.assert_(isinstance(sqs, ValuesListSearchQuerySet))
+ self.assertIsInstance(sqs, ValuesListSearchQuerySet)
class CustomManagerTestCase(TestCase):
diff --git a/test_haystack/test_query.py b/test_haystack/test_query.py
index ffe35c19a..f7e9a1707 100644
--- a/test_haystack/test_query.py
+++ b/test_haystack/test_query.py
@@ -442,7 +442,7 @@ def test_len(self):
def test_repr(self):
reset_search_queries()
self.assertEqual(len(connections["default"].queries), 0)
- self.assertRegexpMatches(
+ self.assertRegex(
repr(self.msqs),
r"^<SearchQuerySet: query=<test_haystack.mocks.MockSearchQuery
object"
r" at 0x[0-9A-Fa-f]+>, using=None>$",
@@ -967,18 +967,18 @@ def test_or_and(self):
class ValuesQuerySetTestCase(SearchQuerySetTestCase):
def test_values_sqs(self):
sqs = self.msqs.auto_query("test").values("id")
- self.assert_(isinstance(sqs, ValuesSearchQuerySet))
+ self.assertIsInstance(sqs, ValuesSearchQuerySet)
# We'll do a basic test to confirm that slicing works as expected:
- self.assert_(isinstance(sqs[0], dict))
- self.assert_(isinstance(sqs[0:5][0], dict))
+ self.assertIsInstance(sqs[0], dict)
+ self.assertIsInstance(sqs[0:5][0], dict)
def test_valueslist_sqs(self):
sqs = self.msqs.auto_query("test").values_list("id")
- self.assert_(isinstance(sqs, ValuesListSearchQuerySet))
- self.assert_(isinstance(sqs[0], (list, tuple)))
- self.assert_(isinstance(sqs[0:1][0], (list, tuple)))
+ self.assertIsInstance(sqs, ValuesListSearchQuerySet)
+ self.assertIsInstance(sqs[0], (list, tuple))
+ self.assertIsInstance(sqs[0:1][0], (list, tuple))
self.assertRaises(
TypeError,
@@ -989,12 +989,12 @@ def test_valueslist_sqs(self):
)
flat_sqs = self.msqs.auto_query("test").values_list("id", flat=True)
- self.assert_(isinstance(sqs, ValuesListSearchQuerySet))
+ self.assertIsInstance(sqs, ValuesListSearchQuerySet)
# Note that this will actually be None because a mocked sqs lacks
# anything else:
- self.assert_(flat_sqs[0] is None)
- self.assert_(flat_sqs[0:1][0] is None)
+ self.assertIsNone(flat_sqs[0])
+ self.assertIsNone(flat_sqs[0:1][0])
class EmptySearchQuerySetTestCase(TestCase):
