Revert "TST: move conftest.py to top-level (#15731)"

This reverts commit 6a52c15.
pandas-dev · Mar 18, 2017 · 59b88ab · 59b88ab
1 parent 6333412
commit 59b88ab
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 1 deletion.
diff --git a/conftest.py → pandas/conftest.py b/conftest.py → pandas/conftest.py
diff --git a/pandas/tests/api/test_api.py b/pandas/tests/api/test_api.py
@@ -29,7 +29,7 @@ class TestPDApi(Base, tm.TestCase):
 
     # these are optionally imported based on testing
     # & need to be ignored
-    ignored = ['tests', 'locale']
+    ignored = ['tests', 'locale', 'conftest']
 
     # top-level sub-packages
     lib = ['api', 'compat', 'computation', 'core',