Bump pytest-cov from 2.10.1 to 2.11.1

optimade/filtertransformers/elasticsearch.py

@@ -4,6 +4,7 @@
 from elasticsearch_dsl import Q, Text, Keyword, Integer, Field
 from optimade.models import CHEMICAL_SYMBOLS, ATOMIC_NUMBERS
 from optimade.filtertransformers import BaseTransformer
+from optimade.server.exceptions import BadRequest
 
 __all__ = ("ElasticTransformer",)
 
@@ -352,7 +353,7 @@ def property(self, args):
         quantity_name = args[0]
 
         if quantity_name not in self.index_mapping:
-            raise Exception("%s is not a searchable quantity" % quantity_name)
+            raise BadRequest(detail=f"{quantity_name} is not a searchable quantity")
 
         quantity = self.index_mapping.get(quantity_name, None)
         if quantity is None:

optimade/server/exception_handlers.py

@@ -14,6 +14,7 @@
 from optimade.server.config import CONFIG
 from optimade.server.logger import LOGGER
 from optimade.server.routers.utils import meta_values
+from optimade.server.exceptions import BadRequest
 
 
 def general_exception(
@@ -91,6 +92,10 @@ def validation_exception_handler(request: Request, exc: ValidationError):
 
 
 def grammar_not_implemented_handler(request: Request, exc: VisitError):
+    orig_exc = getattr(exc, "orig_exc", None)
+    if isinstance(orig_exc, BadRequest):
+        return general_exception(request, orig_exc)
+
     rule = getattr(exc.obj, "data", getattr(exc.obj, "type", str(exc)))
 
     status = 501

requirements-dev.txt

@@ -1,5 +1,5 @@
 pytest==6.2.1
-pytest-cov==2.10.1
+pytest-cov==2.11.1
 codecov==2.1.11
 jsondiff==1.2.0
 pylint==2.6.0