diff --git a/amsd/scripts/initializedb.py b/amsd/scripts/initializedb.py index b3fa400..2a848a9 100644 --- a/amsd/scripts/initializedb.py +++ b/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 diff --git a/development.ini b/development.ini index 5d687df..7f250c1 100644 --- a/development.ini +++ b/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 diff --git a/setup.cfg b/setup.cfg index 8e3644f..3d0a1a2 100644 --- a/setup.cfg +++ b/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 diff --git a/tests/conftest.py b/tests/conftest.py index f56e0fa..97fc9a6 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -1,2 +1,7 @@ -from amsd import models import pytest + + +@pytest.fixture +def data(): + pass + diff --git a/tests/test_scripts.py b/tests/test_scripts.py index 257f9bc..6ac65f3 100644 --- a/tests/test_scripts.py +++ b/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)