Update pre-commit hooks

Author: acdha

.pre-commit-config.yaml

@@ -3,6 +3,10 @@ repos:
       rev: 5.9.3
       hooks:
           - id: isort
+    - repo: https://github.com/psf/black
+      rev: 21.9b0
+      hooks:
+          - id: black
     - repo: https://github.com/pre-commit/pre-commit-hooks
       rev: v4.0.1
       hooks:

pysolr.py

@@ -295,8 +295,9 @@ def __init__(self, decoded, next_page_query=None):
         self.qtime = decoded.get("responseHeader", {}).get("QTime", None)
         self.grouped = decoded.get("grouped", {})
         self.nextCursorMark = decoded.get("nextCursorMark", None)
-        self._next_page_query = self.nextCursorMark is not None \
-            and next_page_query or None
+        self._next_page_query = (
+            self.nextCursorMark is not None and next_page_query or None
+        )
 
     def __len__(self):
         if self._next_page_query:
@@ -844,10 +845,12 @@ def search(self, q, search_handler=None, **kwargs):
 
         cursorMark = params.get("cursorMark", None)
         if cursorMark != decoded.get("nextCursorMark", cursorMark):
+
             def next_page_query():
                 nextParams = params.copy()
                 nextParams["cursorMark"] = decoded["nextCursorMark"]
                 return self.search(search_handler=search_handler, **nextParams)
+
             return self.results_cls(decoded, next_page_query)
         else:
             return self.results_cls(decoded)
@@ -984,7 +987,7 @@ def add(
         waitSearcher=None,
         overwrite=None,
         handler="update",
-        min_rf=None
+        min_rf=None,
     ):
         """
         Adds or updates documents.
@@ -1121,14 +1124,14 @@ def delete(
             if doc_id:
                 et = ElementTree.Element("delete")
                 for one_doc_id in doc_id:
-                    subelem = ElementTree.SubElement(et, 'id')
+                    subelem = ElementTree.SubElement(et, "id")
                     subelem.text = one_doc_id
                 m = ElementTree.tostring(et)
             else:
                 raise ValueError("The list of documents to delete was empty.")
         elif q is not None:
             et = ElementTree.Element("delete")
-            subelem = ElementTree.SubElement(et, 'query')
+            subelem = ElementTree.SubElement(et, "query")
             subelem.text = q
             m = ElementTree.tostring(et)
 
@@ -1335,7 +1338,7 @@ def _get_url(self, url, params=None, headers=None):
         if params is None:
             params = {}
         if headers is None:
-            headers = {'Content-Type': 'application/x-www-form-urlencoded'}
+            headers = {"Content-Type": "application/x-www-form-urlencoded"}
 
         resp = requests.get(url, data=safe_urlencode(params), headers=headers)
         return force_unicode(resp.content)

setup.cfg

@@ -2,12 +2,13 @@
 universal = 1
 
 [flake8]
-exclude = .venv,node_modules,concordia/settings_dev_*.py
+exclude = .venv,node_modules
 max-line-length = 88
 enable-extensions = G
 
 [isort]
 default_section = THIRDPARTY
+ensure_newline_before_comments = True
 force_grid_wrap = 0
 include_trailing_comma = True
 known_first_party = pysolr

tests/test_client.py

@@ -281,10 +281,10 @@ def test_custom_results_class(self):
         self.assertIn("response", results)
 
     def test_cursor_traversal(self):
-        solr = Solr('http://localhost:8983/solr/core0')
+        solr = Solr("http://localhost:8983/solr/core0")
 
-        expected = solr.search(q="*:*", rows=len(self.docs)*3, sort="id asc").docs
-        results = solr.search(q='*:*', cursorMark="*", rows=2, sort="id asc")
+        expected = solr.search(q="*:*", rows=len(self.docs) * 3, sort="id asc").docs
+        results = solr.search(q="*:*", cursorMark="*", rows=2, sort="id asc")
         all_docs = list(results)
         self.assertEqual(len(expected), len(all_docs))
         self.assertEqual(len(results), len(all_docs))
@@ -760,12 +760,7 @@ def test__build_xml_doc_with_empty_values_and_field_updates(self):
         self.assertEqual(len(doc_xml), 134)
 
     def test_build_json_doc_matches_xml(self):
-        doc = {
-            "id": "doc_1",
-            "title": "",
-            "price": 12.59,
-            "popularity": 10
-        }
+        doc = {"id": "doc_1", "title": "", "price": 12.59, "popularity": 10}
 
         doc_json = self.solr._build_json_doc(doc)
         doc_xml = self.solr._build_xml_doc(doc)
@@ -912,10 +907,10 @@ def test_delete(self):
 
         # Test a query that would need to be quoted when using the XML API.
         # Ids with a "<" character will give an error using v3.9.0 or earlier
-        self.solr.delete(id='cats<dogs')
+        self.solr.delete(id="cats<dogs")
         # These will delete too much when using v3.9.0 or earlier.
-        self.solr.delete(q='id:*</query><query> id:999 AND id:9999')
-        self.solr.delete(id='doc_4</id><id>doc_3', commit=True)
+        self.solr.delete(q="id:*</query><query> id:999 AND id:9999")
+        self.solr.delete(id="doc_4</id><id>doc_3", commit=True)
 
         # one simple doc should remain
         # parent documents were also deleted but children remain as orphans