moved tests down a notch

DamCB · Feb 13, 2017 · 9c5ddaa · 9c5ddaa
1 parent 2159bae
commit 9c5ddaa
Show file tree

Hide file tree

Showing 19 changed files with 2 additions and 10 deletions.
diff --git a/.coveragerc b/.coveragerc
@@ -1,8 +1,3 @@
-[paths]
-source =
-     tyssue/
-     build/lib/tyssue
-
 [report]
 exclude_lines =
       pragma: no cover
diff --git a/Makefile b/Makefile
@@ -4,10 +4,7 @@ flake8:
 	flake8 --max-line-length=100 --count --statistics --exit-zero tyssue/
 
 test:
-	py.test
+	cd tyssue/ && py.test && cd ..
 
 coverage:
-	py.test --cov-config .coveragerc
-
-full-test:
-	bash .full_test.sh
+	cd tyssue/ && py.test --cov=tyssue --cov-config ../.coveragerc --cov-report=term && cd ..
diff --git a/tests/config/test_config.json → tyssue/tests/config/test_config.json b/tests/config/test_config.json → tyssue/tests/config/test_config.json
diff --git a/tests/config/test_json_parser.py → tyssue/tests/config/test_json_parser.py b/tests/config/test_json_parser.py → tyssue/tests/config/test_json_parser.py
diff --git a/tests/core/test_generation.py → tyssue/tests/core/test_generation.py b/tests/core/test_generation.py → tyssue/tests/core/test_generation.py
diff --git a/tests/core/test_monolayer.py → tyssue/tests/core/test_monolayer.py b/tests/core/test_monolayer.py → tyssue/tests/core/test_monolayer.py
diff --git a/tests/core/test_multisheet.py → tyssue/tests/core/test_multisheet.py b/tests/core/test_multisheet.py → tyssue/tests/core/test_multisheet.py
diff --git a/tests/core/test_objects.py → tyssue/tests/core/test_objects.py b/tests/core/test_objects.py → tyssue/tests/core/test_objects.py
diff --git a/tests/dynamics/test_model.py → tyssue/tests/dynamics/test_model.py b/tests/dynamics/test_model.py → tyssue/tests/dynamics/test_model.py
diff --git a/tests/geometry/test_bulkgeometry.py → tyssue/tests/geometry/test_bulkgeometry.py b/tests/geometry/test_bulkgeometry.py → tyssue/tests/geometry/test_bulkgeometry.py
diff --git a/tests/geometry/test_cellcell_geometry.py → .../tests/geometry/test_cellcell_geometry.py b/tests/geometry/test_cellcell_geometry.py → .../tests/geometry/test_cellcell_geometry.py
diff --git a/tests/geometry/test_geometry.py → tyssue/tests/geometry/test_geometry.py b/tests/geometry/test_geometry.py → tyssue/tests/geometry/test_geometry.py
diff --git a/tests/geometry/test_multisheetgeom.py → tyssue/tests/geometry/test_multisheetgeom.py b/tests/geometry/test_multisheetgeom.py → tyssue/tests/geometry/test_multisheetgeom.py
diff --git a/tests/geometry/test_planar_geometry.py → ...ue/tests/geometry/test_planar_geometry.py b/tests/geometry/test_planar_geometry.py → ...ue/tests/geometry/test_planar_geometry.py
diff --git a/tests/geometry/test_sheet_geometry.py → tyssue/tests/geometry/test_sheet_geometry.py b/tests/geometry/test_sheet_geometry.py → tyssue/tests/geometry/test_sheet_geometry.py
diff --git a/tests/solvers/test_sheet_solver.py → tyssue/tests/solvers/test_sheet_solver.py b/tests/solvers/test_sheet_solver.py → tyssue/tests/solvers/test_sheet_solver.py
diff --git a/tests/topology/test_bulk_topology.py → tyssue/tests/topology/test_bulk_topology.py b/tests/topology/test_bulk_topology.py → tyssue/tests/topology/test_bulk_topology.py
diff --git a/tests/topology/test_topology.py → tyssue/tests/topology/test_topology.py b/tests/topology/test_topology.py → tyssue/tests/topology/test_topology.py
diff --git a/tests/utils/test_utils.py → tyssue/tests/utils/test_utils.py b/tests/utils/test_utils.py → tyssue/tests/utils/test_utils.py