From 30c3d9622a0de85bb664020e7d948d5508b28725 Mon Sep 17 00:00:00 2001 From: Craig Anderson Date: Tue, 22 Oct 2019 13:33:57 +0100 Subject: [PATCH 1/3] Register mark with pytest --- pytest_freezegun.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pytest_freezegun.py b/pytest_freezegun.py index 8bd8573..d173c7e 100644 --- a/pytest_freezegun.py +++ b/pytest_freezegun.py @@ -43,5 +43,10 @@ def pytest_runtest_teardown(self): self.freezer = None self.frozen_time = None + def pytest_load_initial_conftests(self, early_config): + early_config.addinivalue_line( + "markers", "freeze_time: Freeze time using freezegun.", + ) + plugin = FreezegunPlugin() From ce17f85d89cfb43c3761dbbea3aa1349b4153776 Mon Sep 17 00:00:00 2001 From: Craig Anderson Date: Wed, 23 Oct 2019 17:32:31 +0100 Subject: [PATCH 2/3] Attempt to fix issue reported by Codacy (backed by pylint?) --- pytest_freezegun.py | 1 + 1 file changed, 1 insertion(+) diff --git a/pytest_freezegun.py b/pytest_freezegun.py index d173c7e..d5d884b 100644 --- a/pytest_freezegun.py +++ b/pytest_freezegun.py @@ -43,6 +43,7 @@ def pytest_runtest_teardown(self): self.freezer = None self.frozen_time = None + # pylint: disable=no-self-use def pytest_load_initial_conftests(self, early_config): early_config.addinivalue_line( "markers", "freeze_time: Freeze time using freezegun.", From ce2681569a40ed39f576b6af4be14e69473eaf1f Mon Sep 17 00:00:00 2001 From: Craig Anderson Date: Wed, 23 Oct 2019 17:37:36 +0100 Subject: [PATCH 3/3] Trying solution from pytest-dev/pytest/issues/4770 to fix build issues on appveyor. --- tox.ini | 1 + 1 file changed, 1 insertion(+) diff --git a/tox.ini b/tox.ini index a6c43e8..b8e1a78 100644 --- a/tox.ini +++ b/tox.ini @@ -5,6 +5,7 @@ envlist = {py27,py34,py35,py36,pypy}-{pt3,pt4},flake8 [testenv] deps = coverage + pip >= 19 pt3: pytest>=3,<4 pt4: pytest>=4,<5 commands = coverage run -p -m pytest tests/ {posargs}