From fa54ce5cef385e88d06785557365bccfa2f7a386 Mon Sep 17 00:00:00 2001 From: Dhaval Gojiya Date: Mon, 17 Nov 2025 14:08:45 +0530 Subject: [PATCH 1/2] fix: Update Ruff target Python marker to minimum supported version 3.10 --- pyproject.toml | 2 +- pysolr.py | 2 +- tests/test_client.py | 10 +++++----- tox.ini | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index db51ef2..383f16a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,5 +1,5 @@ [tool.ruff] -target-version = "py37" +target-version = "py310" lint.select = [ "A", # flake8-builtins diff --git a/pysolr.py b/pysolr.py index 9940121..e32e0db 100644 --- a/pysolr.py +++ b/pysolr.py @@ -802,7 +802,7 @@ def suggest_terms(self, fields, prefix, handler="terms", **kwargs): # in Solr 3+ the value of terms is a dict of field name and a flat list of # value, count pairs: {"field_name": ["dance", 23, "dancers", 10, …]} if isinstance(terms, (list, tuple)): - terms = dict(zip(terms[0::2], terms[1::2])) + terms = dict(zip(terms[0::2], terms[1::2], strict=False)) for field, values in terms.items(): tmp = [] diff --git a/tests/test_client.py b/tests/test_client.py index a1818d6..6666593 100644 --- a/tests/test_client.py +++ b/tests/test_client.py @@ -833,7 +833,7 @@ def test_field_update_inc(self): updatedDocs = self.solr.search("doc") self.assertEqual(len(updatedDocs), 3) - for originalDoc, updatedDoc in zip(originalDocs, updatedDocs): + for originalDoc, updatedDoc in zip(originalDocs, updatedDocs, strict=False): self.assertEqual(len(updatedDoc.keys()), len(originalDoc.keys())) self.assertEqual(updatedDoc["popularity"], originalDoc["popularity"] + 5) # TODO: change this to use assertSetEqual: @@ -856,7 +856,7 @@ def test_field_update_set(self): updatedDocs = self.solr.search("doc") self.assertEqual(len(updatedDocs), 3) - for originalDoc, updatedDoc in zip(originalDocs, updatedDocs): + for originalDoc, updatedDoc in zip(originalDocs, updatedDocs, strict=False): self.assertEqual(len(updatedDoc.keys()), len(originalDoc.keys())) self.assertEqual(updatedDoc["popularity"], updated_popularity) # TODO: change this to use assertSetEqual: @@ -894,7 +894,7 @@ def test_field_update_add(self): updatedDocs = self.solr.search("multivalued") self.assertEqual(len(updatedDocs), 2) - for originalDoc, updatedDoc in zip(originalDocs, updatedDocs): + for originalDoc, updatedDoc in zip(originalDocs, updatedDocs, strict=False): self.assertEqual(len(updatedDoc.keys()), len(originalDoc.keys())) self.assertEqual( updatedDoc["word_ss"], originalDoc["word_ss"] + ["epsilon", "gamma"] @@ -995,7 +995,7 @@ def test_can_handles_default_commit_policy(self): expected_commits = [False, True, False] commit_arg = [False, True, None] - for expected_commit, arg in zip(expected_commits, commit_arg): + for expected_commit, arg in zip(expected_commits, commit_arg, strict=False): self.solr.add([{"id": "doc_6", "title": "Newly added doc"}], commit=arg) args, _ = self.solr._send_request.call_args committing_in_url = "commit" in args[1] @@ -1201,7 +1201,7 @@ def test_can_handles_default_commit_policy(self): expected_commits = [False, True, True] commit_arg = [False, True, None] - for expected_commit, arg in zip(expected_commits, commit_arg): + for expected_commit, arg in zip(expected_commits, commit_arg, strict=False): self.solr.add(self.docs, commit=arg) args, _ = self.solr._send_request.call_args committing_in_url = "commit" in args[1] diff --git a/tox.ini b/tox.ini index bd13255..d85df19 100644 --- a/tox.ini +++ b/tox.ini @@ -4,7 +4,7 @@ envlist = py310,py311,py312,py313,py314,py314t,pypy3 [base] deps = kazoo - requests>=2.0 + requests>=2.32.5 [testenv] allowlist_externals = {toxinidir}/run-tests.py From 832c05ebbec4038a94a40a6436ec6a37dc18b9e1 Mon Sep 17 00:00:00 2001 From: Dhaval Gojiya Date: Tue, 18 Nov 2025 17:07:55 +0530 Subject: [PATCH 2/2] fix: Update zip() function argument updated from strict=False to strict=True --- pysolr.py | 2 +- tests/test_client.py | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pysolr.py b/pysolr.py index e32e0db..4b3555a 100644 --- a/pysolr.py +++ b/pysolr.py @@ -802,7 +802,7 @@ def suggest_terms(self, fields, prefix, handler="terms", **kwargs): # in Solr 3+ the value of terms is a dict of field name and a flat list of # value, count pairs: {"field_name": ["dance", 23, "dancers", 10, …]} if isinstance(terms, (list, tuple)): - terms = dict(zip(terms[0::2], terms[1::2], strict=False)) + terms = dict(zip(terms[0::2], terms[1::2], strict=True)) for field, values in terms.items(): tmp = [] diff --git a/tests/test_client.py b/tests/test_client.py index 6666593..ddc9327 100644 --- a/tests/test_client.py +++ b/tests/test_client.py @@ -833,7 +833,7 @@ def test_field_update_inc(self): updatedDocs = self.solr.search("doc") self.assertEqual(len(updatedDocs), 3) - for originalDoc, updatedDoc in zip(originalDocs, updatedDocs, strict=False): + for originalDoc, updatedDoc in zip(originalDocs, updatedDocs, strict=True): self.assertEqual(len(updatedDoc.keys()), len(originalDoc.keys())) self.assertEqual(updatedDoc["popularity"], originalDoc["popularity"] + 5) # TODO: change this to use assertSetEqual: @@ -856,7 +856,7 @@ def test_field_update_set(self): updatedDocs = self.solr.search("doc") self.assertEqual(len(updatedDocs), 3) - for originalDoc, updatedDoc in zip(originalDocs, updatedDocs, strict=False): + for originalDoc, updatedDoc in zip(originalDocs, updatedDocs, strict=True): self.assertEqual(len(updatedDoc.keys()), len(originalDoc.keys())) self.assertEqual(updatedDoc["popularity"], updated_popularity) # TODO: change this to use assertSetEqual: @@ -894,7 +894,7 @@ def test_field_update_add(self): updatedDocs = self.solr.search("multivalued") self.assertEqual(len(updatedDocs), 2) - for originalDoc, updatedDoc in zip(originalDocs, updatedDocs, strict=False): + for originalDoc, updatedDoc in zip(originalDocs, updatedDocs, strict=True): self.assertEqual(len(updatedDoc.keys()), len(originalDoc.keys())) self.assertEqual( updatedDoc["word_ss"], originalDoc["word_ss"] + ["epsilon", "gamma"] @@ -995,7 +995,7 @@ def test_can_handles_default_commit_policy(self): expected_commits = [False, True, False] commit_arg = [False, True, None] - for expected_commit, arg in zip(expected_commits, commit_arg, strict=False): + for expected_commit, arg in zip(expected_commits, commit_arg, strict=True): self.solr.add([{"id": "doc_6", "title": "Newly added doc"}], commit=arg) args, _ = self.solr._send_request.call_args committing_in_url = "commit" in args[1] @@ -1201,7 +1201,7 @@ def test_can_handles_default_commit_policy(self): expected_commits = [False, True, True] commit_arg = [False, True, None] - for expected_commit, arg in zip(expected_commits, commit_arg, strict=False): + for expected_commit, arg in zip(expected_commits, commit_arg, strict=True): self.solr.add(self.docs, commit=arg) args, _ = self.solr._send_request.call_args committing_in_url = "commit" in args[1]