Merge branch 'bnewbold-bugfixes' into 'master'

fix tests; dynaconf dependency; handle fatcat API release lookup 404

See merge request webgroup/fuzzycat!3

6 files changed, 8 insertions, 10 deletions

diff --git a/fuzzycat/__main__.py b/fuzzycat/__main__.py
index 43691e8..10c856d 100644
--- a/fuzzycat/__main__.py
+++ b/fuzzycat/__main__.py
@@ -60,7 +60,6 @@ import io
 import json
 import logging
 import pstats
-import random
 import sys
 import tempfile
 
diff --git a/fuzzycat/cluster.py b/fuzzycat/cluster.py
index d859507..4e70bdd 100644
--- a/fuzzycat/cluster.py
+++ b/fuzzycat/cluster.py
@@ -58,15 +58,12 @@ Features and integration.
 """
 
 import collections
-import fileinput
 import itertools
 import json
-import logging
 import multiprocessing
 import operator
 import os
 import re
-import string
 import subprocess
 import sys
 import tempfile
diff --git a/fuzzycat/grobid_unstructured.py b/fuzzycat/grobid_unstructured.py
index 4f09bce..79c39d3 100644
--- a/fuzzycat/grobid_unstructured.py
+++ b/fuzzycat/grobid_unstructured.py
@@ -11,7 +11,7 @@ TODO: more general versions which handle multiple reference strings in a batch?
 import io
 import sys
 import xml.etree.ElementTree as ET
-from typing import Any, Optional, Tuple
+from typing import Optional
 
 import requests
 from fatcat_openapi_client import ReleaseContrib, ReleaseEntity, ReleaseExtIds
diff --git a/fuzzycat/matching.py b/fuzzycat/matching.py
index 55a5833..683d859 100644
--- a/fuzzycat/matching.py
+++ b/fuzzycat/matching.py
@@ -7,7 +7,6 @@ import elasticsearch
 import elasticsearch_dsl
 import fatcat_openapi_client
 import requests
-from dynaconf import Dynaconf
 from fatcat_openapi_client import ContainerEntity, DefaultApi, ReleaseEntity
 from fatcat_openapi_client.rest import ApiException
 
@@ -64,7 +63,13 @@ def match_release_fuzzy(
         value = getattr(ext_ids, attr)
         if not value:
             continue
-        r = api.lookup_release(**{attr: value})
+        try:
+            r = api.lookup_release(**{attr: value})
+        except fatcat_openapi_client.rest.ApiException as err:
+            if err.status in [404, 400]:
+                r = None
+            else:
+                raise err
         if r:
             return [r]
 
diff --git a/fuzzycat/refs.py b/fuzzycat/refs.py
index e2c3043..828bf2f 100644
--- a/fuzzycat/refs.py
+++ b/fuzzycat/refs.py
@@ -1,12 +1,10 @@
 import collections
-import itertools
 import json
 import operator
 import sys
 
 from glom import PathAccessError, glom
 
-from fuzzycat.common import Reason, Status
 from fuzzycat.verify import verify
 
 
diff --git a/fuzzycat/utils.py b/fuzzycat/utils.py
index 8e1ffb0..d37ee32 100644
--- a/fuzzycat/utils.py
+++ b/fuzzycat/utils.py
@@ -1,5 +1,4 @@
 import collections
-import io
 import itertools
 import os
 import random