Moved package-specific tests into the package dir

pacificclimate · Jun 5, 2015 · a58e5dd · a58e5dd
1 parent 535af35
commit a58e5dd
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 0 deletions.
diff --git a/tests/conftest.py → conductor/tests/conftest.py b/tests/conftest.py → conductor/tests/conftest.py
diff --git a/tests/test_cells.py → conductor/tests/test_cells.py b/tests/test_cells.py → conductor/tests/test_cells.py
diff --git a/tests/test_conductor.py → conductor/tests/test_conductor.py b/tests/test_conductor.py → conductor/tests/test_conductor.py
diff --git a/tests/test_vic_globals.py → conductor/tests/test_vic_globals.py b/tests/test_vic_globals.py → conductor/tests/test_vic_globals.py
diff --git a/pytest.ini b/pytest.ini
@@ -0,0 +1,2 @@
+[pytest]
+norecursedirs = .git site-packages _build *.egg
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		[pytest]
		norecursedirs = .git site-packages _build *.egg