Merge pull request #691 from pypa/core-tests-not-installed

Move flit_core tests out of installable package
pypa · Oct 18, 2024 · adead86 · adead86
2 parents 9b1ef13 + d8bff6c
commit adead86
Show file tree

Hide file tree

Showing 73 changed files with 11 additions and 6 deletions.
diff --git a/flit_core/flit_core/tests/__init__.py → flit_core/tests_core/__init__.py b/flit_core/flit_core/tests/__init__.py → flit_core/tests_core/__init__.py
diff --git a/...ore/flit_core/tests/samples/EG_README.rst → flit_core/tests_core/samples/EG_README.rst b/...ore/flit_core/tests/samples/EG_README.rst → flit_core/tests_core/samples/EG_README.rst
diff --git a/...re/tests/samples/bad-description-ext.toml → ...sts_core/samples/bad-description-ext.toml b/...re/tests/samples/bad-description-ext.toml → ...sts_core/samples/bad-description-ext.toml
diff --git a/...ts/samples/conflicting_modules/module1.py → ...re/samples/conflicting_modules/module1.py b/...ts/samples/conflicting_modules/module1.py → ...re/samples/conflicting_modules/module1.py
diff --git a/...amples/conflicting_modules/pyproject.toml → ...amples/conflicting_modules/pyproject.toml b/...amples/conflicting_modules/pyproject.toml → ...amples/conflicting_modules/pyproject.toml
diff --git a/...amples/conflicting_modules/src/module1.py → ...amples/conflicting_modules/src/module1.py b/...amples/conflicting_modules/src/module1.py → ...amples/conflicting_modules/src/module1.py
diff --git a/...ts/samples/constructed_version/module1.py → ...re/samples/constructed_version/module1.py b/...ts/samples/constructed_version/module1.py → ...re/samples/constructed_version/module1.py
diff --git a/...amples/constructed_version/pyproject.toml → ...amples/constructed_version/pyproject.toml b/...amples/constructed_version/pyproject.toml → ...amples/constructed_version/pyproject.toml
diff --git a/...re/tests/samples/extras-dev-conflict.toml → ...sts_core/samples/extras-dev-conflict.toml b/...re/tests/samples/extras-dev-conflict.toml → ...sts_core/samples/extras-dev-conflict.toml
diff --git a/..._core/flit_core/tests/samples/extras.toml → flit_core/tests_core/samples/extras.toml b/..._core/flit_core/tests/samples/extras.toml → flit_core/tests_core/samples/extras.toml
diff --git a/...les/imported_version/package1/__init__.py → ...les/imported_version/package1/__init__.py b/...les/imported_version/package1/__init__.py → ...les/imported_version/package1/__init__.py
diff --git a/...les/imported_version/package1/_version.py → ...les/imported_version/package1/_version.py b/...les/imported_version/package1/_version.py → ...les/imported_version/package1/_version.py
diff --git a/...s/samples/imported_version/pyproject.toml → ...e/samples/imported_version/pyproject.toml b/...s/samples/imported_version/pyproject.toml → ...e/samples/imported_version/pyproject.toml
diff --git a/...e/tests/samples/inclusion/LICENSES/README → ...ts_core/samples/inclusion/LICENSES/README b/...e/tests/samples/inclusion/LICENSES/README → ...ts_core/samples/inclusion/LICENSES/README
diff --git a/...es/inclusion/doc/subdir/subsubdir/test.md → ...es/inclusion/doc/subdir/subsubdir/test.md b/...es/inclusion/doc/subdir/subsubdir/test.md → ...es/inclusion/doc/subdir/subsubdir/test.md
diff --git a/...sts/samples/inclusion/doc/subdir/test.txt → ...ore/samples/inclusion/doc/subdir/test.txt b/...sts/samples/inclusion/doc/subdir/test.txt → ...ore/samples/inclusion/doc/subdir/test.txt
diff --git a/...core/tests/samples/inclusion/doc/test.rst → ...tests_core/samples/inclusion/doc/test.rst b/...core/tests/samples/inclusion/doc/test.rst → ...tests_core/samples/inclusion/doc/test.rst
diff --git a/...core/tests/samples/inclusion/doc/test.txt → ...tests_core/samples/inclusion/doc/test.txt b/...core/tests/samples/inclusion/doc/test.txt → ...tests_core/samples/inclusion/doc/test.txt
diff --git a/...t_core/tests/samples/inclusion/module1.py → ...e/tests_core/samples/inclusion/module1.py b/...t_core/tests/samples/inclusion/module1.py → ...e/tests_core/samples/inclusion/module1.py
diff --git a/...re/tests/samples/inclusion/pyproject.toml → ...sts_core/samples/inclusion/pyproject.toml b/...re/tests/samples/inclusion/pyproject.toml → ...sts_core/samples/inclusion/pyproject.toml
diff --git a/...it_core/tests/samples/invalid_version1.py → ...re/tests_core/samples/invalid_version1.py b/...it_core/tests/samples/invalid_version1.py → ...re/tests_core/samples/invalid_version1.py
diff --git a/...sts/samples/missing-description-file.toml → ...ore/samples/missing-description-file.toml b/...sts/samples/missing-description-file.toml → ...ore/samples/missing-description-file.toml
diff --git a/...it_core/tests/samples/misspelled-key.toml → ...re/tests_core/samples/misspelled-key.toml b/...it_core/tests/samples/misspelled-key.toml → ...re/tests_core/samples/misspelled-key.toml
diff --git a/...e/flit_core/tests/samples/module1-pkg.ini → flit_core/tests_core/samples/module1-pkg.ini b/...e/flit_core/tests/samples/module1-pkg.ini → flit_core/tests_core/samples/module1-pkg.ini
diff --git a/.../flit_core/tests/samples/module1-pkg.toml → ..._core/tests_core/samples/module1-pkg.toml b/.../flit_core/tests/samples/module1-pkg.toml → ..._core/tests_core/samples/module1-pkg.toml
diff --git a/flit_core/flit_core/tests/samples/module1.py → flit_core/tests_core/samples/module1.py b/flit_core/flit_core/tests/samples/module1.py → flit_core/tests_core/samples/module1.py
diff --git a/flit_core/flit_core/tests/samples/module2.py → flit_core/tests_core/samples/module2.py b/flit_core/flit_core/tests/samples/module2.py → flit_core/tests_core/samples/module2.py
diff --git a/..._core/tests/samples/moduleunimportable.py → .../tests_core/samples/moduleunimportable.py b/..._core/tests/samples/moduleunimportable.py → .../tests_core/samples/moduleunimportable.py
diff --git a/...tests/samples/moduleunimportabledouble.py → ..._core/samples/moduleunimportabledouble.py b/...tests/samples/moduleunimportabledouble.py → ..._core/samples/moduleunimportabledouble.py
diff --git a/...lit_core/tests/samples/my-description.rst → ...ore/tests_core/samples/my-description.rst b/...lit_core/tests/samples/my-description.rst → ...ore/tests_core/samples/my-description.rst
diff --git a/..._core/tests/samples/no_docstring-pkg.toml → .../tests_core/samples/no_docstring-pkg.toml b/..._core/tests/samples/no_docstring-pkg.toml → .../tests_core/samples/no_docstring-pkg.toml
diff --git a/...e/flit_core/tests/samples/no_docstring.py → flit_core/tests_core/samples/no_docstring.py b/...e/flit_core/tests/samples/no_docstring.py → flit_core/tests_core/samples/no_docstring.py
diff --git a/...samples/normalization/my_python_module.py → ...samples/normalization/my_python_module.py b/...samples/normalization/my_python_module.py → ...samples/normalization/my_python_module.py
diff --git a/...ests/samples/normalization/pyproject.toml → ...core/samples/normalization/pyproject.toml b/...ests/samples/normalization/pyproject.toml → ...core/samples/normalization/pyproject.toml
diff --git a/..._core/tests/samples/ns1-pkg/EG_README.rst → .../tests_core/samples/ns1-pkg/EG_README.rst b/..._core/tests/samples/ns1-pkg/EG_README.rst → .../tests_core/samples/ns1-pkg/EG_README.rst
diff --git a/...tests/samples/ns1-pkg/ns1/pkg/__init__.py → ..._core/samples/ns1-pkg/ns1/pkg/__init__.py b/...tests/samples/ns1-pkg/ns1/pkg/__init__.py → ..._core/samples/ns1-pkg/ns1/pkg/__init__.py
diff --git a/...core/tests/samples/ns1-pkg/pyproject.toml → ...tests_core/samples/ns1-pkg/pyproject.toml b/...core/tests/samples/ns1-pkg/pyproject.toml → ...tests_core/samples/ns1-pkg/pyproject.toml
diff --git a/...ore/flit_core/tests/samples/package1.toml → flit_core/tests_core/samples/package1.toml b/...ore/flit_core/tests/samples/package1.toml → flit_core/tests_core/samples/package1.toml
diff --git a/...t_core/tests/samples/package1/__init__.py → ...e/tests_core/samples/package1/__init__.py b/...t_core/tests/samples/package1/__init__.py → ...e/tests_core/samples/package1/__init__.py
diff --git a/...re/tests/samples/package1/data_dir/foo.sh → ...sts_core/samples/package1/data_dir/foo.sh b/...re/tests/samples/package1/data_dir/foo.sh → ...sts_core/samples/package1/data_dir/foo.sh
diff --git a/...e/flit_core/tests/samples/package1/foo.py → flit_core/tests_core/samples/package1/foo.py b/...e/flit_core/tests/samples/package1/foo.py → flit_core/tests_core/samples/package1/foo.py
diff --git a/...tests/samples/package1/subpkg/__init__.py → ..._core/samples/package1/subpkg/__init__.py b/...tests/samples/package1/subpkg/__init__.py → ..._core/samples/package1/subpkg/__init__.py
diff --git a/...les/package1/subpkg/sp_data_dir/test.json → ...les/package1/subpkg/sp_data_dir/test.json b/...les/package1/subpkg/sp_data_dir/test.json → ...les/package1/subpkg/sp_data_dir/test.json
diff --git a/...ests/samples/package1/subpkg2/__init__.py → ...core/samples/package1/subpkg2/__init__.py b/...ests/samples/package1/subpkg2/__init__.py → ...core/samples/package1/subpkg2/__init__.py
diff --git a/...re/flit_core/tests/samples/pep517/LICENSE → flit_core/tests_core/samples/pep517/LICENSE b/...re/flit_core/tests/samples/pep517/LICENSE → flit_core/tests_core/samples/pep517/LICENSE
diff --git a/...flit_core/tests/samples/pep517/README.rst → ...core/tests_core/samples/pep517/README.rst b/...flit_core/tests/samples/pep517/README.rst → ...core/tests_core/samples/pep517/README.rst
diff --git a/...flit_core/tests/samples/pep517/module1.py → ...core/tests_core/samples/pep517/module1.py b/...flit_core/tests/samples/pep517/module1.py → ...core/tests_core/samples/pep517/module1.py
diff --git a/..._core/tests/samples/pep517/pyproject.toml → .../tests_core/samples/pep517/pyproject.toml b/..._core/tests/samples/pep517/pyproject.toml → .../tests_core/samples/pep517/pyproject.toml
diff --git a/...re/flit_core/tests/samples/pep621/LICENSE → flit_core/tests_core/samples/pep621/LICENSE b/...re/flit_core/tests/samples/pep621/LICENSE → flit_core/tests_core/samples/pep621/LICENSE
diff --git a/...flit_core/tests/samples/pep621/README.rst → ...core/tests_core/samples/pep621/README.rst b/...flit_core/tests/samples/pep621/README.rst → ...core/tests_core/samples/pep621/README.rst
diff --git a/...lit_core/tests/samples/pep621/module1a.py → ...ore/tests_core/samples/pep621/module1a.py b/...lit_core/tests/samples/pep621/module1a.py → ...ore/tests_core/samples/pep621/module1a.py
diff --git a/..._core/tests/samples/pep621/pyproject.toml → .../tests_core/samples/pep621/pyproject.toml b/..._core/tests/samples/pep621/pyproject.toml → .../tests_core/samples/pep621/pyproject.toml
diff --git a/...tests/samples/pep621_nodynamic/README.rst → ..._core/samples/pep621_nodynamic/README.rst b/...tests/samples/pep621_nodynamic/README.rst → ..._core/samples/pep621_nodynamic/README.rst
diff --git a/...tests/samples/pep621_nodynamic/module1.py → ..._core/samples/pep621_nodynamic/module1.py b/...tests/samples/pep621_nodynamic/module1.py → ..._core/samples/pep621_nodynamic/module1.py
diff --git a/...s/samples/pep621_nodynamic/pyproject.toml → ...e/samples/pep621_nodynamic/pyproject.toml b/...s/samples/pep621_nodynamic/pyproject.toml → ...e/samples/pep621_nodynamic/pyproject.toml
diff --git a/...flit_core/tests/samples/requires-dev.toml → ...core/tests_core/samples/requires-dev.toml b/...flit_core/tests/samples/requires-dev.toml → ...core/tests_core/samples/requires-dev.toml
diff --git a/..._core/tests/samples/requires-envmark.toml → .../tests_core/samples/requires-envmark.toml b/..._core/tests/samples/requires-envmark.toml → .../tests_core/samples/requires-envmark.toml
diff --git a/...tests/samples/requires-extra-envmark.toml → ..._core/samples/requires-extra-envmark.toml b/...tests/samples/requires-extra-envmark.toml → ..._core/samples/requires-extra-envmark.toml
diff --git a/...core/tests/samples/requires-requests.toml → ...tests_core/samples/requires-requests.toml b/...core/tests/samples/requires-requests.toml → ...tests_core/samples/requires-requests.toml
diff --git a/..._core/tests/samples/with_data_dir/LICENSE → .../tests_core/samples/with_data_dir/LICENSE b/..._core/tests/samples/with_data_dir/LICENSE → .../tests_core/samples/with_data_dir/LICENSE
diff --git a/...re/tests/samples/with_data_dir/README.rst → ...sts_core/samples/with_data_dir/README.rst b/...re/tests/samples/with_data_dir/README.rst → ...sts_core/samples/with_data_dir/README.rst
diff --git a/...s/with_data_dir/data/share/man/man1/foo.1 → ...s/with_data_dir/data/share/man/man1/foo.1 b/...s/with_data_dir/data/share/man/man1/foo.1 → ...s/with_data_dir/data/share/man/man1/foo.1
diff --git a/...re/tests/samples/with_data_dir/module1.py → ...sts_core/samples/with_data_dir/module1.py b/...re/tests/samples/with_data_dir/module1.py → ...sts_core/samples/with_data_dir/module1.py
diff --git a/...ests/samples/with_data_dir/pyproject.toml → ...core/samples/with_data_dir/pyproject.toml b/...ests/samples/with_data_dir/pyproject.toml → ...core/samples/with_data_dir/pyproject.toml
diff --git a/...ore/flit_core/tests/test_build_thyself.py → flit_core/tests_core/test_build_thyself.py b/...ore/flit_core/tests/test_build_thyself.py → flit_core/tests_core/test_build_thyself.py
diff --git a/flit_core/flit_core/tests/test_buildapi.py → flit_core/tests_core/test_buildapi.py b/flit_core/flit_core/tests/test_buildapi.py → flit_core/tests_core/test_buildapi.py
diff --git a/flit_core/flit_core/tests/test_common.py → flit_core/tests_core/test_common.py b/flit_core/flit_core/tests/test_common.py → flit_core/tests_core/test_common.py
diff --git a/flit_core/flit_core/tests/test_config.py → flit_core/tests_core/test_config.py b/flit_core/flit_core/tests/test_config.py → flit_core/tests_core/test_config.py
diff --git a/flit_core/flit_core/tests/test_sdist.py → flit_core/tests_core/test_sdist.py b/flit_core/flit_core/tests/test_sdist.py → flit_core/tests_core/test_sdist.py
diff --git a/flit_core/flit_core/tests/test_versionno.py → flit_core/tests_core/test_versionno.py b/flit_core/flit_core/tests/test_versionno.py → flit_core/tests_core/test_versionno.py
diff --git a/flit_core/flit_core/tests/test_wheel.py → flit_core/tests_core/test_wheel.py b/flit_core/flit_core/tests/test_wheel.py → flit_core/tests_core/test_wheel.py
diff --git a/tests/test_install.py b/tests/test_install.py
@@ -3,7 +3,7 @@
 import pathlib
 import sys
 import tempfile
-from unittest import TestCase, SkipTest
+from unittest import TestCase, SkipTest, skipIf
 from unittest.mock import patch
 
 import pytest
@@ -13,10 +13,10 @@
 
 from flit import install
 from flit.install import Installer, _requires_dist_to_pip_requirement, DependencyError
-import flit_core.tests
 
-samples_dir = pathlib.Path(__file__).parent / 'samples'
-core_samples_dir = pathlib.Path(flit_core.tests.__file__).parent / 'samples'
+tests_dir = pathlib.Path(__file__).parent
+samples_dir = tests_dir / 'samples'
+core_samples_dir = tests_dir.parent / 'flit_core' / 'tests_core' / 'samples'
 
 class InstallTests(TestCase):
     def setUp(self):
@@ -56,6 +56,7 @@ def test_install_module(self):
             samples_dir / 'module1_toml', 'module1', '0.1', expected_editable=False
         )
 
+    @skipIf(not core_samples_dir.is_dir(), "Missing flit_core samples")
     def test_install_module_pep621(self):
         Installer.from_ini_path(
             core_samples_dir / 'pep621_nodynamic' / 'pyproject.toml',
@@ -154,6 +155,7 @@ def test_symlink_package(self):
             samples_dir / 'package1', 'package1', '0.1', expected_editable=True
         )
 
+    @skipIf(not core_samples_dir.is_dir(), "Missing flit_core samples")
     def test_symlink_module_pep621(self):
         if os.name == 'nt':
             raise SkipTest("symlink")
@@ -278,6 +280,7 @@ def test_install_requires(self):
         assert len(calls) == 1
         assert calls[0]['argv'][1:5] == ['-m', 'pip', 'install', '-r']
 
+    @skipIf(not core_samples_dir.is_dir(), "Missing flit_core samples")
     def test_install_reqs_my_python_if_needed_pep621(self):
         ins = Installer.from_ini_path(
             core_samples_dir / 'pep621_nodynamic' / 'pyproject.toml',
@@ -292,13 +295,15 @@ def test_extras_error(self):
             Installer.from_ini_path(samples_dir / 'requires-requests.toml',
                             user=False, deps='none', extras='dev')
 
+    @skipIf(not core_samples_dir.is_dir(), "Missing flit_core samples")
     def test_install_data_dir(self):
         Installer.from_ini_path(
             core_samples_dir / 'with_data_dir' / 'pyproject.toml',
         ).install_directly()
         assert_isfile(self.tmpdir / 'site-packages' / 'module1.py')
         assert_isfile(self.tmpdir / 'data' / 'share' / 'man' / 'man1' / 'foo.1')
 
+    @skipIf(not core_samples_dir.is_dir(), "Missing flit_core samples")
     def test_symlink_data_dir(self):
         if os.name == 'nt':
             raise SkipTest("symlink")

diff --git a/tox.ini b/tox.ini
@@ -33,12 +33,12 @@ commands =
 # Python 3.6: only test flit_core
 [testenv:py36]
 commands =
-    python -m pytest --cov=flit_core/flit_core --pyargs flit_core
+    python -m pytest --cov=flit_core/flit_core flit_core
 
 # Python 3.7: only test flit_core
 [testenv:py37]
 commands =
-    python -m pytest --cov=flit_core/flit_core --pyargs flit_core
+    python -m pytest --cov=flit_core/flit_core flit_core
 
 [testenv:bootstrap]
 skip_install = true