Move tests directory outside of eland namespace

.gitignore

@@ -1,5 +1,6 @@
 # Compiled python modules.
 *.pyc
+__pycache__/
 
 # Setuptools distribution folder.
 dist/
@@ -11,18 +12,19 @@ build/
 docs/build/
 
 # pytest results
-eland/tests/dataframe/results/
+tests/dataframe/results/*csv
 result_images/
 
 
 # Python egg metadata, regenerated from source files by setuptools.
 /*.egg-info
+eland.egg-info/
 
 # PyCharm files
 .idea/
 
 # vscode files
-.vscode/*
+.vscode/
 
 # pytest files
 .pytest_cache/

CONTRIBUTING.md

@@ -79,8 +79,8 @@ Once your changes and tests are ready to submit for review:
     $ nox -s format
 
     # Run the test suite
-    $ pytest --doctest-modules eland/tests/
+    $ pytest --doctest-modules tests/
-    $ pytest --nbval eland/tests/tests_notebook/
+    $ pytest --nbval tests/notebook/
 
     ```
 
@@ -182,7 +182,7 @@ currently using a minimum version of PyCharm 2019.2.4.
 * To setup test environment:
 
     ``` bash
-    > python -m eland.tests.setup_tests
+    > python -m tests.setup_tests
     ```
 
     (Note this modifies Elasticsearch indices)

docs/sphinx/development/contributing.rst

@@ -87,7 +87,7 @@ Once your changes and tests are ready to submit for review:
 
       # Run the test suite
       $ pytest --doctest-modules eland/tests/
-      $ pytest --nbval eland/tests/tests_notebook/
+      $ pytest --nbval eland/tests/notebook/
 
 2. Sign the Contributor License Agreement
 
@@ -184,7 +184,7 @@ Configuring PyCharm And Running Tests
 - To setup test environment -*note this modifies Elasticsearch indices* run
    .. code-block:: bash
 
-      python -m eland.tests.setup_tests
+      python -m tests.setup_tests
 
 - To validate installation, open python console and run
    .. code-block:: bash

noxfile.py

@@ -22,13 +22,7 @@ from pathlib import Path
 import nox
 
 BASE_DIR = Path(__file__).parent
-SOURCE_FILES = (
+SOURCE_FILES = ("setup.py", "noxfile.py", "eland/", "docs/", "utils/", "tests/")
-    "setup.py",
-    "noxfile.py",
-    "eland/",
-    "docs/",
-    "utils/",
-)
 
 # Whenever type-hints are completed on a file it should
 # be added here so that this file will continue to be checked
@@ -98,15 +92,18 @@ def lint(session):
 @nox.session(python=["3.6", "3.7", "3.8"])
 def test(session):
     session.install("-r", "requirements-dev.txt")
-    session.run("python", "-m", "eland.tests.setup_tests")
+    session.run("python", "-m", "tests.setup_tests")
     session.install(".")
     session.run(
+        "python",
+        "-m",
         "pytest",
-        "--cov=eland",
+        "--cov-report",
+        "term-missing",
+        "--cov=eland/",
         "--doctest-modules",
-        *(session.posargs or ("eland/",)),
         "--nbval",
-        "eland/tests/tests_notebook/",
+        *(session.posargs or ("eland/", "tests/")),
     )
 
     session.run(
@@ -119,7 +116,7 @@ def test(session):
         "xgboost",
         "lightgbm",
     )
-    session.run("pytest", "eland/tests/ml/")
+    session.run("pytest", "tests/ml/")
 
 
 @nox.session(reuse_venv=True)
@@ -138,7 +135,7 @@ def docs(session):
         es = elasticsearch.Elasticsearch("localhost:9200")
         es.info()
         if not es.indices.exists("flights"):
-            session.run("python", "-m", "eland.tests.setup_tests")
+            session.run("python", "-m", "tests.setup_tests")
         es_active = True
     except Exception:
         es_active = False

tests/common.py

@@ -25,7 +25,7 @@ import eland as ed
 ROOT_DIR = os.path.dirname(os.path.abspath(__file__))
 
 # Create pandas and eland data frames
-from eland.tests import (
+from tests import (
     ECOMMERCE_DF_FILE_NAME,
     ECOMMERCE_INDEX_NAME,
     ES_TEST_CLIENT,

tests/dataframe/test_aggs_pytest.py

@@ -21,7 +21,7 @@ import numpy as np
 import pytest
 from pandas.testing import assert_frame_equal, assert_series_equal
 
-from eland.tests.common import TestData
+from tests.common import TestData
 
 
 class TestDataFrameAggs(TestData):

tests/dataframe/test_big_mapping_pytest.py

@@ -18,7 +18,7 @@
 # File called _pytest for PyCharm compatability
 
 import eland as ed
-from eland.tests.common import ES_TEST_CLIENT, TestData
+from tests.common import ES_TEST_CLIENT, TestData
 
 
 class TestDataFrameBigMapping(TestData):

tests/dataframe/test_count_pytest.py

@@ -18,7 +18,7 @@
 # File called _pytest for PyCharm compatability
 from pandas.testing import assert_series_equal
 
-from eland.tests.common import TestData
+from tests.common import TestData
 
 
 class TestDataFrameCount(TestData):

tests/dataframe/test_datetime_pytest.py

@@ -24,7 +24,7 @@ from pandas.testing import assert_series_equal
 
 import eland as ed
 from eland.field_mappings import FieldMappings
-from eland.tests.common import (
+from tests.common import (
     ES_TEST_CLIENT,
     TestData,
     assert_pandas_eland_frame_equal,

tests/dataframe/test_describe_pytest.py

@@ -19,7 +19,7 @@
 
 from pandas.testing import assert_frame_equal
 
-from eland.tests.common import TestData
+from tests.common import TestData
 
 
 class TestDataFrameDescribe(TestData):

tests/dataframe/test_dir_pytest.py

@@ -18,7 +18,7 @@
 # File called _pytest for PyCharm compatibility
 
 
-from eland.tests.common import TestData
+from tests.common import TestData
 
 
 class TestDataFrameDir(TestData):

tests/dataframe/test_dtypes_pytest.py

@@ -20,7 +20,7 @@
 import numpy as np
 import pandas as pd
 
-from eland.tests.common import assert_series_equal
+from tests.common import assert_series_equal
 
 
 class TestDataFrameDtypes:

tests/dataframe/test_es_match_pytest.py

@@ -17,7 +17,7 @@
 
 # File called _pytest for PyCharm compatability
 
-from eland.tests.common import TestData
+from tests.common import TestData
 
 
 class TestEsMatch(TestData):

tests/dataframe/test_es_query_pytest.py

@@ -19,7 +19,7 @@
 
 import pytest
 
-from eland.tests.common import TestData, assert_eland_frame_equal
+from tests.common import TestData, assert_eland_frame_equal
 
 
 class TestDataEsQuery(TestData):

tests/dataframe/test_filter_pytest.py

@@ -19,7 +19,7 @@
 
 import pytest
 
-from eland.tests.common import TestData
+from tests.common import TestData
 
 
 class TestDataFrameFilter(TestData):

tests/dataframe/test_groupby_pytest.py

@@ -21,7 +21,7 @@ import pandas as pd
 import pytest
 from pandas.testing import assert_frame_equal, assert_index_equal, assert_series_equal
 
-from eland.tests.common import TestData
+from tests.common import TestData
 
 
 class TestGroupbyDataFrame(TestData):

tests/dataframe/test_head_tail_pytest.py

@@ -17,7 +17,7 @@
 
 # File called _pytest for PyCharm compatability
 
-from eland.tests.common import TestData, assert_pandas_eland_frame_equal
+from tests.common import TestData, assert_pandas_eland_frame_equal
 
 
 class TestDataFrameHeadTail(TestData):

tests/dataframe/test_hist_pytest.py

@@ -21,7 +21,7 @@ import numpy as np
 import pandas as pd
 from pandas.testing import assert_frame_equal
 
-from eland.tests.common import TestData
+from tests.common import TestData
 
 
 class TestDataFrameHist(TestData):

tests/dataframe/test_info_pytest.py

@@ -19,8 +19,8 @@
 from io import StringIO
 
 import eland as ed
-from eland.tests import ES_TEST_CLIENT
+from tests import ES_TEST_CLIENT
-from eland.tests.common import TestData
+from tests.common import TestData
 
 
 class TestDataFrameInfo(TestData):

tests/dataframe/test_init_pytest.py

@@ -21,7 +21,7 @@ import pytest
 
 import eland as ed
 from eland.query_compiler import QueryCompiler
-from eland.tests import ES_TEST_CLIENT, FLIGHTS_INDEX_NAME
+from tests import ES_TEST_CLIENT, FLIGHTS_INDEX_NAME
 
 
 class TestDataFrameInit:

tests/dataframe/test_keys_pytest.py

@@ -19,7 +19,7 @@
 
 from pandas.testing import assert_index_equal
 
-from eland.tests.common import TestData
+from tests.common import TestData
 
 
 class TestDataFrameKeys(TestData):

tests/dataframe/test_metrics_pytest.py

@@ -22,7 +22,7 @@ import pandas as pd
 import pytest
 from pandas.testing import assert_frame_equal, assert_series_equal
 
-from eland.tests.common import TestData
+from tests.common import TestData
 
 
 class TestDataFrameMetrics(TestData):

tests/dataframe/test_nunique_pytest.py

@@ -19,7 +19,7 @@
 
 from pandas.testing import assert_series_equal
 
-from eland.tests.common import TestData
+from tests.common import TestData
 
 
 class TestDataFrameNUnique(TestData):

tests/dataframe/test_query_pytest.py

@@ -20,7 +20,7 @@
 import pandas as pd
 
 import eland as ed
-from eland.tests.common import ES_TEST_CLIENT, TestData, assert_pandas_eland_frame_equal
+from tests.common import ES_TEST_CLIENT, TestData, assert_pandas_eland_frame_equal
 
 
 class TestDataFrameQuery(TestData):

tests/dataframe/test_repr_pytest.py

@@ -21,7 +21,7 @@ import pandas as pd
 import pytest
 
 from eland.dataframe import DEFAULT_NUM_ROWS_DISPLAYED
-from eland.tests.common import TestData, assert_pandas_eland_series_equal
+from tests.common import TestData, assert_pandas_eland_series_equal
 
 
 class TestDataFrameRepr(TestData):
@@ -161,6 +161,9 @@ class TestDataFrameRepr(TestData):
         ed_ecom_r = repr(ed_ecom[ed_ecom["currency"] == "USD"])
         pd_ecom_r = repr(pd_ecom[pd_ecom["currency"] == "USD"])
 
+        print(ed_ecom_r)
+        print(pd_ecom_r)
+
         assert ed_ecom_r == pd_ecom_r
 
     """

tests/dataframe/test_sample_pytest.py

@@ -20,7 +20,7 @@ import pytest
 from pandas.testing import assert_frame_equal
 
 from eland import eland_to_pandas
-from eland.tests.common import TestData
+from tests.common import TestData
 
 
 class TestDataFrameSample(TestData):

tests/dataframe/test_select_dtypes_pytest.py

@@ -18,7 +18,7 @@
 # File called _pytest for PyCharm compatability
 import numpy as np
 
-from eland.tests.common import TestData, assert_pandas_eland_frame_equal
+from tests.common import TestData, assert_pandas_eland_frame_equal
 
 
 class TestDataFrameSelectDTypes(TestData):

tests/dataframe/test_shape_pytest.py

@@ -17,7 +17,7 @@
 
 # File called _pytest for PyCharm compatability
 
-from eland.tests.common import TestData
+from tests.common import TestData
 
 
 class TestDataFrameShape(TestData):

tests/dataframe/test_to_csv_pytest.py

@@ -24,8 +24,8 @@ import pandas as pd
 from pandas.testing import assert_frame_equal
 
 import eland as ed
-from eland.tests import ES_TEST_CLIENT, FLIGHTS_INDEX_NAME
+from tests import ES_TEST_CLIENT, FLIGHTS_INDEX_NAME
-from eland.tests.common import ROOT_DIR, TestData
+from tests.common import ROOT_DIR, TestData
 
 
 class TestDataFrameToCSV(TestData):

tests/dataframe/test_utils_pytest.py

@@ -23,7 +23,7 @@ import pytest
 
 import eland as ed
 from eland.field_mappings import FieldMappings
-from eland.tests.common import ES_TEST_CLIENT, TestData, assert_pandas_eland_frame_equal
+from tests.common import ES_TEST_CLIENT, TestData, assert_pandas_eland_frame_equal
 
 
 class TestDataFrameUtils(TestData):
@@ -137,7 +137,7 @@ class TestDataFrameUtils(TestData):
 
         ES_TEST_CLIENT.indices.delete(index=index_name)
 
-    def test_eland_to_pandas_performance(self):
+    def tests_to_pandas_performance(self):
         # TODO quantify this
         ed.eland_to_pandas(self.ed_flights(), show_progress=True)
 

tests/etl/test_pandas_to_eland.py

@@ -22,7 +22,7 @@ import pytest
 from elasticsearch.helpers import BulkIndexError
 
 from eland import DataFrame, pandas_to_eland
-from eland.tests.common import (
+from tests.common import (
     ES_TEST_CLIENT,
     assert_frame_equal,
     assert_pandas_eland_frame_equal,

tests/field_mappings/test_aggregatables_pytest.py

@@ -19,8 +19,8 @@
 import pytest
 
 from eland.field_mappings import FieldMappings
-from eland.tests import ECOMMERCE_INDEX_NAME, ES_TEST_CLIENT
+from tests import ECOMMERCE_INDEX_NAME, ES_TEST_CLIENT
-from eland.tests.common import TestData
+from tests.common import TestData
 
 
 class TestAggregatables(TestData):

tests/field_mappings/test_datetime_pytest.py

@@ -19,7 +19,7 @@
 from datetime import datetime
 
 from eland.field_mappings import FieldMappings
-from eland.tests.common import ES_TEST_CLIENT, TestData
+from tests.common import ES_TEST_CLIENT, TestData
 
 
 class TestDateTime(TestData):

tests/field_mappings/test_display_names_pytest.py

@@ -19,8 +19,8 @@
 import pytest
 
 from eland.field_mappings import FieldMappings
-from eland.tests import ES_TEST_CLIENT, FLIGHTS_INDEX_NAME
+from tests import ES_TEST_CLIENT, FLIGHTS_INDEX_NAME
-from eland.tests.common import TestData
+from tests.common import TestData
 
 
 class TestDisplayNames(TestData):

tests/field_mappings/test_dtypes_pytest.py

@@ -19,8 +19,8 @@
 from pandas.testing import assert_series_equal
 
 from eland.field_mappings import FieldMappings
-from eland.tests import ES_TEST_CLIENT, FLIGHTS_INDEX_NAME
+from tests import ES_TEST_CLIENT, FLIGHTS_INDEX_NAME
-from eland.tests.common import TestData
+from tests.common import TestData
 
 
 class TestDTypes(TestData):

tests/field_mappings/test_field_name_pd_dtype_pytest.py

@@ -20,8 +20,8 @@ import pytest
 from pandas.testing import assert_series_equal
 
 from eland.field_mappings import FieldMappings
-from eland.tests import FLIGHTS_INDEX_NAME, FLIGHTS_MAPPING
+from tests import FLIGHTS_INDEX_NAME, FLIGHTS_MAPPING
-from eland.tests.common import ES_TEST_CLIENT, TestData
+from tests.common import ES_TEST_CLIENT, TestData
 
 
 class TestFieldNamePDDType(TestData):

tests/field_mappings/test_get_field_names_pytest.py

@@ -21,8 +21,8 @@ from pandas.testing import assert_index_equal
 
 # File called _pytest for PyCharm compatability
 from eland.field_mappings import FieldMappings
-from eland.tests import ES_TEST_CLIENT, FLIGHTS_INDEX_NAME
+from tests import ES_TEST_CLIENT, FLIGHTS_INDEX_NAME
-from eland.tests.common import TestData
+from tests.common import TestData
 
 
 class TestGetFieldNames(TestData):

tests/field_mappings/test_mappings_with_type_pytest.py

@@ -19,7 +19,7 @@
 import pytest
 
 from eland.field_mappings import FieldMappings
-from eland.tests.common import TestData
+from tests.common import TestData
 
 
 class TestMappingsWithType(TestData):

tests/field_mappings/test_metric_source_fields_pytest.py

@@ -20,8 +20,8 @@
 import numpy as np
 
 from eland.field_mappings import FieldMappings
-from eland.tests import ECOMMERCE_INDEX_NAME, ES_TEST_CLIENT, FLIGHTS_INDEX_NAME
+from tests import ECOMMERCE_INDEX_NAME, ES_TEST_CLIENT, FLIGHTS_INDEX_NAME
-from eland.tests.common import TestData
+from tests.common import TestData
 
 
 class TestMetricSourceFields(TestData):

tests/field_mappings/test_rename_pytest.py

@@ -18,8 +18,8 @@
 # File called _pytest for PyCharm compatability
 
 from eland.field_mappings import FieldMappings
-from eland.tests import ES_TEST_CLIENT, FLIGHTS_INDEX_NAME
+from tests import ES_TEST_CLIENT, FLIGHTS_INDEX_NAME
-from eland.tests.common import TestData
+from tests.common import TestData
 
 
 class TestRename(TestData):

tests/field_mappings/test_scripted_fields_pytest.py

@@ -21,8 +21,8 @@ from io import StringIO
 import numpy as np
 
 from eland.field_mappings import FieldMappings
-from eland.tests import ES_TEST_CLIENT, FLIGHTS_INDEX_NAME
+from tests import ES_TEST_CLIENT, FLIGHTS_INDEX_NAME
-from eland.tests.common import TestData
+from tests.common import TestData
 
 
 class TestScriptedFields(TestData):

tests/ml/test_imported_ml_model_pytest.py

@@ -19,7 +19,7 @@ import numpy as np
 import pytest
 
 from eland.ml import MLModel
-from eland.tests import ES_TEST_CLIENT, ES_VERSION
+from tests import ES_TEST_CLIENT, ES_VERSION
 
 try:
     from sklearn import datasets

tests/notebook/test_etl.ipynb

@@ -42,8 +42,8 @@
      "name": "stdout",
      "output_type": "stream",
      "text": [
-      "2020-10-26 12:19:00.259395: read 10000 rows\n",
+      "2020-10-28 22:01:46.397163: read 10000 rows\n",
-      "2020-10-26 12:19:00.948930: read 13059 rows\n"
+      "2020-10-28 22:01:47.100938: read 13059 rows\n"
      ]
     }
    ],
@@ -77,6 +77,27 @@
    "execution_count": 5,
    "metadata": {},
    "outputs": [
+    {
+     "data": {
+      "application/vnd.jupyter.widget-view+json": {
+       "model_id": "3e3e6e7371be43aabd4f9a2bb62ed737",
+       "version_major": 2,
+       "version_minor": 0
+      },
+      "text/plain": [
+       "HBox(children=(HTML(value='Progress'), FloatProgress(value=0.0, max=2.0), HTML(value='')))"
+      ]
+     },
+     "metadata": {},
+     "output_type": "display_data"
+    },
+    {
+     "name": "stdout",
+     "output_type": "stream",
+     "text": [
+      "\n"
+     ]
+    },
     {
      "data": {
       "text/html": [
@@ -205,6 +226,7 @@
     }
    ],
    "source": [
+    "# NBVAL_IGNORE_OUTPUT\n",
     "ed.csv_to_eland(\"./test_churn.csv\", es_client='localhost', es_dest_index='churn', es_refresh=True, index_col=0)"
    ]
   },

tests/plotting/test_dataframe_hist_pytest.py

@@ -20,7 +20,7 @@
 import pytest
 from matplotlib.testing.decorators import check_figures_equal
 
-from eland.tests.common import TestData
+from tests.common import TestData
 
 
 @check_figures_equal(extensions=["png"])

tests/plotting/test_series_hist_pytest.py

@@ -18,7 +18,7 @@
 # File called _pytest for PyCharm compatability
 from matplotlib.testing.decorators import check_figures_equal
 
-from eland.tests.common import TestData
+from tests.common import TestData
 
 
 @check_figures_equal(extensions=["png"])

tests/query/test_count_pytest.py

@@ -18,7 +18,7 @@
 # File called _pytest for PyCharm compatability
 
 from eland.query import Query
-from eland.tests.common import TestData
+from tests.common import TestData
 
 
 class TestQueryCopy(TestData):

tests/query_compiler/test_es_match_pytest.py

@@ -20,7 +20,7 @@
 import pytest
 
 from eland.query_compiler import QueryCompiler
-from eland.tests.common import TestData
+from tests.common import TestData
 
 
 class TestEsMatch(TestData):

tests/query_compiler/test_get_field_names_pytest.py

@@ -19,7 +19,7 @@
 import pandas as pd
 from pandas.testing import assert_index_equal
 
-from eland.tests.common import TestData
+from tests.common import TestData
 
 
 class TestGetFieldNames(TestData):

tests/series/test_arithmetics_pytest.py

@@ -19,7 +19,7 @@
 import numpy as np
 import pytest
 
-from eland.tests.common import TestData, assert_pandas_eland_series_equal
+from tests.common import TestData, assert_pandas_eland_series_equal
 
 
 class TestSeriesArithmetics(TestData):

tests/series/test_describe_pytest.py

@@ -17,7 +17,7 @@
 
 import pandas as pd
 
-from eland.tests.common import TestData, assert_series_equal
+from tests.common import TestData, assert_series_equal
 
 
 class TestSeriesDescribe(TestData):

tests/series/test_dtype_pytest.py

@@ -21,7 +21,7 @@ import numpy as np
 import pandas as pd
 
 from eland.common import EMPTY_SERIES_DTYPE, build_pd_series
-from eland.tests.common import assert_series_equal
+from tests.common import assert_series_equal
 
 
 def test_empty_series_dtypes():

tests/series/test_es_match.py

@@ -17,7 +17,7 @@
 
 # File called _pytest for PyCharm compatability
 
-from eland.tests.common import TestData
+from tests.common import TestData
 
 
 class TestEsMatch(TestData):

tests/series/test_filter_pytest.py

@@ -19,7 +19,7 @@
 
 import pytest
 
-from eland.tests.common import TestData, assert_pandas_eland_series_equal
+from tests.common import TestData, assert_pandas_eland_series_equal
 
 
 class TestSeriesFilter(TestData):

tests/series/test_head_tail_pytest.py

@@ -17,8 +17,8 @@
 
 # File called _pytest for PyCharm compatability
 import eland as ed
-from eland.tests import ES_TEST_CLIENT, FLIGHTS_INDEX_NAME
+from tests import ES_TEST_CLIENT, FLIGHTS_INDEX_NAME
-from eland.tests.common import TestData, assert_pandas_eland_series_equal
+from tests.common import TestData, assert_pandas_eland_series_equal
 
 
 class TestSeriesHeadTail(TestData):

tests/series/test_hist_pytest.py

@@ -22,7 +22,7 @@ import pandas as pd
 import pytest
 from pandas.testing import assert_frame_equal
 
-from eland.tests.common import TestData
+from tests.common import TestData
 
 
 class TestSeriesFrameHist(TestData):

tests/series/test_info_es_pytest.py

@@ -17,7 +17,7 @@
 
 # File called _pytest for PyCharm compatability
 
-from eland.tests.common import TestData
+from tests.common import TestData
 
 
 class TestSeriesInfoEs(TestData):

tests/series/test_metrics_pytest.py

@@ -23,7 +23,7 @@ import numpy as np
 import pandas as pd
 import pytest
 
-from eland.tests.common import TestData
+from tests.common import TestData
 
 
 class TestSeriesMetrics(TestData):

tests/series/test_na_pytest.py

@@ -16,7 +16,7 @@
 #  under the License.
 
 from eland import eland_to_pandas
-from eland.tests.common import TestData, assert_pandas_eland_frame_equal
+from tests.common import TestData, assert_pandas_eland_frame_equal
 
 
 class TestSeriesNA(TestData):

tests/series/test_name_pytest.py

@@ -17,8 +17,8 @@
 
 # File called _pytest for PyCharm compatability
 import eland as ed
-from eland.tests import ES_TEST_CLIENT, FLIGHTS_INDEX_NAME
+from tests import ES_TEST_CLIENT, FLIGHTS_INDEX_NAME
-from eland.tests.common import TestData, assert_pandas_eland_series_equal
+from tests.common import TestData, assert_pandas_eland_series_equal
 
 
 class TestSeriesName(TestData):

tests/series/test_rename_pytest.py

@@ -17,8 +17,8 @@
 
 # File called _pytest for PyCharm compatability
 import eland as ed
-from eland.tests import ES_TEST_CLIENT, FLIGHTS_INDEX_NAME
+from tests import ES_TEST_CLIENT, FLIGHTS_INDEX_NAME
-from eland.tests.common import TestData, assert_pandas_eland_series_equal
+from tests.common import TestData, assert_pandas_eland_series_equal
 
 
 class TestSeriesRename(TestData):

tests/series/test_repr_pytest.py

@@ -19,8 +19,8 @@
 import pandas as pd
 
 import eland as ed
-from eland.tests import ES_TEST_CLIENT, FLIGHTS_INDEX_NAME
+from tests import ES_TEST_CLIENT, FLIGHTS_INDEX_NAME
-from eland.tests.common import TestData
+from tests.common import TestData
 
 
 class TestSeriesRepr(TestData):

tests/series/test_sample_pytest.py

@@ -17,8 +17,8 @@
 
 # File called _pytest for PyCharm compatibility
 import eland as ed
-from eland.tests import ES_TEST_CLIENT, FLIGHTS_INDEX_NAME
+from tests import ES_TEST_CLIENT, FLIGHTS_INDEX_NAME
-from eland.tests.common import TestData, assert_pandas_eland_series_equal
+from tests.common import TestData, assert_pandas_eland_series_equal
 
 
 class TestSeriesSample(TestData):

tests/series/test_str_arithmetics_pytest.py

@@ -18,7 +18,7 @@
 # File called _pytest for PyCharm compatability
 import pytest
 
-from eland.tests.common import TestData, assert_pandas_eland_series_equal
+from tests.common import TestData, assert_pandas_eland_series_equal
 
 
 class TestSeriesArithmetics(TestData):

tests/series/test_value_counts_pytest.py

@@ -19,7 +19,7 @@
 import pytest
 from pandas.testing import assert_series_equal
 
-from eland.tests.common import TestData
+from tests.common import TestData
 
 
 class TestSeriesValueCounts(TestData):

tests/setup_tests.py

@@ -19,7 +19,7 @@ import pandas as pd
 from elasticsearch import helpers
 
 from eland.common import es_version
-from eland.tests import (
+from tests import (
     ECOMMERCE_FILE_NAME,
     ECOMMERCE_INDEX_NAME,
     ECOMMERCE_MAPPING,