Refactor tests

.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/
+test_eland/test_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

@@ -153,7 +153,7 @@ currently using a minimum version of PyCharm 2019.2.4.
     environment and run `pip install -r requirements-dev.txt`
 -   Setup Elasticsearch instance with docker `ELASTICSEARCH_VERSION=elasticsearch:7.x-SNAPSHOT .ci/run-elasticsearch.sh` and check `http://localhost:9200`
 - Run
-    `python -m eland.tests.setup_tests` to setup test environment -*note
+    `python -m test_eland.setup_tests` to setup test environment -*note
     this modifies Elasticsearch indices*
 -   Install local `eland` module (required to execute notebook tests)
     `python setup.py install`

docs/sphinx/development/contributing.rst

@@ -155,7 +155,7 @@ Configuring PyCharm And Running Tests
 -  Install development requirements. Open terminal in virtual
    environment and run ``pip install -r requirements-dev.txt``
 -  Setup Elasticsearch instance (assumes ``localhost:9200``), and run
-   ``python -m eland.tests.setup_tests`` to setup test environment -
+   ``python -m test_eland/.setup_tests`` to setup test environment -
    *note this modifies Elasticsearch indices*
 -  Run ``pytest --doctest-modules`` to validate install
 -  To test specific versions of Python use ``nox -s test-3.8``

noxfile.py

@@ -22,13 +22,7 @@
 import nox
 
 BASE_DIR = Path(__file__).parent
-SOURCE_FILES = (
-    "setup.py",
-    "noxfile.py",
-    "eland/",
-    "docs/",
-    "utils/",
-)
+SOURCE_FILES = ("setup.py", "noxfile.py", "eland/", "docs/", "utils/", "test_eland/")
 
 # Whenever type-hints are completed on a file it should
 # be added here so that this file will continue to be checked
@@ -98,10 +92,12 @@ 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", "test_eland.setup_tests")
     session.install(".")
-    session.run("pytest", "--doctest-modules", *(session.posargs or ("eland/",)))
-    session.run("pytest", "--nbval", "eland/tests/tests_notebook/")
+    session.run(
+        "pytest", "--doctest-modules", *(session.posargs or ("test_eland/", "eland/"))
+    )
+    session.run("pytest", "--nbval", "test_eland/tests_notebook/")
 
     session.run(
         "python",
@@ -113,7 +109,7 @@ def test(session):
         "xgboost",
         "lightgbm",
     )
-    session.run("pytest", "eland/tests/ml/")
+    session.run("pytest", "test_eland/test_ml/")
 
 
 @nox.session(reuse_venv=True)
@@ -132,7 +128,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", "test_eland.setup_tests")
         es_active = True
     except Exception:
         es_active = False

eland/tests/common.py → test_eland/common.py

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

eland/tests/setup_tests.py → test_eland/setup_tests.py

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

eland/tests/dataframe/test_aggs_pytest.py → test_eland/test_dataframe/test_aggs_pytest.py

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

eland/tests/dataframe/test_big_mapping_pytest.py → test_eland/test_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 test_eland.common import ES_TEST_CLIENT, TestData
 
 
 class TestDataFrameBigMapping(TestData):

eland/tests/dataframe/test_count_pytest.py → test_eland/test_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 test_eland.common import TestData
 
 
 class TestDataFrameCount(TestData):

eland/tests/dataframe/test_datetime_pytest.py → test_eland/test_dataframe/test_datetime_pytest.py

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

eland/tests/dataframe/test_describe_pytest.py → test_eland/test_dataframe/test_describe_pytest.py

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

eland/tests/dataframe/test_dir_pytest.py → test_eland/test_dataframe/test_dir_pytest.py

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

eland/tests/dataframe/test_dtypes_pytest.py → test_eland/test_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 test_eland.common import assert_series_equal
 
 
 class TestDataFrameDtypes:

eland/tests/dataframe/test_es_match_pytest.py → test_eland/test_dataframe/test_es_match_pytest.py

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

eland/tests/dataframe/test_es_query_pytest.py → test_eland/test_dataframe/test_es_query_pytest.py

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

eland/tests/dataframe/test_filter_pytest.py → test_eland/test_dataframe/test_filter_pytest.py

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

eland/tests/dataframe/test_groupby_pytest.py → test_eland/test_dataframe/test_groupby_pytest.py

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

eland/tests/dataframe/test_head_tail_pytest.py → test_eland/test_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 test_eland.common import TestData, assert_pandas_eland_frame_equal
 
 
 class TestDataFrameHeadTail(TestData):

eland/tests/dataframe/test_hist_pytest.py → test_eland/test_dataframe/test_hist_pytest.py

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

eland/tests/dataframe/test_info_pytest.py → test_eland/test_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 eland.tests.common import TestData
+from test_eland import ES_TEST_CLIENT
+from test_eland.common import TestData
 
 
 class TestDataFrameInfo(TestData):

eland/tests/dataframe/test_init_pytest.py → test_eland/test_dataframe/test_init_pytest.py

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

eland/tests/dataframe/test_keys_pytest.py → test_eland/test_dataframe/test_keys_pytest.py

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

eland/tests/dataframe/test_metrics_pytest.py → test_eland/test_dataframe/test_metrics_pytest.py

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

eland/tests/dataframe/test_nunique_pytest.py → test_eland/test_dataframe/test_nunique_pytest.py

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

eland/tests/dataframe/test_query_pytest.py → test_eland/test_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 test_eland.common import ES_TEST_CLIENT, TestData, assert_pandas_eland_frame_equal
 
 
 class TestDataFrameQuery(TestData):

eland/tests/dataframe/test_repr_pytest.py → test_eland/test_dataframe/test_repr_pytest.py

@@ -21,7 +21,7 @@
 import pytest
 
 from eland.dataframe import DEFAULT_NUM_ROWS_DISPLAYED
-from eland.tests.common import TestData, assert_pandas_eland_series_equal
+from test_eland.common import TestData, assert_pandas_eland_series_equal
 
 
 class TestDataFrameRepr(TestData):
@@ -159,6 +159,9 @@ def test_empty_dataframe_repr(self):
         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
 
     """

eland/tests/dataframe/test_sample_pytest.py → test_eland/test_dataframe/test_sample_pytest.py

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

eland/tests/dataframe/test_select_dtypes_pytest.py → test_eland/test_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 test_eland.common import TestData, assert_pandas_eland_frame_equal
 
 
 class TestDataFrameSelectDTypes(TestData):

eland/tests/dataframe/test_shape_pytest.py → test_eland/test_dataframe/test_shape_pytest.py

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

eland/tests/dataframe/test_to_csv_pytest.py → test_eland/test_dataframe/test_to_csv_pytest.py

@@ -24,13 +24,13 @@
 from pandas.testing import assert_frame_equal
 
 import eland as ed
-from eland.tests import ES_TEST_CLIENT, FLIGHTS_INDEX_NAME
-from eland.tests.common import ROOT_DIR, TestData
+from test_eland import ES_TEST_CLIENT, FLIGHTS_INDEX_NAME
+from test_eland.common import ROOT_DIR, TestData
 
 
 class TestDataFrameToCSV(TestData):
     def test_to_csv_head(self):
-        results_file = ROOT_DIR + "/dataframe/results/test_to_csv_head.csv"
+        results_file = ROOT_DIR + "/test_dataframe/results/test_to_csv_head.csv"
 
         ed_flights = self.ed_flights().head()
         pd_flights = self.pd_flights().head()
@@ -50,7 +50,7 @@ def test_to_csv_head(self):
         assert_frame_equal(pd_flights, pd_from_csv)
 
     def test_to_csv_full(self):
-        results_file = ROOT_DIR + "/dataframe/results/test_to_csv_full.csv"
+        results_file = ROOT_DIR + "/test_dataframe/results/test_to_csv_full.csv"
 
         # Test is slow as it's for the full dataset, but it is useful as it goes over 10000 docs
         ed_flights = self.ed_flights()

eland/tests/dataframe/test_utils_pytest.py → test_eland/test_dataframe/test_utils_pytest.py

@@ -23,7 +23,7 @@
 
 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 test_eland.common import ES_TEST_CLIENT, TestData, assert_pandas_eland_frame_equal
 
 
 class TestDataFrameUtils(TestData):

eland/tests/etl/test_pandas_to_eland.py → test_eland/test_etl/test_pandas_to_eland.py

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

eland/tests/field_mappings/test_aggregatables_pytest.py → test_eland/test_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 eland.tests.common import TestData
+from test_eland import ECOMMERCE_INDEX_NAME, ES_TEST_CLIENT
+from test_eland.common import TestData
 
 
 class TestAggregatables(TestData):

eland/tests/field_mappings/test_datetime_pytest.py → test_eland/test_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 test_eland.common import ES_TEST_CLIENT, TestData
 
 
 class TestDateTime(TestData):