Merge pull request #3513 from RonnyPfannschmidt/src-layout

switch to src layout
pytest-dev · May 26, 2018 · 075faa5 · 075faa5
2 parents ee6c549 + eaa882f
commit 075faa5
Show file tree

Hide file tree

Showing 50 changed files with 10 additions and 5 deletions.
diff --git a/.gitignore b/.gitignore
@@ -19,7 +19,7 @@ include/
 .hypothesis/
 
 # autogenerated
-_pytest/_version.py
+src/_pytest/_version.py
 # setuptools
 .eggs/
 

diff --git a/changelog/3513.trivial.rst b/changelog/3513.trivial.rst
@@ -0,0 +1 @@
+Switch pytest to the src/ layout as we already suggested it for good practice - now we implement it as well.
diff --git a/setup.py b/setup.py
@@ -50,6 +50,9 @@ def get_environment_marker_support_level():
             return 1
     except Exception as exc:
         sys.stderr.write("Could not test setuptool's version: %s\n" % exc)
+
+    # as of testing on 2018-05-26 fedora was on version 37* and debian was on version 33+
+    # we should consider erroring on those
     return 0
 
 
@@ -84,7 +87,7 @@ def main():
         name="pytest",
         description="pytest: simple powerful testing with Python",
         long_description=long_description,
-        use_scm_version={"write_to": "_pytest/_version.py"},
+        use_scm_version={"write_to": "src/_pytest/_version.py"},
         url="http://pytest.org",
         project_urls={
             "Source": "https://github.com/pytest-dev/pytest",
@@ -102,6 +105,7 @@ def main():
         cmdclass={"test": PyTest},
         # the following should be enabled for release
         setup_requires=["setuptools-scm"],
+        package_dir={"": "src"},
         python_requires=">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*",
         install_requires=install_requires,
         extras_require=extras_require,
@@ -123,9 +127,9 @@ def finalize_options(self):
     def run(self):
         import subprocess
 
-        PPATH = [x for x in os.environ.get("PYTHONPATH", "").split(":") if x]
-        PPATH.insert(0, os.getcwd())
-        os.environ["PYTHONPATH"] = ":".join(PPATH)
+        python_path = [x for x in os.environ.get("PYTHONPATH", "").split(":") if x]
+        python_path.insert(0, os.getcwd())
+        os.environ["PYTHONPATH"] = ":".join(python_path)
         errno = subprocess.call([sys.executable, "pytest.py", "--ignore=doc"])
         raise SystemExit(errno)
 

diff --git a/_pytest/__init__.py → src/_pytest/__init__.py b/_pytest/__init__.py → src/_pytest/__init__.py
diff --git a/_pytest/_argcomplete.py → src/_pytest/_argcomplete.py b/_pytest/_argcomplete.py → src/_pytest/_argcomplete.py
diff --git a/_pytest/_code/__init__.py → src/_pytest/_code/__init__.py b/_pytest/_code/__init__.py → src/_pytest/_code/__init__.py
diff --git a/_pytest/_code/_py2traceback.py → src/_pytest/_code/_py2traceback.py b/_pytest/_code/_py2traceback.py → src/_pytest/_code/_py2traceback.py
diff --git a/_pytest/_code/code.py → src/_pytest/_code/code.py b/_pytest/_code/code.py → src/_pytest/_code/code.py
diff --git a/_pytest/_code/source.py → src/_pytest/_code/source.py b/_pytest/_code/source.py → src/_pytest/_code/source.py
diff --git a/_pytest/assertion/__init__.py → src/_pytest/assertion/__init__.py b/_pytest/assertion/__init__.py → src/_pytest/assertion/__init__.py
diff --git a/_pytest/assertion/rewrite.py → src/_pytest/assertion/rewrite.py b/_pytest/assertion/rewrite.py → src/_pytest/assertion/rewrite.py
diff --git a/_pytest/assertion/truncate.py → src/_pytest/assertion/truncate.py b/_pytest/assertion/truncate.py → src/_pytest/assertion/truncate.py
diff --git a/_pytest/assertion/util.py → src/_pytest/assertion/util.py b/_pytest/assertion/util.py → src/_pytest/assertion/util.py
diff --git a/_pytest/cacheprovider.py → src/_pytest/cacheprovider.py b/_pytest/cacheprovider.py → src/_pytest/cacheprovider.py
diff --git a/_pytest/capture.py → src/_pytest/capture.py b/_pytest/capture.py → src/_pytest/capture.py
diff --git a/_pytest/compat.py → src/_pytest/compat.py b/_pytest/compat.py → src/_pytest/compat.py
diff --git a/_pytest/config.py → src/_pytest/config.py b/_pytest/config.py → src/_pytest/config.py
diff --git a/_pytest/debugging.py → src/_pytest/debugging.py b/_pytest/debugging.py → src/_pytest/debugging.py
diff --git a/_pytest/deprecated.py → src/_pytest/deprecated.py b/_pytest/deprecated.py → src/_pytest/deprecated.py
diff --git a/_pytest/doctest.py → src/_pytest/doctest.py b/_pytest/doctest.py → src/_pytest/doctest.py
diff --git a/_pytest/fixtures.py → src/_pytest/fixtures.py b/_pytest/fixtures.py → src/_pytest/fixtures.py
diff --git a/_pytest/freeze_support.py → src/_pytest/freeze_support.py b/_pytest/freeze_support.py → src/_pytest/freeze_support.py
diff --git a/_pytest/helpconfig.py → src/_pytest/helpconfig.py b/_pytest/helpconfig.py → src/_pytest/helpconfig.py
diff --git a/_pytest/hookspec.py → src/_pytest/hookspec.py b/_pytest/hookspec.py → src/_pytest/hookspec.py
diff --git a/_pytest/junitxml.py → src/_pytest/junitxml.py b/_pytest/junitxml.py → src/_pytest/junitxml.py
diff --git a/_pytest/logging.py → src/_pytest/logging.py b/_pytest/logging.py → src/_pytest/logging.py
diff --git a/_pytest/main.py → src/_pytest/main.py b/_pytest/main.py → src/_pytest/main.py
diff --git a/_pytest/mark/__init__.py → src/_pytest/mark/__init__.py b/_pytest/mark/__init__.py → src/_pytest/mark/__init__.py
diff --git a/_pytest/mark/evaluate.py → src/_pytest/mark/evaluate.py b/_pytest/mark/evaluate.py → src/_pytest/mark/evaluate.py
diff --git a/_pytest/mark/legacy.py → src/_pytest/mark/legacy.py b/_pytest/mark/legacy.py → src/_pytest/mark/legacy.py
diff --git a/_pytest/mark/structures.py → src/_pytest/mark/structures.py b/_pytest/mark/structures.py → src/_pytest/mark/structures.py
diff --git a/_pytest/monkeypatch.py → src/_pytest/monkeypatch.py b/_pytest/monkeypatch.py → src/_pytest/monkeypatch.py
diff --git a/_pytest/nodes.py → src/_pytest/nodes.py b/_pytest/nodes.py → src/_pytest/nodes.py
diff --git a/_pytest/nose.py → src/_pytest/nose.py b/_pytest/nose.py → src/_pytest/nose.py
diff --git a/_pytest/outcomes.py → src/_pytest/outcomes.py b/_pytest/outcomes.py → src/_pytest/outcomes.py
diff --git a/_pytest/pastebin.py → src/_pytest/pastebin.py b/_pytest/pastebin.py → src/_pytest/pastebin.py
diff --git a/_pytest/pytester.py → src/_pytest/pytester.py b/_pytest/pytester.py → src/_pytest/pytester.py
diff --git a/_pytest/python.py → src/_pytest/python.py b/_pytest/python.py → src/_pytest/python.py
diff --git a/_pytest/python_api.py → src/_pytest/python_api.py b/_pytest/python_api.py → src/_pytest/python_api.py
diff --git a/_pytest/recwarn.py → src/_pytest/recwarn.py b/_pytest/recwarn.py → src/_pytest/recwarn.py
diff --git a/_pytest/resultlog.py → src/_pytest/resultlog.py b/_pytest/resultlog.py → src/_pytest/resultlog.py
diff --git a/_pytest/runner.py → src/_pytest/runner.py b/_pytest/runner.py → src/_pytest/runner.py
diff --git a/_pytest/setuponly.py → src/_pytest/setuponly.py b/_pytest/setuponly.py → src/_pytest/setuponly.py
diff --git a/_pytest/setupplan.py → src/_pytest/setupplan.py b/_pytest/setupplan.py → src/_pytest/setupplan.py
diff --git a/_pytest/skipping.py → src/_pytest/skipping.py b/_pytest/skipping.py → src/_pytest/skipping.py
diff --git a/_pytest/terminal.py → src/_pytest/terminal.py b/_pytest/terminal.py → src/_pytest/terminal.py
diff --git a/_pytest/tmpdir.py → src/_pytest/tmpdir.py b/_pytest/tmpdir.py → src/_pytest/tmpdir.py
diff --git a/_pytest/unittest.py → src/_pytest/unittest.py b/_pytest/unittest.py → src/_pytest/unittest.py
diff --git a/_pytest/warnings.py → src/_pytest/warnings.py b/_pytest/warnings.py → src/_pytest/warnings.py
diff --git a/pytest.py → src/pytest.py b/pytest.py → src/pytest.py