Merge branch 'master' of https://github.com/mscarey/AuthoritySpoke

mscarey · Mar 5, 2021 · 570fb44 · 570fb44
2 parents edddeea + 6da9ded
commit 570fb44
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/authorityspoke/io/api_spec.py b/authorityspoke/io/api_spec.py
@@ -28,7 +28,7 @@ def make_spec() -> APISpec:
     for factor_name in factor_names:
         factor_options.append({"$ref": f"#/components/schemas/{factor_name}"})
 
-    del holding_spec.components._schemas["Factor"]
+    del holding_spec.components.schemas["Factor"]
 
     holding_spec.components.schema(
         "Factor",

diff --git a/requirements-dev.txt b/requirements-dev.txt
@@ -4,7 +4,6 @@ doc8
 flake8-comprehensions
 ipykernel
 mypy
-pipenv-to-requirements
 pydocstyle
 pytest-cov
 pytest-profiling

diff --git a/requirements.txt b/requirements.txt
@@ -1,5 +1,5 @@
 anchorpoint>=0.4.4
-apispec[validation]
+apispec[validation]~=4.3.0
 marshmallow>=3.10
 legislice>=0.4.1
 nettlesome>=0.2.0

diff --git a/tests/test_entities.py b/tests/test_entities.py
@@ -20,7 +20,9 @@ def test_make_entity_from_str_without_mentioned(self):
 
     def test_conversion_to_generic(self, make_entity):
         e = make_entity
-        assert e["motel_specific"].make_generic().compare_keys(e["motel"])
+        assert e["motel_specific"].generic is False
+        new = e["motel_specific"].make_generic()
+        assert new.generic is True
 
     def test_repr_equal_after_make_generic(self, make_entity):
         """