From c56d7ac40e795494a0f6b445402dec5d36b9f5ed Mon Sep 17 00:00:00 2001 From: David Szotten Date: Sun, 14 Oct 2018 09:23:21 +0100 Subject: [PATCH] move files into the pytest file structure --- pytest_stepwise/__init__.py | 1 - pytest_stepwise/compat.py | 18 ------------------ .../plugin.py => src/_pytest/stepwise.py | 0 .../test_stepwise.py | 0 tests/conftest.py | 1 - 5 files changed, 20 deletions(-) delete mode 100644 pytest_stepwise/__init__.py delete mode 100644 pytest_stepwise/compat.py rename pytest_stepwise/plugin.py => src/_pytest/stepwise.py (100%) rename tests/test_pytest_stepwise.py => testing/test_stepwise.py (100%) delete mode 100644 tests/conftest.py diff --git a/pytest_stepwise/__init__.py b/pytest_stepwise/__init__.py deleted file mode 100644 index 58d168b07..000000000 --- a/pytest_stepwise/__init__.py +++ /dev/null @@ -1 +0,0 @@ -__version__ = '0.4' diff --git a/pytest_stepwise/compat.py b/pytest_stepwise/compat.py deleted file mode 100644 index a1cc1e986..000000000 --- a/pytest_stepwise/compat.py +++ /dev/null @@ -1,18 +0,0 @@ -import pytest - -try: - from _pytest.cacheprovider import Cache -except ImportError: - from pytest_cache import Cache - -try: - # pytest 3.7+ - Cache = Cache.for_config -except AttributeError: - pass - - -if hasattr(pytest, 'hookimpl'): - tryfirst = pytest.hookimpl(tryfirst=True) -else: - tryfirst = pytest.mark.tryfirst diff --git a/pytest_stepwise/plugin.py b/src/_pytest/stepwise.py similarity index 100% rename from pytest_stepwise/plugin.py rename to src/_pytest/stepwise.py diff --git a/tests/test_pytest_stepwise.py b/testing/test_stepwise.py similarity index 100% rename from tests/test_pytest_stepwise.py rename to testing/test_stepwise.py diff --git a/tests/conftest.py b/tests/conftest.py deleted file mode 100644 index bc711e55f..000000000 --- a/tests/conftest.py +++ /dev/null @@ -1 +0,0 @@ -pytest_plugins = 'pytester'