Merge branch 'main' into fix-bibtex

habanero/crossref/crossref.py

@@ -117,19 +117,10 @@ class Crossref:
     One or more field queries. Field queries are searches on specific fields.
     For example, using `query_author` searches author names instead of full search
     across all fields as would happen by default. Acceptable field
-    query parameters are:
-
-    * `query_container_title` - Query container-title aka. publication name
-    * `query_author` - Query author given and family names
-    * `query_editor` - Query editor given and family names
-    * `query_chair` - Query chair given and family names
-    * `query_translator` - Query translator given and family names
-    * `query_contributor` - Query author, editor, chair and translator given and
-        family names
-    * `query_bibliographic` - Query bibliographic information, useful for citation
-        look up. Includes titles, authors, ISSNs and publication years. Crossref
-        retired `query_title`; use this field query instead
-    * `query_affiliation` - Query contributor affiliations
+    query parameters have all underscores where Crossref API documentation
+    has `.` or `-`. For example, `query.funder-name` using the Crossref API
+    should be `query_funder_name`. See "Field queries" under the Crossref API
+    documentation for the supported field queries.
 
     .. _sorting:
 

habanero/habanero_utils.py

@@ -95,8 +95,8 @@ def filter_dict(x):
 
 
 def rename_query_filters(x):
-    newkeys = [re.sub("container_title", "container-title", v) for v in x]
-    newkeys = [re.sub("query_", "query.", v) for v in newkeys]
+    newkeys = [re.sub("query_", "query.", v) for v in x]
+    newkeys = [re.sub("_", "-", v) for v in newkeys]
     mapping = dict(zip(x.keys(), newkeys))
     return {mapping[k]: v for k, v in x.items()}
 

requirements-dev.txt

@@ -1,3 +1,3 @@
 ruff==0.1.0
-black==23.12.0
+black==24.1.0
 isort==5.13.2