detox

tests/conftest.py

@@ -3,6 +3,7 @@
 from unittest import mock
 
 import pytest
+
 # from pynamodb.attributes import UnicodeAttribute
 # from pynamodb.models import Model
 
@@ -11,13 +12,11 @@
 from moto import mock_dynamodb
 from toshi_hazard_store import model
 
-# @pytest.fixture(autouse=True)
+
+@pytest.fixture()
 def setenvvar(tmp_path):
     # ref https://adamj.eu/tech/2020/10/13/how-to-mock-environment-variables-with-pytest/
-    envvars = {
-        "THS_SQLITE_FOLDER": str(tmp_path),
-        "THS_USE_SQLITE_ADAPTER": "TRUE"
-    }
+    envvars = {"THS_SQLITE_FOLDER": str(tmp_path), "THS_USE_SQLITE_ADAPTER": "TRUE"}
     with mock.patch.dict(os.environ, envvars, clear=True):
         yield  # This is the magical bit which restore the environment after
 
@@ -29,6 +28,7 @@ def adapter_model():
         yield model
         model.drop_tables()
 
+
 @pytest.fixture()
 def get_one_meta():
     with mock_dynamodb():
@@ -50,4 +50,4 @@ def get_one_meta():
             src_lt=json.dumps(dict(sources=[1, 2])),  # sources meta as DataFrame JSON
             gsim_lt=json.dumps(dict(gsims=[1, 2])),  # gmpe meta as DataFrame JSON
             rlz_lt=json.dumps(dict(rlzs=[1, 2])),  # realization meta as DataFrame JSON
-        )
+        )

tests/test_pynamo_models_v3.py

@@ -1,4 +1,3 @@
-import json
 import unittest
 
 import pynamodb.exceptions
@@ -7,6 +6,7 @@
 
 from toshi_hazard_store import model
 
+
 def get_one_rlz():
     imtvs = []
     for t in ['PGA', 'SA(0.5)', 'SA(1.0)']:
@@ -35,13 +35,11 @@ def get_one_hazard_aggregate():
     ).set_location(location)
 
 
-
 # MAKE this test both pynamo and sqlite
 class TestPynamoMeta(object):
-
     def test_table_exists(self, adapter_model):
-        assert adapter_model.OpenquakeRealization.exists() == True
-        assert adapter_model.ToshiOpenquakeMeta.exists() == True
+        assert adapter_model.OpenquakeRealization.exists()
+        assert adapter_model.ToshiOpenquakeMeta.exists()
 
     def test_save_one_meta_object(self, get_one_meta):
         obj = get_one_meta

tests/v2/test_pynamo_models.py

@@ -1,9 +1,6 @@
-import pytest
-
 class TestPynamoMeta(object):
-
     def test_meta_table_exists(self, adapter_model):
-        assert adapter_model.ToshiOpenquakeMeta.exists() == True
+        assert adapter_model.ToshiOpenquakeMeta.exists()
 
     def test_save_one_meta_object(self, get_one_meta):
         obj = get_one_meta