Moving the tests folder so installing layerstack doesn't result in a 'tests' package being available

elainethale · elainethale · commit e14d8bcc21bf · 2020-09-02T09:02:09.000-06:00
diff --git a/.gitignore b/.gitignore
@@ -63,7 +63,7 @@ target/
 
 # test outputs
 .pytest_cache
-tests/outputs/
+layerstack/tests/outputs/
 
 # Visual Studio Code
 .vscode
diff --git a/README.md b/README.md
@@ -24,7 +24,7 @@ pip install git+https://github.com/Smart-DS/layerstack.git@master
 
 ## use
 
-[documentation](http://smart-ds.github.io/layerstack)
+[documentation](https://smart-ds.github.io/layerstack/)
 
 ## uninstall
 
diff --git a/docs/source/api.rst b/docs/source/api.rst
@@ -6,4 +6,3 @@ API
 
    api/modules
    api/layerstack
-   api/tests
diff --git a/docs/source/api/layerstack.rst b/docs/source/api/layerstack.rst
@@ -1,38 +1,46 @@
 layerstack package
 ==================
 
+Subpackages
+-----------
+
+.. toctree::
+   :maxdepth: 4
+
+   layerstack.tests
+
 Submodules
 ----------
 
 layerstack.args module
 ----------------------
 
 .. automodule:: layerstack.args
-    :members:
-    :undoc-members:
-    :show-inheritance:
+   :members:
+   :undoc-members:
+   :show-inheritance:
 
 layerstack.layer module
 -----------------------
 
 .. automodule:: layerstack.layer
-    :members:
-    :undoc-members:
-    :show-inheritance:
+   :members:
+   :undoc-members:
+   :show-inheritance:
 
 layerstack.stack module
 -----------------------
 
 .. automodule:: layerstack.stack
-    :members:
-    :undoc-members:
-    :show-inheritance:
+   :members:
+   :undoc-members:
+   :show-inheritance:
 
 
 Module contents
 ---------------
 
 .. automodule:: layerstack
-    :members:
-    :undoc-members:
-    :show-inheritance:
+   :members:
+   :undoc-members:
+   :show-inheritance:
diff --git a/docs/source/api/layerstack.tests.rst b/docs/source/api/layerstack.tests.rst
@@ -0,0 +1,70 @@
+layerstack.tests package
+========================
+
+Submodules
+----------
+
+layerstack.tests.conftest module
+--------------------------------
+
+.. automodule:: layerstack.tests.conftest
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
+layerstack.tests.test\_layer\_creation module
+---------------------------------------------
+
+.. automodule:: layerstack.tests.test_layer_creation
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
+layerstack.tests.test\_layerbase module
+---------------------------------------
+
+.. automodule:: layerstack.tests.test_layerbase
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
+layerstack.tests.test\_layers\_args module
+------------------------------------------
+
+.. automodule:: layerstack.tests.test_layers_args
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
+layerstack.tests.test\_session module
+-------------------------------------
+
+.. automodule:: layerstack.tests.test_session
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
+layerstack.tests.test\_stack module
+-----------------------------------
+
+.. automodule:: layerstack.tests.test_stack
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
+layerstack.tests.test\_stack\_save\_load module
+-----------------------------------------------
+
+.. automodule:: layerstack.tests.test_stack_save_load
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
+
+Module contents
+---------------
+
+.. automodule:: layerstack.tests
+   :members:
+   :undoc-members:
+   :show-inheritance:
diff --git a/docs/source/api/modules.rst b/docs/source/api/modules.rst
@@ -5,4 +5,3 @@ layerstack
    :maxdepth: 4
 
    layerstack
-   tests
diff --git a/docs/source/api/tests.rst b/docs/source/api/tests.rst
diff --git a/layerstack/tests/__init__.py b/layerstack/tests/__init__.py
diff --git a/layerstack/tests/conftest.py b/layerstack/tests/conftest.py
diff --git a/layerstack/tests/layer_library/test_list_args/layer.py b/layerstack/tests/layer_library/test_list_args/layer.py
diff --git a/layerstack/tests/test_layer_creation.py b/layerstack/tests/test_layer_creation.py
@@ -25,8 +25,8 @@
 import pytest
 
 from layerstack.layer import Layer, LayerBase, ModelLayerBase
-from tests import outdir
-from tests.test_session import manage_outdir
+from layerstack.tests import outdir
+from layerstack.tests.test_session import manage_outdir
 
 layer_library_dir = outdir / 'test_layer_creation'
 
diff --git a/layerstack/tests/test_layerbase.py b/layerstack/tests/test_layerbase.py
@@ -24,7 +24,7 @@
 from subprocess import Popen, PIPE
 import sys
 
-from tests import layer_library_dir
+from layerstack.tests import layer_library_dir
 
 logger = logging.getLogger(__name__)
 
diff --git a/layerstack/tests/test_layers_args.py b/layerstack/tests/test_layers_args.py
diff --git a/layerstack/tests/test_session.py b/layerstack/tests/test_session.py
@@ -25,7 +25,7 @@
 
 import pytest
 
-from tests import outdir
+from layerstack.tests import outdir
 
 STARTUP = True
 
diff --git a/layerstack/tests/test_stack.py b/layerstack/tests/test_stack.py
@@ -23,7 +23,7 @@
 import shutil
 
 from layerstack import ArgMode, LayerStackError, Layer, Stack
-from tests import layer_library_dir, outdir
+from layerstack.tests import layer_library_dir, outdir
 
 
 def test_layer_types():
diff --git a/layerstack/tests/test_stack_save_load.py b/layerstack/tests/test_stack_save_load.py
@@ -27,8 +27,8 @@
 from layerstack.layer import Layer
 from layerstack.stack import Stack
 
-from tests import layer_library_dir, outdir
-from tests.test_session import manage_outdir
+from layerstack.tests import layer_library_dir, outdir
+from layerstack.tests.test_session import manage_outdir
 
 
 def test_stack_list_args_layer():

Original file line number	Diff line number	Diff line change
`@@ -6,4 +6,3 @@ API`
`6`	`6`
`7`	`7`	`api/modules`
`8`	`8`	`api/layerstack`
`9`		`- api/tests`
Original file line number	Diff line number	Diff line change
`@@ -5,4 +5,3 @@ layerstack`
`5`	`5`	`:maxdepth: 4`
`6`	`6`
`7`	`7`	`layerstack`
`8`		`- tests`