Merge pull request pytest-dev#439 from nicoddemus/src-layout

Adopt 'src' layout and add 'testing' extras
nicoddemus · Jun 6, 2019 · a630e55 · a630e55
2 parents cdf422d + 7d41db3
commit a630e55
Show file tree

Hide file tree

Showing 16 changed files with 6 additions and 4 deletions.
diff --git a/.gitignore b/.gitignore
@@ -23,7 +23,7 @@ include/
 lib/
 bin/
 env/
-xdist/_version.py*
+src/xdist/_version.py*
 pytest_xdist.egg-info
 issue/
 3rdparty/

diff --git a/setup.py b/setup.py
@@ -8,7 +8,7 @@
 
 setup(
     name="pytest-xdist",
-    use_scm_version={"write_to": "xdist/_version.py"},
+    use_scm_version={"write_to": "src/xdist/_version.py"},
     description="pytest xdist plugin for distributed testing"
     " and loop-on-failing modes",
     long_description=long_description,
@@ -17,7 +17,9 @@
     author_email="pytest-dev@python.org,holger@merlinux.eu",
     url="https://github.com/pytest-dev/pytest-xdist",
     platforms=["linux", "osx", "win32"],
-    packages=find_packages(exclude=["testing", "example"]),
+    packages=find_packages(where="src"),
+    package_dir={"": "src"},
+    extras_require={"testing": ["filelock"]},
     entry_points={
         "pytest11": ["xdist = xdist.plugin", "xdist.looponfail = xdist.looponfail"]
     },

diff --git a/xdist/__init__.py → src/xdist/__init__.py b/xdist/__init__.py → src/xdist/__init__.py
diff --git a/xdist/dsession.py → src/xdist/dsession.py b/xdist/dsession.py → src/xdist/dsession.py
diff --git a/xdist/looponfail.py → src/xdist/looponfail.py b/xdist/looponfail.py → src/xdist/looponfail.py
diff --git a/xdist/newhooks.py → src/xdist/newhooks.py b/xdist/newhooks.py → src/xdist/newhooks.py
diff --git a/xdist/plugin.py → src/xdist/plugin.py b/xdist/plugin.py → src/xdist/plugin.py
diff --git a/xdist/remote.py → src/xdist/remote.py b/xdist/remote.py → src/xdist/remote.py
diff --git a/xdist/report.py → src/xdist/report.py b/xdist/report.py → src/xdist/report.py
diff --git a/xdist/scheduler/__init__.py → src/xdist/scheduler/__init__.py b/xdist/scheduler/__init__.py → src/xdist/scheduler/__init__.py
diff --git a/xdist/scheduler/each.py → src/xdist/scheduler/each.py b/xdist/scheduler/each.py → src/xdist/scheduler/each.py
diff --git a/xdist/scheduler/load.py → src/xdist/scheduler/load.py b/xdist/scheduler/load.py → src/xdist/scheduler/load.py
diff --git a/xdist/scheduler/loadfile.py → src/xdist/scheduler/loadfile.py b/xdist/scheduler/loadfile.py → src/xdist/scheduler/loadfile.py
diff --git a/xdist/scheduler/loadscope.py → src/xdist/scheduler/loadscope.py b/xdist/scheduler/loadscope.py → src/xdist/scheduler/loadscope.py
diff --git a/xdist/workermanage.py → src/xdist/workermanage.py b/xdist/workermanage.py → src/xdist/workermanage.py
diff --git a/tox.ini b/tox.ini
@@ -6,11 +6,11 @@ envlist=
 
 [testenv]
 passenv = USER USERNAME
+extras = testing
 deps =
   pytestlatest: pytest
   pytestmaster: git+https://github.com/pytest-dev/pytest.git@master
   pytestfeatures: git+https://github.com/pytest-dev/pytest.git@features
-  filelock
 commands=
   pytest {posargs}