Merge ~cjwatson/lazr.delegates:src-layout into lazr.delegates:main

[Colin Watson]

Switch to a src directory layout

[Jürgen Gmach (jugmac00)]

You need to apply the following patch...

$ git diff
diff --git a/tox.ini b/tox.ini
index 0d823c9..10d788b 100644
--- a/tox.ini
+++ b/tox.ini
@@ -42,3 +42,8 @@ commands =
 source = lazr.delegates
 omit = */docs/conf.py
 parallel = true
+
+[coverage:paths]
+source =
+ src
+ .tox/*/site-packages

otherwise - as we now test the actual packages and not the source - the executed paths will look like .tox/py38/lib/python3.8/site-packages/lazr/delegates/__init__.py and coverage combine would break.

Sorry, that goes on me for my coverage combine ambition.

review: Needs Fixing

[Colin Watson (cjwatson)]

Thanks! I'd noticed some oddities, so I appreciate you tracking those down. Done.

[Jürgen Gmach (jugmac00)]

review: Approve

diff --git a/.gitignore b/.gitignore
index 16ba64f..ca6d0d8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,4 +14,4 @@ __pycache__
 htmlcov
 .tox
 *.pyc
-lazr/delegates/docs/_build
+src/lazr/delegates/docs/_build
diff --git a/MANIFEST.in b/MANIFEST.in
index 0caef62..c722bb4 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,3 +1,3 @@
 include *.py *.txt *.rst MANIFEST.in *.ini
-recursive-include lazr *.rst
+recursive-include src/lazr *.rst
 exclude .bzrignore
diff --git a/lazr/delegates/docs/CONTRIBUTING.rst b/lazr/delegates/docs/CONTRIBUTING.rst
 deleted file mode 120000
index ac9338f..0000000
--- a/lazr/delegates/docs/CONTRIBUTING.rst
+++ /dev/null
@@ -1 +0,0 @@
-../../../CONTRIBUTING.rst
 \ No newline at end of file
diff --git a/lazr/delegates/docs/NEWS.rst b/lazr/delegates/docs/NEWS.rst
 deleted file mode 120000
index c95df2b..0000000
--- a/lazr/delegates/docs/NEWS.rst
+++ /dev/null
@@ -1 +0,0 @@
-../../../NEWS.rst
 \ No newline at end of file
diff --git a/setup.py b/setup.py
index bfe9891..abe2368 100755
--- a/setup.py
+++ b/setup.py
@@ -16,14 +16,15 @@
 
 from setuptools import setup, find_packages
 
-with open('lazr/delegates/_version.py') as version_file:
+with open('src/lazr/delegates/_version.py') as version_file:
     exec(version_file.read())  # sets __version__
 
 setup(
     name='lazr.delegates',
     version=__version__,
     namespace_packages=['lazr'],
-    packages=find_packages(),
+    packages=find_packages('src'),
+    package_dir={'': 'src'},
     include_package_data=True,
     zip_safe=False,
     maintainer='LAZR Developers',
diff --git a/lazr/__init__.py b/src/lazr/__init__.py
 similarity index 100%
 rename from lazr/__init__.py
 rename to src/lazr/__init__.py
diff --git a/lazr/delegates/__init__.py b/src/lazr/delegates/__init__.py
 similarity index 100%
 rename from lazr/delegates/__init__.py
 rename to src/lazr/delegates/__init__.py
diff --git a/lazr/delegates/_delegates.py b/src/lazr/delegates/_delegates.py
 similarity index 100%
 rename from lazr/delegates/_delegates.py
 rename to src/lazr/delegates/_delegates.py
diff --git a/lazr/delegates/_passthrough.py b/src/lazr/delegates/_passthrough.py
 similarity index 100%
 rename from lazr/delegates/_passthrough.py
 rename to src/lazr/delegates/_passthrough.py
diff --git a/lazr/delegates/_python2.py b/src/lazr/delegates/_python2.py
 similarity index 100%
 rename from lazr/delegates/_python2.py
 rename to src/lazr/delegates/_python2.py
diff --git a/lazr/delegates/_python3.py b/src/lazr/delegates/_python3.py
 similarity index 100%
 rename from lazr/delegates/_python3.py
 rename to src/lazr/delegates/_python3.py
diff --git a/lazr/delegates/_version.py b/src/lazr/delegates/_version.py
 similarity index 100%
 rename from lazr/delegates/_version.py
 rename to src/lazr/delegates/_version.py
diff --git a/src/lazr/delegates/docs/CONTRIBUTING.rst b/src/lazr/delegates/docs/CONTRIBUTING.rst
 new file mode 120000
index 0000000..1d05313
--- /dev/null
+++ b/src/lazr/delegates/docs/CONTRIBUTING.rst
@@ -0,0 +1 @@
+../../../../CONTRIBUTING.rst
 \ No newline at end of file
diff --git a/src/lazr/delegates/docs/NEWS.rst b/src/lazr/delegates/docs/NEWS.rst
 new file mode 120000
index 0000000..27b815d
--- /dev/null
+++ b/src/lazr/delegates/docs/NEWS.rst
@@ -0,0 +1 @@
+../../../../NEWS.rst
 \ No newline at end of file
diff --git a/lazr/delegates/docs/__init__.py b/src/lazr/delegates/docs/__init__.py
 similarity index 100%
 rename from lazr/delegates/docs/__init__.py
 rename to src/lazr/delegates/docs/__init__.py
diff --git a/lazr/delegates/docs/conf.py b/src/lazr/delegates/docs/conf.py
 similarity index 100%
 rename from lazr/delegates/docs/conf.py
 rename to src/lazr/delegates/docs/conf.py
diff --git a/lazr/delegates/docs/index.rst b/src/lazr/delegates/docs/index.rst
 similarity index 100%
 rename from lazr/delegates/docs/index.rst
 rename to src/lazr/delegates/docs/index.rst
diff --git a/lazr/delegates/tests/__init__.py b/src/lazr/delegates/tests/__init__.py
 similarity index 100%
 rename from lazr/delegates/tests/__init__.py
 rename to src/lazr/delegates/tests/__init__.py
diff --git a/lazr/delegates/tests/test_api.py b/src/lazr/delegates/tests/test_api.py
 similarity index 100%
 rename from lazr/delegates/tests/test_api.py
 rename to src/lazr/delegates/tests/test_api.py
diff --git a/lazr/delegates/tests/test_docs.py b/src/lazr/delegates/tests/test_docs.py
 similarity index 100%
 rename from lazr/delegates/tests/test_docs.py
 rename to src/lazr/delegates/tests/test_docs.py
diff --git a/lazr/delegates/tests/test_passthrough.py b/src/lazr/delegates/tests/test_passthrough.py
 similarity index 100%
 rename from lazr/delegates/tests/test_passthrough.py
 rename to src/lazr/delegates/tests/test_passthrough.py
diff --git a/lazr/delegates/tests/test_python2.py b/src/lazr/delegates/tests/test_python2.py
 similarity index 100%
 rename from lazr/delegates/tests/test_python2.py
 rename to src/lazr/delegates/tests/test_python2.py
diff --git a/tox.ini b/tox.ini
index 57b23f3..10d788b 100644
--- a/tox.ini
+++ b/tox.ini
@@ -15,13 +15,13 @@ deps =
     zope.testrunner
     coverage
 commands =
-    coverage run -m zope.testrunner --test-path . --tests-pattern ^tests {posargs}
+    coverage run -m zope.testrunner --test-path src --tests-pattern ^tests {posargs}
 
 [testenv:docs]
 basepython =
     python3
 commands =
-    sphinx-build -b html -d lazr/delegates/docs/_build/doctrees lazr/delegates/docs lazr/delegates/docs/_build/html
+    sphinx-build -b html -d src/lazr/delegates/docs/_build/doctrees src/lazr/delegates/docs src/lazr/delegates/docs/_build/html
 deps =
     .[docs]
 
@@ -42,3 +42,8 @@ commands =
 source = lazr.delegates
 omit = */docs/conf.py
 parallel = true
+
+[coverage:paths]
+source =
+    src
+    .tox/*/site-packages