diff --git a/pyndl/__init__.py b/pyndl/__init__.py index 47d540b..f216b39 100644 --- a/pyndl/__init__.py +++ b/pyndl/__init__.py @@ -17,7 +17,7 @@ __author__ = ('Konstantin Sering, Marc Weitz, ' 'David-Elias Künstle, Lennard Schneider') __author_email__ = 'konstantin.sering@uni-tuebingen.de' -__version__ = '0.6.4' +__version__ = '0.7.0' __license__ = 'MIT' __description__ = ('Naive discriminative learning implements learning and ' 'classification models based on the Rescorla-Wagner ' diff --git a/tests/conftest.py b/tests/conftest.py index a5fad37..b96e7ca 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -9,6 +9,7 @@ def pytest_addoption(parser): parser.addoption("--runslow", action="store_true", help="run slow tests") + def pytest_runtest_setup(item): if 'runslow' in item.keywords and not item.config.getoption("--runslow"): pytest.skip("need --runslow option to run this test") diff --git a/tox.ini b/tox.ini index 54566e3..a1321db 100644 --- a/tox.ini +++ b/tox.ini @@ -3,7 +3,7 @@ envlist = py{35,36}-test, checkstyle, documentation [testenv] usedevelop = True -whitelist_externals=/bin/rm +whitelist_externals=rm deps = test: pytest -rrequirements.txt @@ -13,7 +13,7 @@ commands = [testenv:testdoc] usedevelop = True -whitelist_externals=/bin/rm +whitelist_externals=rm deps = pytest commands =