Skip to content

Commit

Permalink
fix #275: upgrade py.test to > 4.0
Browse files Browse the repository at this point in the history
  • Loading branch information
schettino72 committed Jan 19, 2019
1 parent e52a2f2 commit 08e9c0b
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion dev_requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
# $ pip install --requirement dev_requirements.txt

pyflakes
pytest>=2.8.0,<4.0
pytest>=4.0
coverage>=4.0
doit-py>=0.4.0
2 changes: 1 addition & 1 deletion dodo.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ def task_pyflakes():
yield flaker.tasks('tests/*.py')

def run_test(test):
return not bool(pytest.main(test))
return not bool(pytest.main([test]))
#return not bool(pytest.main("-v " + test))
def task_ut():
"""run unit-tests"""
Expand Down
6 changes: 3 additions & 3 deletions tests/test_dependency.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
from doit.dependency import DatabaseException, UptodateCalculator
from doit.dependency import FileChangedChecker, MD5Checker, TimestampChecker
from doit.dependency import DependencyStatus
from .conftest import get_abspath, dep_manager
from .conftest import get_abspath

#path to test folder
TEST_PATH = os.path.dirname(__file__)
Expand Down Expand Up @@ -67,8 +67,8 @@ def test_sqlite_import():
# create a separate fixture to be used only by this module
# because only here it is required to test with all backends
@pytest.fixture(params=[JsonDB, DbmDB, SqliteDB])
def pdep_manager(request):
return dep_manager(request)
def pdep_manager(dep_manager):
return dep_manager


# FIXME there was major refactor breaking classes from dependency,
Expand Down

0 comments on commit 08e9c0b

Please sign in to comment.