From e6c92cb3b1e3a7cec368a44e508afe4da5c0eec4 Mon Sep 17 00:00:00 2001 From: Dwayne Bailey Date: Tue, 23 Aug 2016 14:06:09 +0100 Subject: [PATCH] Req: bump to pytest 3.0.0 Adapt MonkeyPatch Adapt setup.cfg --- pytest_pootle/fixtures/mock.py | 4 ++-- requirements/tests.txt | 2 +- setup.cfg | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pytest_pootle/fixtures/mock.py b/pytest_pootle/fixtures/mock.py index 3c860e85fb3..9b5848a2f2e 100644 --- a/pytest_pootle/fixtures/mock.py +++ b/pytest_pootle/fixtures/mock.py @@ -8,10 +8,10 @@ """Monkeypatching fixtures.""" -from _pytest.monkeypatch import monkeypatch +from _pytest.monkeypatch import MonkeyPatch -mp = monkeypatch() +mp = MonkeyPatch() class FakeJob(object): diff --git a/requirements/tests.txt b/requirements/tests.txt index b1d5a9acb39..801717f24db 100644 --- a/requirements/tests.txt +++ b/requirements/tests.txt @@ -1,7 +1,7 @@ # Testing factory_boy>=2.5.2 -pytest<3.0.0 +pytest==3.0.0 pytest-catchlog pytest-cov pytest-django>=2.8,<2.9 diff --git a/setup.cfg b/setup.cfg index dc280dbdb9f..e9f1c9b2c15 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,4 +1,4 @@ -[pytest] +[tool:pytest] python_files=*.py addopts=--nomigrations --tb=short tests norecursedirs=.git _build tmp* requirements commands/*