[#826] switch to source layout

tox-dev · May 17, 2018 · f49a0c8 · f49a0c8
1 parent cb2dff1
commit f49a0c8
Show file tree

Hide file tree

Showing 15 changed files with 9 additions and 7 deletions.
diff --git a/setup.py b/setup.py
@@ -1,7 +1,8 @@
 import io
 import sys
 
-import setuptools
+from setuptools import __version__ as setuptools_version
+from setuptools import find_packages, setup
 
 
 def has_environment_marker_support():
@@ -19,7 +20,7 @@ def has_environment_marker_support():
     import pkg_resources
 
     try:
-        v = pkg_resources.parse_version(setuptools.__version__)
+        v = pkg_resources.parse_version(setuptools_version)
         return v >= pkg_resources.parse_version("0.7.2")
     except Exception as e:
         sys.stderr.write("Could not test setuptool's version: {}\n".format(e))
@@ -33,7 +34,7 @@ def get_long_description():
 
 
 def main():
-    setuptools.setup(
+    setup(
         name="tox",
         description="virtualenv-based automation of test activities",
         long_description=get_long_description(),
@@ -43,7 +44,8 @@ def main():
         platforms=["unix", "linux", "osx", "cygwin", "win32"],
         author="holger krekel",
         author_email="holger@merlinux.eu",
-        packages=["tox"],
+        packages=find_packages("src"),
+        package_dir={"": "src"},
         entry_points={
             "console_scripts": ["tox=tox:cmdline", "tox-quickstart=tox._quickstart:main"]
         },

diff --git a/tox/__init__.py → src/tox/__init__.py b/tox/__init__.py → src/tox/__init__.py
diff --git a/tox/__main__.py → src/tox/__main__.py b/tox/__main__.py → src/tox/__main__.py
diff --git a/tox/_pytestplugin.py → src/tox/_pytestplugin.py b/tox/_pytestplugin.py → src/tox/_pytestplugin.py
diff --git a/tox/_quickstart.py → src/tox/_quickstart.py b/tox/_quickstart.py → src/tox/_quickstart.py
diff --git a/tox/_verlib.py → src/tox/_verlib.py b/tox/_verlib.py → src/tox/_verlib.py
diff --git a/tox/config.py → src/tox/config.py b/tox/config.py → src/tox/config.py
diff --git a/tox/constants.py → src/tox/constants.py b/tox/constants.py → src/tox/constants.py
diff --git a/tox/exception.py → src/tox/exception.py b/tox/exception.py → src/tox/exception.py
diff --git a/tox/hookspecs.py → src/tox/hookspecs.py b/tox/hookspecs.py → src/tox/hookspecs.py
diff --git a/tox/interpreters.py → src/tox/interpreters.py b/tox/interpreters.py → src/tox/interpreters.py
diff --git a/tox/result.py → src/tox/result.py b/tox/result.py → src/tox/result.py
diff --git a/tox/session.py → src/tox/session.py b/tox/session.py → src/tox/session.py
diff --git a/tox/venv.py → src/tox/venv.py b/tox/venv.py → src/tox/venv.py
diff --git a/tox.ini b/tox.ini
@@ -42,7 +42,7 @@ commands = pre-commit run --all-files --show-diff-on-failure
 description = combine coverage data and create reports
 deps = coverage
 skip_install = True
-changedir = {toxworkdir}
+changedir = {toxworkdir}/src
 setenv = COVERAGE_FILE=.coverage
 commands = coverage erase
            coverage combine
@@ -97,7 +97,7 @@ show_missing = True
 exclude_lines = if __name__ == ["']__main__["']:
 
 [coverage:paths]
-source = tox
+source = src/tox
          {toxworkdir}/*/lib/python*/site-packages/tox
          {toxworkdir}/*/Lib/site-packages/tox
          {toxworkdir}/pypy*/site-packages/tox
@@ -115,4 +115,4 @@ include_trailing_comma = True
 force_grid_wrap = 0
 line_length = 99
 known_first_party = tox
-known_third_party = pkg_resources,pluggy,py,pytest,setuptools,six
+known_third_party = pkg_resources,pluggy,py,pytest,setuptools,six,tox