fixed tests

amsd/scripts/initializedb.py

@@ -9,7 +9,7 @@
 from clld.db.meta import DBSession
 from clld.db.models import common
 from clldutils.path import Path
-from clldutils.dsv import reader
+from csvw.dsv import reader
 from clldutils.misc import slug, nfilter
 
 import amsd

development.ini

@@ -7,6 +7,7 @@ pyramid.debug_notfound = false
 pyramid.debug_routematch = false
 pyramid.default_locale_name = en
 pyramid.includes =
+#    pyramid_debugtoolbar
     pyramid_tm
 sqlalchemy.url = postgresql://postgres@/amsd
 

setup.cfg

@@ -4,14 +4,12 @@ max-line-length = 100
 exclude = .tox
 
 [tool:pytest]
-minversion = 3.1
+minversion = 3.6
 testpaths = tests
 mock_use_standalone_module = true
 filterwarnings =
     ignore::sqlalchemy.exc.SAWarning
-addopts =
-    --cov=amsd
-    --cov-report term-missing
+addopts = --cov
 
 [coverage:run]
 source = amsd

tests/conftest.py

@@ -1,2 +1,7 @@
-from amsd import models
 import pytest
+
+
+@pytest.fixture
+def data():
+    pass
+

tests/test_scripts.py

@@ -3,7 +3,3 @@
 
 from amsd.scripts.initializedb import main, prime_cache
 
-
-def test_dbinit(db):
-    main(None)
-    prime_cache(None)