From 765bb4839129af42a3ac3b1568ad8aeb7eddb678 Mon Sep 17 00:00:00 2001 From: Jeff Reback Date: Sat, 18 Mar 2017 11:28:23 -0400 Subject: [PATCH] TST: move conftest.py to top-level --- pandas/conftest.py => conftest.py | 0 pandas/tests/api/test_api.py | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename pandas/conftest.py => conftest.py (100%) diff --git a/pandas/conftest.py b/conftest.py similarity index 100% rename from pandas/conftest.py rename to conftest.py diff --git a/pandas/tests/api/test_api.py b/pandas/tests/api/test_api.py index 73222c246fc70..2972427f1b245 100644 --- 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', 'conftest'] + ignored = ['tests', 'locale'] # top-level sub-packages lib = ['api', 'compat', 'computation', 'core',