diff --git a/noxfile.py b/noxfile.py index ba7c1dd6..07c75a84 100644 --- a/noxfile.py +++ b/noxfile.py @@ -132,7 +132,7 @@ def tests(session: PowerSession, coverage, pkg_specs): # finally run all tests if not coverage: # simple: pytest only - session.run2("python -m pytest --cache-clear -v %s/tests/" % pkg_name) + session.run2("python -m pytest --cache-clear -v tests/") else: # coverage + junit html reports + badge generation session.install_reqs(phase="coverage", @@ -140,8 +140,8 @@ def tests(session: PowerSession, coverage, pkg_specs): versions_dct=pkg_specs) # --coverage + junit html reports - session.run2("coverage run --source {pkg_name} " - "-m pytest --cache-clear --junitxml={test_xml} --html={test_html} -v {pkg_name}/tests/" + session.run2("coverage run --source src/{pkg_name} " + "-m pytest --cache-clear --junitxml={test_xml} --html={test_html} -v tests/" "".format(pkg_name=pkg_name, test_xml=Folders.test_xml, test_html=Folders.test_html)) session.run2("coverage report") session.run2("coverage xml -o {covxml}".format(covxml=Folders.coverage_xml)) @@ -168,6 +168,8 @@ def flake8(session: PowerSession): Folders.flake8_reports.mkdir(parents=True, exist_ok=True) rm_file(Folders.flake8_intermediate_file) + session.cd("src") + # Options are set in `setup.cfg` file session.run("flake8", pkg_name, "--exit-zero", "--format=html", "--htmldir", str(Folders.flake8_reports), "--statistics", "--tee", "--output-file", str(Folders.flake8_intermediate_file)) diff --git a/setup.cfg b/setup.cfg index 0065eee2..339d195d 100644 --- a/setup.cfg +++ b/setup.cfg @@ -59,12 +59,15 @@ tests_require = zip_safe = False # explicitly setting zip_safe=False to avoid downloading `ply` see https://github.com/smarie/python-getversion/pull/5 # and makes mypy happy see https://mypy.readthedocs.io/en/latest/installed_packages.html +package_dir= + =src packages = find: # see [options.packages.find] below # IMPORTANT: DO NOT set the `include_package_data` flag !! It triggers inclusion of all git-versioned files # see https://github.com/pypa/setuptools_scm/issues/190#issuecomment-351181286 # include_package_data = True [options.packages.find] +where=src exclude = contrib docs @@ -96,7 +99,7 @@ test = pytest # pytest default configuration [tool:pytest] -testpaths = pytest_cases/tests/ +testpaths = tests/ addopts = --verbose --doctest-modules @@ -112,8 +115,8 @@ filterwarnings = branch = True omit = *tests* # this is done in nox.py (github actions) -# source = pytest_cases -# command_line = -m pytest --junitxml="reports/pytest_reports/pytest.xml" --html="reports/pytest_reports/pytest.html" -v pytest_cases/tests/ +# source = src/pytest_cases +# command_line = -m pytest --junitxml="reports/pytest_reports/pytest.xml" --html="reports/pytest_reports/pytest.html" -v tests/ [coverage:report] fail_under = 70 @@ -145,6 +148,4 @@ exclude = tests noxfile.py setup.py - tests - _version.py - src/_version.py + */_version.py diff --git a/setup.py b/setup.py index e5dd4493..5a0c0c46 100644 --- a/setup.py +++ b/setup.py @@ -33,6 +33,6 @@ setup( download_url=DOWNLOAD_URL, use_scm_version={ - "write_to": "pytest_cases/_version.py" + "write_to": "src/pytest_cases/_version.py" }, # we can't put `use_scm_version` in setup.cfg yet unfortunately ) diff --git a/pytest_cases/__init__.py b/src/pytest_cases/__init__.py similarity index 100% rename from pytest_cases/__init__.py rename to src/pytest_cases/__init__.py diff --git a/pytest_cases/case_funcs.py b/src/pytest_cases/case_funcs.py similarity index 100% rename from pytest_cases/case_funcs.py rename to src/pytest_cases/case_funcs.py diff --git a/pytest_cases/case_parametrizer_new.py b/src/pytest_cases/case_parametrizer_new.py similarity index 100% rename from pytest_cases/case_parametrizer_new.py rename to src/pytest_cases/case_parametrizer_new.py diff --git a/pytest_cases/common_mini_six.py b/src/pytest_cases/common_mini_six.py similarity index 100% rename from pytest_cases/common_mini_six.py rename to src/pytest_cases/common_mini_six.py diff --git a/pytest_cases/common_others.py b/src/pytest_cases/common_others.py similarity index 100% rename from pytest_cases/common_others.py rename to src/pytest_cases/common_others.py diff --git a/pytest_cases/common_pytest.py b/src/pytest_cases/common_pytest.py similarity index 100% rename from pytest_cases/common_pytest.py rename to src/pytest_cases/common_pytest.py diff --git a/pytest_cases/common_pytest_lazy_values.py b/src/pytest_cases/common_pytest_lazy_values.py similarity index 100% rename from pytest_cases/common_pytest_lazy_values.py rename to src/pytest_cases/common_pytest_lazy_values.py diff --git a/pytest_cases/common_pytest_marks.py b/src/pytest_cases/common_pytest_marks.py similarity index 100% rename from pytest_cases/common_pytest_marks.py rename to src/pytest_cases/common_pytest_marks.py diff --git a/pytest_cases/filters.py b/src/pytest_cases/filters.py similarity index 100% rename from pytest_cases/filters.py rename to src/pytest_cases/filters.py diff --git a/pytest_cases/fixture__creation.py b/src/pytest_cases/fixture__creation.py similarity index 100% rename from pytest_cases/fixture__creation.py rename to src/pytest_cases/fixture__creation.py diff --git a/pytest_cases/fixture_core1_unions.py b/src/pytest_cases/fixture_core1_unions.py similarity index 100% rename from pytest_cases/fixture_core1_unions.py rename to src/pytest_cases/fixture_core1_unions.py diff --git a/pytest_cases/fixture_core2.py b/src/pytest_cases/fixture_core2.py similarity index 100% rename from pytest_cases/fixture_core2.py rename to src/pytest_cases/fixture_core2.py diff --git a/pytest_cases/fixture_parametrize_plus.py b/src/pytest_cases/fixture_parametrize_plus.py similarity index 100% rename from pytest_cases/fixture_parametrize_plus.py rename to src/pytest_cases/fixture_parametrize_plus.py diff --git a/pytest_cases/plugin.py b/src/pytest_cases/plugin.py similarity index 100% rename from pytest_cases/plugin.py rename to src/pytest_cases/plugin.py diff --git a/pytest_cases/py.typed b/src/pytest_cases/py.typed similarity index 100% rename from pytest_cases/py.typed rename to src/pytest_cases/py.typed diff --git a/pytest_cases/tests/__init__.py b/tests/__init__.py similarity index 100% rename from pytest_cases/tests/__init__.py rename to tests/__init__.py diff --git a/pytest_cases/tests/cases/__init__.py b/tests/cases/__init__.py similarity index 100% rename from pytest_cases/tests/cases/__init__.py rename to tests/cases/__init__.py diff --git a/pytest_cases/tests/cases/doc/__init__.py b/tests/cases/doc/__init__.py similarity index 100% rename from pytest_cases/tests/cases/doc/__init__.py rename to tests/cases/doc/__init__.py diff --git a/pytest_cases/tests/cases/doc/cases_doc_alternate.py b/tests/cases/doc/cases_doc_alternate.py similarity index 100% rename from pytest_cases/tests/cases/doc/cases_doc_alternate.py rename to tests/cases/doc/cases_doc_alternate.py diff --git a/pytest_cases/tests/cases/doc/example.py b/tests/cases/doc/example.py similarity index 100% rename from pytest_cases/tests/cases/doc/example.py rename to tests/cases/doc/example.py diff --git a/pytest_cases/tests/cases/doc/test_doc.py b/tests/cases/doc/test_doc.py similarity index 100% rename from pytest_cases/tests/cases/doc/test_doc.py rename to tests/cases/doc/test_doc.py diff --git a/pytest_cases/tests/cases/doc/test_doc_alternate.py b/tests/cases/doc/test_doc_alternate.py similarity index 100% rename from pytest_cases/tests/cases/doc/test_doc_alternate.py rename to tests/cases/doc/test_doc_alternate.py diff --git a/pytest_cases/tests/cases/doc/test_doc_cache.py b/tests/cases/doc/test_doc_cache.py similarity index 100% rename from pytest_cases/tests/cases/doc/test_doc_cache.py rename to tests/cases/doc/test_doc_cache.py diff --git a/pytest_cases/tests/cases/doc/test_doc_cases.py b/tests/cases/doc/test_doc_cases.py similarity index 100% rename from pytest_cases/tests/cases/doc/test_doc_cases.py rename to tests/cases/doc/test_doc_cases.py diff --git a/pytest_cases/tests/cases/doc/test_doc_debug.py b/tests/cases/doc/test_doc_debug.py similarity index 100% rename from pytest_cases/tests/cases/doc/test_doc_debug.py rename to tests/cases/doc/test_doc_debug.py diff --git a/pytest_cases/tests/cases/doc/test_doc_filters_n_tags.py b/tests/cases/doc/test_doc_filters_n_tags.py similarity index 100% rename from pytest_cases/tests/cases/doc/test_doc_filters_n_tags.py rename to tests/cases/doc/test_doc_filters_n_tags.py diff --git a/pytest_cases/tests/cases/doc/test_doc_filters_n_tags2.py b/tests/cases/doc/test_doc_filters_n_tags2.py similarity index 100% rename from pytest_cases/tests/cases/doc/test_doc_filters_n_tags2.py rename to tests/cases/doc/test_doc_filters_n_tags2.py diff --git a/pytest_cases/tests/cases/doc/test_doc_get_current_case_id.py b/tests/cases/doc/test_doc_get_current_case_id.py similarity index 100% rename from pytest_cases/tests/cases/doc/test_doc_get_current_case_id.py rename to tests/cases/doc/test_doc_get_current_case_id.py diff --git a/pytest_cases/tests/cases/doc/test_doc_get_current_cases.py b/tests/cases/doc/test_doc_get_current_cases.py similarity index 100% rename from pytest_cases/tests/cases/doc/test_doc_get_current_cases.py rename to tests/cases/doc/test_doc_get_current_cases.py diff --git a/pytest_cases/tests/cases/doc/test_doc_ids.py b/tests/cases/doc/test_doc_ids.py similarity index 100% rename from pytest_cases/tests/cases/doc/test_doc_ids.py rename to tests/cases/doc/test_doc_ids.py diff --git a/pytest_cases/tests/cases/doc/test_fixtures.py b/tests/cases/doc/test_fixtures.py similarity index 100% rename from pytest_cases/tests/cases/doc/test_fixtures.py rename to tests/cases/doc/test_fixtures.py diff --git a/pytest_cases/tests/cases/doc/test_generators.py b/tests/cases/doc/test_generators.py similarity index 100% rename from pytest_cases/tests/cases/doc/test_generators.py rename to tests/cases/doc/test_generators.py diff --git a/pytest_cases/tests/cases/doc/test_get_current_cases.py b/tests/cases/doc/test_get_current_cases.py similarity index 100% rename from pytest_cases/tests/cases/doc/test_get_current_cases.py rename to tests/cases/doc/test_get_current_cases.py diff --git a/pytest_cases/tests/cases/doc/test_get_current_cases_cases.py b/tests/cases/doc/test_get_current_cases_cases.py similarity index 100% rename from pytest_cases/tests/cases/doc/test_get_current_cases_cases.py rename to tests/cases/doc/test_get_current_cases_cases.py diff --git a/pytest_cases/tests/cases/doc/test_get_current_cases_negative.py b/tests/cases/doc/test_get_current_cases_negative.py similarity index 100% rename from pytest_cases/tests/cases/doc/test_get_current_cases_negative.py rename to tests/cases/doc/test_get_current_cases_negative.py diff --git a/pytest_cases/tests/cases/doc/test_get_current_cases_params.py b/tests/cases/doc/test_get_current_cases_params.py similarity index 100% rename from pytest_cases/tests/cases/doc/test_get_current_cases_params.py rename to tests/cases/doc/test_get_current_cases_params.py diff --git a/tests/cases/doc/test_indirect.py b/tests/cases/doc/test_indirect.py new file mode 100644 index 00000000..33e47a4a --- /dev/null +++ b/tests/cases/doc/test_indirect.py @@ -0,0 +1,33 @@ +from pytest_cases import parametrize, fixture + + +@fixture +@parametrize(a=[0, 1]) +def my_fix(a): + return a * 2 + + +@fixture +@parametrize(b=[0, 10]) +def my_fix2(b, my_fix): + return b + my_fix + + +def test_foo(my_fix2): + assert my_fix2 in (0, 2, 10, 12) + + +@parametrize(my_fix=[2], indirect=True) +def test_foo_indirect(my_fix2): + assert my_fix2 in (4, 14) + + +def test_synthesis(module_results_dct): + assert list(module_results_dct) == [ + 'test_foo[b=0-a=0]', + 'test_foo[b=0-a=1]', + 'test_foo[b=10-a=0]', + 'test_foo[b=10-a=1]', + 'test_foo_indirect[b=0-my_fix=2]', + 'test_foo_indirect[b=10-my_fix=2]' + ] diff --git a/pytest_cases/tests/cases/doc/test_joss.py b/tests/cases/doc/test_joss.py similarity index 100% rename from pytest_cases/tests/cases/doc/test_joss.py rename to tests/cases/doc/test_joss.py diff --git a/pytest_cases/tests/cases/doc/test_nested.py b/tests/cases/doc/test_nested.py similarity index 100% rename from pytest_cases/tests/cases/doc/test_nested.py rename to tests/cases/doc/test_nested.py diff --git a/pytest_cases/tests/cases/doc/test_parametrize_alt.py b/tests/cases/doc/test_parametrize_alt.py similarity index 100% rename from pytest_cases/tests/cases/doc/test_parametrize_alt.py rename to tests/cases/doc/test_parametrize_alt.py diff --git a/pytest_cases/tests/cases/issues/__init__.py b/tests/cases/issues/__init__.py similarity index 100% rename from pytest_cases/tests/cases/issues/__init__.py rename to tests/cases/issues/__init__.py diff --git a/pytest_cases/tests/cases/issues/issue_196/conftest.py b/tests/cases/issues/issue_196/conftest.py similarity index 100% rename from pytest_cases/tests/cases/issues/issue_196/conftest.py rename to tests/cases/issues/issue_196/conftest.py diff --git a/pytest_cases/tests/cases/issues/issue_196/test_issue_196.py b/tests/cases/issues/issue_196/test_issue_196.py similarity index 100% rename from pytest_cases/tests/cases/issues/issue_196/test_issue_196.py rename to tests/cases/issues/issue_196/test_issue_196.py diff --git a/pytest_cases/tests/cases/issues/issue_225/__init__.py b/tests/cases/issues/issue_225/__init__.py similarity index 100% rename from pytest_cases/tests/cases/issues/issue_225/__init__.py rename to tests/cases/issues/issue_225/__init__.py diff --git a/pytest_cases/tests/cases/issues/issue_225/cases.py b/tests/cases/issues/issue_225/cases.py similarity index 100% rename from pytest_cases/tests/cases/issues/issue_225/cases.py rename to tests/cases/issues/issue_225/cases.py diff --git a/pytest_cases/tests/cases/issues/issue_225/conftest.py b/tests/cases/issues/issue_225/conftest.py similarity index 100% rename from pytest_cases/tests/cases/issues/issue_225/conftest.py rename to tests/cases/issues/issue_225/conftest.py diff --git a/pytest_cases/tests/cases/issues/issue_225/test_sth.py b/tests/cases/issues/issue_225/test_sth.py similarity index 100% rename from pytest_cases/tests/cases/issues/issue_225/test_sth.py rename to tests/cases/issues/issue_225/test_sth.py diff --git a/pytest_cases/tests/cases/issues/test_issue_117.py b/tests/cases/issues/test_issue_117.py similarity index 100% rename from pytest_cases/tests/cases/issues/test_issue_117.py rename to tests/cases/issues/test_issue_117.py diff --git a/pytest_cases/tests/cases/issues/test_issue_125.py b/tests/cases/issues/test_issue_125.py similarity index 100% rename from pytest_cases/tests/cases/issues/test_issue_125.py rename to tests/cases/issues/test_issue_125.py diff --git a/pytest_cases/tests/cases/issues/test_issue_126.py b/tests/cases/issues/test_issue_126.py similarity index 100% rename from pytest_cases/tests/cases/issues/test_issue_126.py rename to tests/cases/issues/test_issue_126.py diff --git a/pytest_cases/tests/cases/issues/test_issue_126_2.py b/tests/cases/issues/test_issue_126_2.py similarity index 100% rename from pytest_cases/tests/cases/issues/test_issue_126_2.py rename to tests/cases/issues/test_issue_126_2.py diff --git a/pytest_cases/tests/cases/issues/test_issue_126_2_cases.py b/tests/cases/issues/test_issue_126_2_cases.py similarity index 100% rename from pytest_cases/tests/cases/issues/test_issue_126_2_cases.py rename to tests/cases/issues/test_issue_126_2_cases.py diff --git a/pytest_cases/tests/cases/issues/test_issue_128.py b/tests/cases/issues/test_issue_128.py similarity index 100% rename from pytest_cases/tests/cases/issues/test_issue_128.py rename to tests/cases/issues/test_issue_128.py diff --git a/pytest_cases/tests/cases/issues/test_issue_128_2.py b/tests/cases/issues/test_issue_128_2.py similarity index 100% rename from pytest_cases/tests/cases/issues/test_issue_128_2.py rename to tests/cases/issues/test_issue_128_2.py diff --git a/pytest_cases/tests/cases/issues/test_issue_128_cases.py b/tests/cases/issues/test_issue_128_cases.py similarity index 100% rename from pytest_cases/tests/cases/issues/test_issue_128_cases.py rename to tests/cases/issues/test_issue_128_cases.py diff --git a/pytest_cases/tests/cases/issues/test_issue_142.py b/tests/cases/issues/test_issue_142.py similarity index 100% rename from pytest_cases/tests/cases/issues/test_issue_142.py rename to tests/cases/issues/test_issue_142.py diff --git a/pytest_cases/tests/cases/issues/test_issue_142_2.py b/tests/cases/issues/test_issue_142_2.py similarity index 100% rename from pytest_cases/tests/cases/issues/test_issue_142_2.py rename to tests/cases/issues/test_issue_142_2.py diff --git a/pytest_cases/tests/cases/issues/test_issue_151.py b/tests/cases/issues/test_issue_151.py similarity index 100% rename from pytest_cases/tests/cases/issues/test_issue_151.py rename to tests/cases/issues/test_issue_151.py diff --git a/pytest_cases/tests/cases/issues/test_issue_152.py b/tests/cases/issues/test_issue_152.py similarity index 100% rename from pytest_cases/tests/cases/issues/test_issue_152.py rename to tests/cases/issues/test_issue_152.py diff --git a/pytest_cases/tests/cases/issues/test_issue_154.py b/tests/cases/issues/test_issue_154.py similarity index 100% rename from pytest_cases/tests/cases/issues/test_issue_154.py rename to tests/cases/issues/test_issue_154.py diff --git a/pytest_cases/tests/cases/issues/test_issue_158.py b/tests/cases/issues/test_issue_158.py similarity index 100% rename from pytest_cases/tests/cases/issues/test_issue_158.py rename to tests/cases/issues/test_issue_158.py diff --git a/pytest_cases/tests/cases/issues/test_issue_158_2.py b/tests/cases/issues/test_issue_158_2.py similarity index 100% rename from pytest_cases/tests/cases/issues/test_issue_158_2.py rename to tests/cases/issues/test_issue_158_2.py diff --git a/pytest_cases/tests/cases/issues/test_issue_159.py b/tests/cases/issues/test_issue_159.py similarity index 100% rename from pytest_cases/tests/cases/issues/test_issue_159.py rename to tests/cases/issues/test_issue_159.py diff --git a/pytest_cases/tests/cases/issues/test_issue_165.py b/tests/cases/issues/test_issue_165.py similarity index 100% rename from pytest_cases/tests/cases/issues/test_issue_165.py rename to tests/cases/issues/test_issue_165.py diff --git a/pytest_cases/tests/cases/issues/test_issue_168.py b/tests/cases/issues/test_issue_168.py similarity index 100% rename from pytest_cases/tests/cases/issues/test_issue_168.py rename to tests/cases/issues/test_issue_168.py diff --git a/pytest_cases/tests/cases/issues/test_issue_171.py b/tests/cases/issues/test_issue_171.py similarity index 100% rename from pytest_cases/tests/cases/issues/test_issue_171.py rename to tests/cases/issues/test_issue_171.py diff --git a/pytest_cases/tests/cases/issues/test_issue_179.py b/tests/cases/issues/test_issue_179.py similarity index 100% rename from pytest_cases/tests/cases/issues/test_issue_179.py rename to tests/cases/issues/test_issue_179.py diff --git a/tests/cases/issues/test_issue_190.py b/tests/cases/issues/test_issue_190.py new file mode 100644 index 00000000..b00518a4 --- /dev/null +++ b/tests/cases/issues/test_issue_190.py @@ -0,0 +1,29 @@ +# import functools +# +# from pytest_cases import parametrize_with_cases, case +# +# +# class CasesFeature: +# @case(tags=("basic",)) +# def case_basic(self): +# return 0 +# +# +# def release_scope(*scopes): +# if len(scopes) == 0: +# scopes = ["function"] +# +# def decorator(f): +# @functools.wraps(f) +# def wrapper(case, *args, **kw): +# f(case, *args, **kw) +# +# return wrapper +# +# return decorator +# +# +# @parametrize_with_cases("case", cases=CasesFeature, has_tag="basic", scope="session") +# @release_scope() +# def test_container(case): +# pass diff --git a/pytest_cases/tests/cases/issues/test_issue_191.py b/tests/cases/issues/test_issue_191.py similarity index 100% rename from pytest_cases/tests/cases/issues/test_issue_191.py rename to tests/cases/issues/test_issue_191.py diff --git a/pytest_cases/tests/cases/issues/test_issue_193.py b/tests/cases/issues/test_issue_193.py similarity index 100% rename from pytest_cases/tests/cases/issues/test_issue_193.py rename to tests/cases/issues/test_issue_193.py diff --git a/pytest_cases/tests/cases/issues/test_issue_193_bis.py b/tests/cases/issues/test_issue_193_bis.py similarity index 100% rename from pytest_cases/tests/cases/issues/test_issue_193_bis.py rename to tests/cases/issues/test_issue_193_bis.py diff --git a/pytest_cases/tests/cases/issues/test_issue_193_cases.py b/tests/cases/issues/test_issue_193_cases.py similarity index 100% rename from pytest_cases/tests/cases/issues/test_issue_193_cases.py rename to tests/cases/issues/test_issue_193_cases.py diff --git a/pytest_cases/tests/cases/issues/test_issue_202.py b/tests/cases/issues/test_issue_202.py similarity index 100% rename from pytest_cases/tests/cases/issues/test_issue_202.py rename to tests/cases/issues/test_issue_202.py diff --git a/pytest_cases/tests/cases/issues/test_issue_211.py b/tests/cases/issues/test_issue_211.py similarity index 100% rename from pytest_cases/tests/cases/issues/test_issue_211.py rename to tests/cases/issues/test_issue_211.py diff --git a/pytest_cases/tests/cases/issues/test_issue_212.py b/tests/cases/issues/test_issue_212.py similarity index 100% rename from pytest_cases/tests/cases/issues/test_issue_212.py rename to tests/cases/issues/test_issue_212.py diff --git a/pytest_cases/tests/cases/issues/test_issue_230.py b/tests/cases/issues/test_issue_230.py similarity index 100% rename from pytest_cases/tests/cases/issues/test_issue_230.py rename to tests/cases/issues/test_issue_230.py diff --git a/pytest_cases/tests/cases/issues/test_py35_issue_176.py b/tests/cases/issues/test_py35_issue_176.py similarity index 100% rename from pytest_cases/tests/cases/issues/test_py35_issue_176.py rename to tests/cases/issues/test_py35_issue_176.py diff --git a/pytest_cases/tests/cases/others/__init__.py b/tests/cases/others/__init__.py similarity index 100% rename from pytest_cases/tests/cases/others/__init__.py rename to tests/cases/others/__init__.py diff --git a/pytest_cases/tests/cases/others/test_bound_methods.py b/tests/cases/others/test_bound_methods.py similarity index 100% rename from pytest_cases/tests/cases/others/test_bound_methods.py rename to tests/cases/others/test_bound_methods.py diff --git a/pytest_cases/tests/cases/others/test_glob_low_level.py b/tests/cases/others/test_glob_low_level.py similarity index 100% rename from pytest_cases/tests/cases/others/test_glob_low_level.py rename to tests/cases/others/test_glob_low_level.py diff --git a/pytest_cases/tests/cases/so/test_so2.py b/tests/cases/so/test_so2.py similarity index 100% rename from pytest_cases/tests/cases/so/test_so2.py rename to tests/cases/so/test_so2.py diff --git a/pytest_cases/tests/cases/so/test_so3.py b/tests/cases/so/test_so3.py similarity index 100% rename from pytest_cases/tests/cases/so/test_so3.py rename to tests/cases/so/test_so3.py diff --git a/pytest_cases/tests/cases/so/test_so4.py b/tests/cases/so/test_so4.py similarity index 100% rename from pytest_cases/tests/cases/so/test_so4.py rename to tests/cases/so/test_so4.py diff --git a/pytest_cases/tests/conftest.py b/tests/conftest.py similarity index 100% rename from pytest_cases/tests/conftest.py rename to tests/conftest.py diff --git a/pytest_cases/tests/pytest_extension/__init__.py b/tests/pytest_extension/__init__.py similarity index 100% rename from pytest_cases/tests/pytest_extension/__init__.py rename to tests/pytest_extension/__init__.py diff --git a/pytest_cases/tests/pytest_extension/doc/__init__.py b/tests/pytest_extension/doc/__init__.py similarity index 100% rename from pytest_cases/tests/pytest_extension/doc/__init__.py rename to tests/pytest_extension/doc/__init__.py diff --git a/pytest_cases/tests/pytest_extension/doc/test_doc_fixture_graph.py b/tests/pytest_extension/doc/test_doc_fixture_graph.py similarity index 100% rename from pytest_cases/tests/pytest_extension/doc/test_doc_fixture_graph.py rename to tests/pytest_extension/doc/test_doc_fixture_graph.py diff --git a/pytest_cases/tests/pytest_extension/doc/test_doc_fixture_graph_union.py b/tests/pytest_extension/doc/test_doc_fixture_graph_union.py similarity index 100% rename from pytest_cases/tests/pytest_extension/doc/test_doc_fixture_graph_union.py rename to tests/pytest_extension/doc/test_doc_fixture_graph_union.py diff --git a/pytest_cases/tests/pytest_extension/doc/test_doc_fixture_graph_union_normal.py b/tests/pytest_extension/doc/test_doc_fixture_graph_union_normal.py similarity index 100% rename from pytest_cases/tests/pytest_extension/doc/test_doc_fixture_graph_union_normal.py rename to tests/pytest_extension/doc/test_doc_fixture_graph_union_normal.py diff --git a/pytest_cases/tests/pytest_extension/doc/test_doc_fixture_graph_union_union.py b/tests/pytest_extension/doc/test_doc_fixture_graph_union_union.py similarity index 100% rename from pytest_cases/tests/pytest_extension/doc/test_doc_fixture_graph_union_union.py rename to tests/pytest_extension/doc/test_doc_fixture_graph_union_union.py diff --git a/pytest_cases/tests/pytest_extension/doc/test_doc_parametrize.py b/tests/pytest_extension/doc/test_doc_parametrize.py similarity index 100% rename from pytest_cases/tests/pytest_extension/doc/test_doc_parametrize.py rename to tests/pytest_extension/doc/test_doc_parametrize.py diff --git a/pytest_cases/tests/pytest_extension/doc/test_doc_parametrize_customids.py b/tests/pytest_extension/doc/test_doc_parametrize_customids.py similarity index 100% rename from pytest_cases/tests/pytest_extension/doc/test_doc_parametrize_customids.py rename to tests/pytest_extension/doc/test_doc_parametrize_customids.py diff --git a/pytest_cases/tests/pytest_extension/fixtures/__init__.py b/tests/pytest_extension/fixtures/__init__.py similarity index 100% rename from pytest_cases/tests/pytest_extension/fixtures/__init__.py rename to tests/pytest_extension/fixtures/__init__.py diff --git a/pytest_cases/tests/pytest_extension/fixtures/fixture_plus_and_others/__init__.py b/tests/pytest_extension/fixtures/fixture_plus_and_others/__init__.py similarity index 100% rename from pytest_cases/tests/pytest_extension/fixtures/fixture_plus_and_others/__init__.py rename to tests/pytest_extension/fixtures/fixture_plus_and_others/__init__.py diff --git a/pytest_cases/tests/pytest_extension/fixtures/fixture_plus_and_others/test_fixture_unpacking.py b/tests/pytest_extension/fixtures/fixture_plus_and_others/test_fixture_unpacking.py similarity index 100% rename from pytest_cases/tests/pytest_extension/fixtures/fixture_plus_and_others/test_fixture_unpacking.py rename to tests/pytest_extension/fixtures/fixture_plus_and_others/test_fixture_unpacking.py diff --git a/pytest_cases/tests/pytest_extension/fixtures/fixture_plus_and_others/test_fixture_unpacking2.py b/tests/pytest_extension/fixtures/fixture_plus_and_others/test_fixture_unpacking2.py similarity index 100% rename from pytest_cases/tests/pytest_extension/fixtures/fixture_plus_and_others/test_fixture_unpacking2.py rename to tests/pytest_extension/fixtures/fixture_plus_and_others/test_fixture_unpacking2.py diff --git a/pytest_cases/tests/pytest_extension/fixtures/fixture_plus_and_others/test_fixture_unpacking_cls.py b/tests/pytest_extension/fixtures/fixture_plus_and_others/test_fixture_unpacking_cls.py similarity index 100% rename from pytest_cases/tests/pytest_extension/fixtures/fixture_plus_and_others/test_fixture_unpacking_cls.py rename to tests/pytest_extension/fixtures/fixture_plus_and_others/test_fixture_unpacking_cls.py diff --git a/pytest_cases/tests/pytest_extension/fixtures/fixture_plus_and_others/test_fixtures_parametrize.py b/tests/pytest_extension/fixtures/fixture_plus_and_others/test_fixtures_parametrize.py similarity index 100% rename from pytest_cases/tests/pytest_extension/fixtures/fixture_plus_and_others/test_fixtures_parametrize.py rename to tests/pytest_extension/fixtures/fixture_plus_and_others/test_fixtures_parametrize.py diff --git a/pytest_cases/tests/pytest_extension/fixtures/fixture_plus_and_others/test_fixtures_parametrize_stereo.py b/tests/pytest_extension/fixtures/fixture_plus_and_others/test_fixtures_parametrize_stereo.py similarity index 100% rename from pytest_cases/tests/pytest_extension/fixtures/fixture_plus_and_others/test_fixtures_parametrize_stereo.py rename to tests/pytest_extension/fixtures/fixture_plus_and_others/test_fixtures_parametrize_stereo.py diff --git a/pytest_cases/tests/pytest_extension/fixtures/fixture_plus_and_others/test_fixtures_paramfixtures.py b/tests/pytest_extension/fixtures/fixture_plus_and_others/test_fixtures_paramfixtures.py similarity index 100% rename from pytest_cases/tests/pytest_extension/fixtures/fixture_plus_and_others/test_fixtures_paramfixtures.py rename to tests/pytest_extension/fixtures/fixture_plus_and_others/test_fixtures_paramfixtures.py diff --git a/pytest_cases/tests/pytest_extension/fixtures/fixture_plus_and_others/test_fixtures_paramfixtures_marks.py b/tests/pytest_extension/fixtures/fixture_plus_and_others/test_fixtures_paramfixtures_marks.py similarity index 100% rename from pytest_cases/tests/pytest_extension/fixtures/fixture_plus_and_others/test_fixtures_paramfixtures_marks.py rename to tests/pytest_extension/fixtures/fixture_plus_and_others/test_fixtures_paramfixtures_marks.py diff --git a/pytest_cases/tests/pytest_extension/fixtures/fixture_plus_and_others/test_skip_on_paramz_fixture.py b/tests/pytest_extension/fixtures/fixture_plus_and_others/test_skip_on_paramz_fixture.py similarity index 91% rename from pytest_cases/tests/pytest_extension/fixtures/fixture_plus_and_others/test_skip_on_paramz_fixture.py rename to tests/pytest_extension/fixtures/fixture_plus_and_others/test_skip_on_paramz_fixture.py index 06e573e4..5ed6e04b 100644 --- a/pytest_cases/tests/pytest_extension/fixtures/fixture_plus_and_others/test_skip_on_paramz_fixture.py +++ b/tests/pytest_extension/fixtures/fixture_plus_and_others/test_skip_on_paramz_fixture.py @@ -1,7 +1,7 @@ import pytest import pytest_cases -from pytest_cases.tests.utils import skip as skip_mark +from tests.utils import skip as skip_mark @pytest.mark.parametrize('v', [0, skip_mark(1)]) diff --git a/pytest_cases/tests/pytest_extension/fixtures/fixture_unions/__init__.py b/tests/pytest_extension/fixtures/fixture_unions/__init__.py similarity index 100% rename from pytest_cases/tests/pytest_extension/fixtures/fixture_unions/__init__.py rename to tests/pytest_extension/fixtures/fixture_unions/__init__.py diff --git a/pytest_cases/tests/pytest_extension/fixtures/fixture_unions/test_fixture_closure_edits.py b/tests/pytest_extension/fixtures/fixture_unions/test_fixture_closure_edits.py similarity index 100% rename from pytest_cases/tests/pytest_extension/fixtures/fixture_unions/test_fixture_closure_edits.py rename to tests/pytest_extension/fixtures/fixture_unions/test_fixture_closure_edits.py diff --git a/pytest_cases/tests/pytest_extension/fixtures/fixture_unions/test_fixture_union_custom_mark.py b/tests/pytest_extension/fixtures/fixture_unions/test_fixture_union_custom_mark.py similarity index 100% rename from pytest_cases/tests/pytest_extension/fixtures/fixture_unions/test_fixture_union_custom_mark.py rename to tests/pytest_extension/fixtures/fixture_unions/test_fixture_union_custom_mark.py diff --git a/pytest_cases/tests/pytest_extension/fixtures/fixture_unions/test_fixture_union_ids.py b/tests/pytest_extension/fixtures/fixture_unions/test_fixture_union_ids.py similarity index 100% rename from pytest_cases/tests/pytest_extension/fixtures/fixture_unions/test_fixture_union_ids.py rename to tests/pytest_extension/fixtures/fixture_unions/test_fixture_union_ids.py diff --git a/pytest_cases/tests/pytest_extension/fixtures/fixture_unions/test_fixture_union_setup_teardown.py b/tests/pytest_extension/fixtures/fixture_unions/test_fixture_union_setup_teardown.py similarity index 100% rename from pytest_cases/tests/pytest_extension/fixtures/fixture_unions/test_fixture_union_setup_teardown.py rename to tests/pytest_extension/fixtures/fixture_unions/test_fixture_union_setup_teardown.py diff --git a/pytest_cases/tests/pytest_extension/fixtures/fixture_unions/test_fixture_union_setup_teardown2.py b/tests/pytest_extension/fixtures/fixture_unions/test_fixture_union_setup_teardown2.py similarity index 100% rename from pytest_cases/tests/pytest_extension/fixtures/fixture_unions/test_fixture_union_setup_teardown2.py rename to tests/pytest_extension/fixtures/fixture_unions/test_fixture_union_setup_teardown2.py diff --git a/pytest_cases/tests/pytest_extension/fixtures/fixture_unions/test_fixture_union_setup_teardown3.py b/tests/pytest_extension/fixtures/fixture_unions/test_fixture_union_setup_teardown3.py similarity index 100% rename from pytest_cases/tests/pytest_extension/fixtures/fixture_unions/test_fixture_union_setup_teardown3.py rename to tests/pytest_extension/fixtures/fixture_unions/test_fixture_union_setup_teardown3.py diff --git a/pytest_cases/tests/pytest_extension/fixtures/fixture_unions/test_fixtures_union_0simplest.py b/tests/pytest_extension/fixtures/fixture_unions/test_fixtures_union_0simplest.py similarity index 100% rename from pytest_cases/tests/pytest_extension/fixtures/fixture_unions/test_fixtures_union_0simplest.py rename to tests/pytest_extension/fixtures/fixture_unions/test_fixtures_union_0simplest.py diff --git a/pytest_cases/tests/pytest_extension/fixtures/fixture_unions/test_fixtures_union_1simple.py b/tests/pytest_extension/fixtures/fixture_unions/test_fixtures_union_1simple.py similarity index 100% rename from pytest_cases/tests/pytest_extension/fixtures/fixture_unions/test_fixtures_union_1simple.py rename to tests/pytest_extension/fixtures/fixture_unions/test_fixtures_union_1simple.py diff --git a/pytest_cases/tests/pytest_extension/fixtures/fixture_unions/test_fixtures_union_2hard.py b/tests/pytest_extension/fixtures/fixture_unions/test_fixtures_union_2hard.py similarity index 100% rename from pytest_cases/tests/pytest_extension/fixtures/fixture_unions/test_fixtures_union_2hard.py rename to tests/pytest_extension/fixtures/fixture_unions/test_fixtures_union_2hard.py diff --git a/pytest_cases/tests/pytest_extension/fixtures/fixture_unions/test_fixtures_union_3parametrize_plus.py b/tests/pytest_extension/fixtures/fixture_unions/test_fixtures_union_3parametrize_plus.py similarity index 100% rename from pytest_cases/tests/pytest_extension/fixtures/fixture_unions/test_fixtures_union_3parametrize_plus.py rename to tests/pytest_extension/fixtures/fixture_unions/test_fixtures_union_3parametrize_plus.py diff --git a/pytest_cases/tests/pytest_extension/fixtures/fixture_unions/test_so.py b/tests/pytest_extension/fixtures/fixture_unions/test_so.py similarity index 100% rename from pytest_cases/tests/pytest_extension/fixtures/fixture_unions/test_so.py rename to tests/pytest_extension/fixtures/fixture_unions/test_so.py diff --git a/pytest_cases/tests/pytest_extension/fixtures/test_hook.py b/tests/pytest_extension/fixtures/test_hook.py similarity index 100% rename from pytest_cases/tests/pytest_extension/fixtures/test_hook.py rename to tests/pytest_extension/fixtures/test_hook.py diff --git a/pytest_cases/tests/pytest_extension/fixtures/test_issue_github_54.py b/tests/pytest_extension/fixtures/test_issue_github_54.py similarity index 100% rename from pytest_cases/tests/pytest_extension/fixtures/test_issue_github_54.py rename to tests/pytest_extension/fixtures/test_issue_github_54.py diff --git a/pytest_cases/tests/pytest_extension/fixtures/test_so3.py b/tests/pytest_extension/fixtures/test_so3.py similarity index 100% rename from pytest_cases/tests/pytest_extension/fixtures/test_so3.py rename to tests/pytest_extension/fixtures/test_so3.py diff --git a/pytest_cases/tests/pytest_extension/issues/__init__.py b/tests/pytest_extension/issues/__init__.py similarity index 100% rename from pytest_cases/tests/pytest_extension/issues/__init__.py rename to tests/pytest_extension/issues/__init__.py diff --git a/pytest_cases/tests/pytest_extension/issues/test_issue_114.py b/tests/pytest_extension/issues/test_issue_114.py similarity index 100% rename from pytest_cases/tests/pytest_extension/issues/test_issue_114.py rename to tests/pytest_extension/issues/test_issue_114.py diff --git a/pytest_cases/tests/pytest_extension/issues/test_issue_115.py b/tests/pytest_extension/issues/test_issue_115.py similarity index 100% rename from pytest_cases/tests/pytest_extension/issues/test_issue_115.py rename to tests/pytest_extension/issues/test_issue_115.py diff --git a/pytest_cases/tests/pytest_extension/issues/test_issue_124.py b/tests/pytest_extension/issues/test_issue_124.py similarity index 100% rename from pytest_cases/tests/pytest_extension/issues/test_issue_124.py rename to tests/pytest_extension/issues/test_issue_124.py diff --git a/pytest_cases/tests/pytest_extension/issues/test_issue_137.py b/tests/pytest_extension/issues/test_issue_137.py similarity index 100% rename from pytest_cases/tests/pytest_extension/issues/test_issue_137.py rename to tests/pytest_extension/issues/test_issue_137.py diff --git a/pytest_cases/tests/pytest_extension/issues/test_issue_138.py b/tests/pytest_extension/issues/test_issue_138.py similarity index 100% rename from pytest_cases/tests/pytest_extension/issues/test_issue_138.py rename to tests/pytest_extension/issues/test_issue_138.py diff --git a/pytest_cases/tests/pytest_extension/issues/test_issue_146.py b/tests/pytest_extension/issues/test_issue_146.py similarity index 100% rename from pytest_cases/tests/pytest_extension/issues/test_issue_146.py rename to tests/pytest_extension/issues/test_issue_146.py diff --git a/pytest_cases/tests/pytest_extension/issues/test_issue_148.py b/tests/pytest_extension/issues/test_issue_148.py similarity index 100% rename from pytest_cases/tests/pytest_extension/issues/test_issue_148.py rename to tests/pytest_extension/issues/test_issue_148.py diff --git a/pytest_cases/tests/pytest_extension/issues/test_issue_149.py b/tests/pytest_extension/issues/test_issue_149.py similarity index 100% rename from pytest_cases/tests/pytest_extension/issues/test_issue_149.py rename to tests/pytest_extension/issues/test_issue_149.py diff --git a/pytest_cases/tests/pytest_extension/issues/test_issue_177.py b/tests/pytest_extension/issues/test_issue_177.py similarity index 100% rename from pytest_cases/tests/pytest_extension/issues/test_issue_177.py rename to tests/pytest_extension/issues/test_issue_177.py diff --git a/pytest_cases/tests/pytest_extension/issues/test_issue_182.py b/tests/pytest_extension/issues/test_issue_182.py similarity index 100% rename from pytest_cases/tests/pytest_extension/issues/test_issue_182.py rename to tests/pytest_extension/issues/test_issue_182.py diff --git a/pytest_cases/tests/pytest_extension/issues/test_issue_199.py b/tests/pytest_extension/issues/test_issue_199.py similarity index 100% rename from pytest_cases/tests/pytest_extension/issues/test_issue_199.py rename to tests/pytest_extension/issues/test_issue_199.py diff --git a/pytest_cases/tests/pytest_extension/issues/test_issue_201.py b/tests/pytest_extension/issues/test_issue_201.py similarity index 100% rename from pytest_cases/tests/pytest_extension/issues/test_issue_201.py rename to tests/pytest_extension/issues/test_issue_201.py diff --git a/pytest_cases/tests/pytest_extension/issues/test_issue_234.py b/tests/pytest_extension/issues/test_issue_234.py similarity index 100% rename from pytest_cases/tests/pytest_extension/issues/test_issue_234.py rename to tests/pytest_extension/issues/test_issue_234.py diff --git a/pytest_cases/tests/pytest_extension/issues/test_issue_classes.py b/tests/pytest_extension/issues/test_issue_classes.py similarity index 100% rename from pytest_cases/tests/pytest_extension/issues/test_issue_classes.py rename to tests/pytest_extension/issues/test_issue_classes.py diff --git a/pytest_cases/tests/pytest_extension/issues/test_issue_doctests.py b/tests/pytest_extension/issues/test_issue_doctests.py similarity index 100% rename from pytest_cases/tests/pytest_extension/issues/test_issue_doctests.py rename to tests/pytest_extension/issues/test_issue_doctests.py diff --git a/pytest_cases/tests/pytest_extension/issues/test_issue_fixture_union1.py b/tests/pytest_extension/issues/test_issue_fixture_union1.py similarity index 100% rename from pytest_cases/tests/pytest_extension/issues/test_issue_fixture_union1.py rename to tests/pytest_extension/issues/test_issue_fixture_union1.py diff --git a/pytest_cases/tests/pytest_extension/issues/test_issue_fixture_union2.py b/tests/pytest_extension/issues/test_issue_fixture_union2.py similarity index 100% rename from pytest_cases/tests/pytest_extension/issues/test_issue_fixture_union2.py rename to tests/pytest_extension/issues/test_issue_fixture_union2.py diff --git a/pytest_cases/tests/pytest_extension/issues/test_issue_indirect_fixture_param.py b/tests/pytest_extension/issues/test_issue_indirect_fixture_param.py similarity index 100% rename from pytest_cases/tests/pytest_extension/issues/test_issue_indirect_fixture_param.py rename to tests/pytest_extension/issues/test_issue_indirect_fixture_param.py diff --git a/pytest_cases/tests/pytest_extension/issues/test_issue_pytest_70.py b/tests/pytest_extension/issues/test_issue_pytest_70.py similarity index 100% rename from pytest_cases/tests/pytest_extension/issues/test_issue_pytest_70.py rename to tests/pytest_extension/issues/test_issue_pytest_70.py diff --git a/pytest_cases/tests/pytest_extension/issues/test_issue_python2_str.py b/tests/pytest_extension/issues/test_issue_python2_str.py similarity index 100% rename from pytest_cases/tests/pytest_extension/issues/test_issue_python2_str.py rename to tests/pytest_extension/issues/test_issue_python2_str.py diff --git a/pytest_cases/tests/pytest_extension/issues/test_issue_so_76.py b/tests/pytest_extension/issues/test_issue_so_76.py similarity index 100% rename from pytest_cases/tests/pytest_extension/issues/test_issue_so_76.py rename to tests/pytest_extension/issues/test_issue_so_76.py diff --git a/pytest_cases/tests/pytest_extension/issues/test_parametrize_with_lists.py b/tests/pytest_extension/issues/test_parametrize_with_lists.py similarity index 100% rename from pytest_cases/tests/pytest_extension/issues/test_parametrize_with_lists.py rename to tests/pytest_extension/issues/test_parametrize_with_lists.py diff --git a/pytest_cases/tests/pytest_extension/issues/test_pytest_py35_asyncio.py b/tests/pytest_extension/issues/test_pytest_py35_asyncio.py similarity index 100% rename from pytest_cases/tests/pytest_extension/issues/test_pytest_py35_asyncio.py rename to tests/pytest_extension/issues/test_pytest_py35_asyncio.py diff --git a/pytest_cases/tests/pytest_extension/meta/raw/__init__.py b/tests/pytest_extension/meta/raw/__init__.py similarity index 100% rename from pytest_cases/tests/pytest_extension/meta/raw/__init__.py rename to tests/pytest_extension/meta/raw/__init__.py diff --git a/pytest_cases/tests/pytest_extension/meta/raw/reorder_skip/__init__.py b/tests/pytest_extension/meta/raw/reorder_skip/__init__.py similarity index 100% rename from pytest_cases/tests/pytest_extension/meta/raw/reorder_skip/__init__.py rename to tests/pytest_extension/meta/raw/reorder_skip/__init__.py diff --git a/pytest_cases/tests/pytest_extension/meta/raw/reorder_skip/cmdargs.txt b/tests/pytest_extension/meta/raw/reorder_skip/cmdargs.txt similarity index 100% rename from pytest_cases/tests/pytest_extension/meta/raw/reorder_skip/cmdargs.txt rename to tests/pytest_extension/meta/raw/reorder_skip/cmdargs.txt diff --git a/pytest_cases/tests/pytest_extension/meta/raw/reorder_skip/reorder_skip.py b/tests/pytest_extension/meta/raw/reorder_skip/reorder_skip.py similarity index 100% rename from pytest_cases/tests/pytest_extension/meta/raw/reorder_skip/reorder_skip.py rename to tests/pytest_extension/meta/raw/reorder_skip/reorder_skip.py diff --git a/pytest_cases/tests/pytest_extension/meta/raw/session_optim/conf.py b/tests/pytest_extension/meta/raw/session_optim/conf.py similarity index 100% rename from pytest_cases/tests/pytest_extension/meta/raw/session_optim/conf.py rename to tests/pytest_extension/meta/raw/session_optim/conf.py diff --git a/pytest_cases/tests/pytest_extension/meta/raw/session_optim/session_optim.py b/tests/pytest_extension/meta/raw/session_optim/session_optim.py similarity index 100% rename from pytest_cases/tests/pytest_extension/meta/raw/session_optim/session_optim.py rename to tests/pytest_extension/meta/raw/session_optim/session_optim.py diff --git a/pytest_cases/tests/pytest_extension/meta/test_all.py b/tests/pytest_extension/meta/test_all.py similarity index 100% rename from pytest_cases/tests/pytest_extension/meta/test_all.py rename to tests/pytest_extension/meta/test_all.py diff --git a/pytest_cases/tests/pytest_extension/order/session_optim/conftest.py b/tests/pytest_extension/order/session_optim/conftest.py similarity index 100% rename from pytest_cases/tests/pytest_extension/order/session_optim/conftest.py rename to tests/pytest_extension/order/session_optim/conftest.py diff --git a/pytest_cases/tests/pytest_extension/order/session_optim/test_reorder_default_normal.py b/tests/pytest_extension/order/session_optim/test_reorder_default_normal.py similarity index 100% rename from pytest_cases/tests/pytest_extension/order/session_optim/test_reorder_default_normal.py rename to tests/pytest_extension/order/session_optim/test_reorder_default_normal.py diff --git a/pytest_cases/tests/pytest_extension/order/test_fixture_order_respects_scope.py b/tests/pytest_extension/order/test_fixture_order_respects_scope.py similarity index 100% rename from pytest_cases/tests/pytest_extension/order/test_fixture_order_respects_scope.py rename to tests/pytest_extension/order/test_fixture_order_respects_scope.py diff --git a/pytest_cases/tests/pytest_extension/others/__init__.py b/tests/pytest_extension/others/__init__.py similarity index 100% rename from pytest_cases/tests/pytest_extension/others/__init__.py rename to tests/pytest_extension/others/__init__.py diff --git a/pytest_cases/tests/pytest_extension/others/test_assert_exception.py b/tests/pytest_extension/others/test_assert_exception.py similarity index 100% rename from pytest_cases/tests/pytest_extension/others/test_assert_exception.py rename to tests/pytest_extension/others/test_assert_exception.py diff --git a/pytest_cases/tests/pytest_extension/parametrize_plus/__init__.py b/tests/pytest_extension/parametrize_plus/__init__.py similarity index 100% rename from pytest_cases/tests/pytest_extension/parametrize_plus/__init__.py rename to tests/pytest_extension/parametrize_plus/__init__.py diff --git a/pytest_cases/tests/pytest_extension/parametrize_plus/test_basics_misc.py b/tests/pytest_extension/parametrize_plus/test_basics_misc.py similarity index 100% rename from pytest_cases/tests/pytest_extension/parametrize_plus/test_basics_misc.py rename to tests/pytest_extension/parametrize_plus/test_basics_misc.py diff --git a/pytest_cases/tests/pytest_extension/parametrize_plus/test_filter.py b/tests/pytest_extension/parametrize_plus/test_filter.py similarity index 100% rename from pytest_cases/tests/pytest_extension/parametrize_plus/test_filter.py rename to tests/pytest_extension/parametrize_plus/test_filter.py diff --git a/pytest_cases/tests/pytest_extension/parametrize_plus/test_fixture_ref_basic1.py b/tests/pytest_extension/parametrize_plus/test_fixture_ref_basic1.py similarity index 97% rename from pytest_cases/tests/pytest_extension/parametrize_plus/test_fixture_ref_basic1.py rename to tests/pytest_extension/parametrize_plus/test_fixture_ref_basic1.py index 62b06aff..dfae92a6 100644 --- a/pytest_cases/tests/pytest_extension/parametrize_plus/test_fixture_ref_basic1.py +++ b/tests/pytest_extension/parametrize_plus/test_fixture_ref_basic1.py @@ -6,7 +6,7 @@ from pytest_cases.fixture_core1_unions import InvalidParamsList from pytest_cases import fixture, fixture_ref, parametrize -from pytest_cases.tests.conftest import global_fixture +from tests.conftest import global_fixture @pytest.fixture diff --git a/pytest_cases/tests/pytest_extension/parametrize_plus/test_fixture_ref_basic2.py b/tests/pytest_extension/parametrize_plus/test_fixture_ref_basic2.py similarity index 100% rename from pytest_cases/tests/pytest_extension/parametrize_plus/test_fixture_ref_basic2.py rename to tests/pytest_extension/parametrize_plus/test_fixture_ref_basic2.py diff --git a/pytest_cases/tests/pytest_extension/parametrize_plus/test_fixture_ref_basic3_tuples.py b/tests/pytest_extension/parametrize_plus/test_fixture_ref_basic3_tuples.py similarity index 100% rename from pytest_cases/tests/pytest_extension/parametrize_plus/test_fixture_ref_basic3_tuples.py rename to tests/pytest_extension/parametrize_plus/test_fixture_ref_basic3_tuples.py diff --git a/pytest_cases/tests/pytest_extension/parametrize_plus/test_fixture_ref_basic4_ids.py b/tests/pytest_extension/parametrize_plus/test_fixture_ref_basic4_ids.py similarity index 100% rename from pytest_cases/tests/pytest_extension/parametrize_plus/test_fixture_ref_basic4_ids.py rename to tests/pytest_extension/parametrize_plus/test_fixture_ref_basic4_ids.py diff --git a/pytest_cases/tests/pytest_extension/parametrize_plus/test_fixture_ref_custom1.py b/tests/pytest_extension/parametrize_plus/test_fixture_ref_custom1.py similarity index 100% rename from pytest_cases/tests/pytest_extension/parametrize_plus/test_fixture_ref_custom1.py rename to tests/pytest_extension/parametrize_plus/test_fixture_ref_custom1.py diff --git a/pytest_cases/tests/pytest_extension/parametrize_plus/test_fixture_ref_custom2.py b/tests/pytest_extension/parametrize_plus/test_fixture_ref_custom2.py similarity index 100% rename from pytest_cases/tests/pytest_extension/parametrize_plus/test_fixture_ref_custom2.py rename to tests/pytest_extension/parametrize_plus/test_fixture_ref_custom2.py diff --git a/pytest_cases/tests/pytest_extension/parametrize_plus/test_fixture_ref_custom3.py b/tests/pytest_extension/parametrize_plus/test_fixture_ref_custom3.py similarity index 100% rename from pytest_cases/tests/pytest_extension/parametrize_plus/test_fixture_ref_custom3.py rename to tests/pytest_extension/parametrize_plus/test_fixture_ref_custom3.py diff --git a/pytest_cases/tests/pytest_extension/parametrize_plus/test_fixture_ref_custom4_tuples.py b/tests/pytest_extension/parametrize_plus/test_fixture_ref_custom4_tuples.py similarity index 100% rename from pytest_cases/tests/pytest_extension/parametrize_plus/test_fixture_ref_custom4_tuples.py rename to tests/pytest_extension/parametrize_plus/test_fixture_ref_custom4_tuples.py diff --git a/pytest_cases/tests/pytest_extension/parametrize_plus/test_getcallspecs.py b/tests/pytest_extension/parametrize_plus/test_getcallspecs.py similarity index 100% rename from pytest_cases/tests/pytest_extension/parametrize_plus/test_getcallspecs.py rename to tests/pytest_extension/parametrize_plus/test_getcallspecs.py diff --git a/pytest_cases/tests/pytest_extension/parametrize_plus/test_lazy_value.py b/tests/pytest_extension/parametrize_plus/test_lazy_value.py similarity index 100% rename from pytest_cases/tests/pytest_extension/parametrize_plus/test_lazy_value.py rename to tests/pytest_extension/parametrize_plus/test_lazy_value.py diff --git a/pytest_cases/tests/pytest_extension/parametrize_plus/test_lazy_value__custom_ids.py b/tests/pytest_extension/parametrize_plus/test_lazy_value__custom_ids.py similarity index 100% rename from pytest_cases/tests/pytest_extension/parametrize_plus/test_lazy_value__custom_ids.py rename to tests/pytest_extension/parametrize_plus/test_lazy_value__custom_ids.py diff --git a/pytest_cases/tests/pytest_extension/parametrize_plus/test_lazy_value_and_fixture_ref.py b/tests/pytest_extension/parametrize_plus/test_lazy_value_and_fixture_ref.py similarity index 100% rename from pytest_cases/tests/pytest_extension/parametrize_plus/test_lazy_value_and_fixture_ref.py rename to tests/pytest_extension/parametrize_plus/test_lazy_value_and_fixture_ref.py diff --git a/pytest_cases/tests/pytest_extension/parametrize_plus/test_lazy_value_and_fixture_ref2.py b/tests/pytest_extension/parametrize_plus/test_lazy_value_and_fixture_ref2.py similarity index 100% rename from pytest_cases/tests/pytest_extension/parametrize_plus/test_lazy_value_and_fixture_ref2.py rename to tests/pytest_extension/parametrize_plus/test_lazy_value_and_fixture_ref2.py diff --git a/pytest_cases/tests/pytest_extension/parametrize_plus/test_lazy_value_and_fixture_ref3.py b/tests/pytest_extension/parametrize_plus/test_lazy_value_and_fixture_ref3.py similarity index 100% rename from pytest_cases/tests/pytest_extension/parametrize_plus/test_lazy_value_and_fixture_ref3.py rename to tests/pytest_extension/parametrize_plus/test_lazy_value_and_fixture_ref3.py diff --git a/pytest_cases/tests/pytest_extension/parametrize_plus/test_lazy_value_low_level.py b/tests/pytest_extension/parametrize_plus/test_lazy_value_low_level.py similarity index 100% rename from pytest_cases/tests/pytest_extension/parametrize_plus/test_lazy_value_low_level.py rename to tests/pytest_extension/parametrize_plus/test_lazy_value_low_level.py diff --git a/pytest_cases/tests/pytest_extension/parametrize_plus/test_lazy_value_so.py b/tests/pytest_extension/parametrize_plus/test_lazy_value_so.py similarity index 100% rename from pytest_cases/tests/pytest_extension/parametrize_plus/test_lazy_value_so.py rename to tests/pytest_extension/parametrize_plus/test_lazy_value_so.py diff --git a/pytest_cases/tests/pytest_extension/parametrize_plus/test_parametrizing_a_class.py b/tests/pytest_extension/parametrize_plus/test_parametrizing_a_class.py similarity index 100% rename from pytest_cases/tests/pytest_extension/parametrize_plus/test_parametrizing_a_class.py rename to tests/pytest_extension/parametrize_plus/test_parametrizing_a_class.py diff --git a/pytest_cases/tests/pytest_extension/parametrize_plus/test_so2.py b/tests/pytest_extension/parametrize_plus/test_so2.py similarity index 100% rename from pytest_cases/tests/pytest_extension/parametrize_plus/test_so2.py rename to tests/pytest_extension/parametrize_plus/test_so2.py diff --git a/pytest_cases/tests/pytest_extension/parametrize_plus/test_so2_dynamic.py b/tests/pytest_extension/parametrize_plus/test_so2_dynamic.py similarity index 100% rename from pytest_cases/tests/pytest_extension/parametrize_plus/test_so2_dynamic.py rename to tests/pytest_extension/parametrize_plus/test_so2_dynamic.py diff --git a/pytest_cases/tests/pytest_extension/parametrize_plus/test_so2_new.py b/tests/pytest_extension/parametrize_plus/test_so2_new.py similarity index 100% rename from pytest_cases/tests/pytest_extension/parametrize_plus/test_so2_new.py rename to tests/pytest_extension/parametrize_plus/test_so2_new.py diff --git a/pytest_cases/tests/pytest_extension/parametrize_plus/test_so2_simplified.py b/tests/pytest_extension/parametrize_plus/test_so2_simplified.py similarity index 100% rename from pytest_cases/tests/pytest_extension/parametrize_plus/test_so2_simplified.py rename to tests/pytest_extension/parametrize_plus/test_so2_simplified.py diff --git a/pytest_cases/tests/test_plugin_installed.py b/tests/test_plugin_installed.py similarity index 100% rename from pytest_cases/tests/test_plugin_installed.py rename to tests/test_plugin_installed.py diff --git a/pytest_cases/tests/utils.py b/tests/utils.py similarity index 100% rename from pytest_cases/tests/utils.py rename to tests/utils.py