Move code to src/ directory

See https://hynek.me/articles/testing-packaging/ for an explanation why a src/ directory is necessary. Related: latchset/custodia#159 Signed-off-by: Christian Heimes <[email protected]>
latchset · Apr 19, 2017 · 0c02529 · 0c02529
1 parent 9eed508
commit 0c02529
Show file tree

Hide file tree

Showing 9 changed files with 4 additions and 3 deletions.
diff --git a/.coveragerc b/.coveragerc
@@ -6,7 +6,7 @@ source =
 
 [paths]
 source =
-   custodia
+   src/custodia
    .tox/*/lib/python*/site-packages/custodia
 
 [report]

diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,6 @@
 /build/
 /dist/
-/*.egg-info
+/src/*.egg-info
 __pycache__
 *.pyc
 *.pyo

diff --git a/setup.py b/setup.py
@@ -30,6 +30,7 @@
     maintainer_email='[email protected]',
     url='https://github.com/latchset/custodia.ipa',
     namespace_packages=['custodia'],
+    package_dir={'': 'src'},
     packages=[
         'custodia.ipa',
     ],

diff --git a/custodia/__init__.py → src/custodia/__init__.py b/custodia/__init__.py → src/custodia/__init__.py
diff --git a/custodia/ipa/__init__.py → src/custodia/ipa/__init__.py b/custodia/ipa/__init__.py → src/custodia/ipa/__init__.py
diff --git a/custodia/ipa/certrequest.py → src/custodia/ipa/certrequest.py b/custodia/ipa/certrequest.py → src/custodia/ipa/certrequest.py
diff --git a/custodia/ipa/interface.py → src/custodia/ipa/interface.py b/custodia/ipa/interface.py → src/custodia/ipa/interface.py
diff --git a/custodia/ipa/vault.py → src/custodia/ipa/vault.py b/custodia/ipa/vault.py → src/custodia/ipa/vault.py
diff --git a/tox.ini b/tox.ini
@@ -18,7 +18,7 @@ basepython = python2.7
 deps =
     .[test_pylint]
 commands =
-    {envpython} -m pylint -d c,r,i,W0613 -r n --notes= --disable=star-args ./custodia
+    {envpython} -m pylint -d c,r,i,W0613 -r n --notes= --disable=star-args src/custodia
 
 [testenv:pep8py2]
 basepython = python2.7