Merge pull request #123 from pastas/deprecate_connectors

Deprecate PystoreConnector and ArcticConnector

pastastore/connectors.py

@@ -29,6 +29,12 @@ def __init__(self, name: str, connstr: str):
         connstr : str
             connection string (e.g. 'mongodb://localhost:27017/')
         """
+        warnings.warn(
+            "ArcticConnector is deprecated. Please use a different "
+            "connector, e.g. `pst.ArcticDBConnector`.",
+            DeprecationWarning,
+            stacklevel=1,
+        )
         try:
             import arctic
         except ModuleNotFoundError as e:
@@ -392,6 +398,12 @@ def __init__(self, name: str, path: str):
         path : str
             path to the pystore directory
         """
+        warnings.warn(
+            "PystoreConnector is deprecated. Please use a different "
+            "connector, e.g. `pst.PasConnector`.",
+            DeprecationWarning,
+            stacklevel=1,
+        )
         try:
             import pystore
         except ModuleNotFoundError as e:

pyproject.toml

@@ -58,16 +58,9 @@ test = [
     "pytest-dependency",
     "pytest-benchmark",
     "codacy-coverage",
-    "lxml",                               # temporary fix: for hydropandas 0.8.0
+    "lxml",
 ]
-pystore = ["fsspec>=0.3.3", "python-snappy", "dask[dataframe]"]
-arctic = [
-    "arctic", # will not work as releases not uploaded to PyPI
-]
-arcticdb = [
-    "arcticdb",
-    "protobuf~=4.0",
-] # TODO: temporarily set protobuf to version 4
+arcticdb = ["arcticdb"]
 docs = [
     "pastastore[optional]",
     "sphinx_rtd_theme",

tests/test_006_benchmark.py

@@ -29,22 +29,6 @@ def test_benchmark_write_series_pas(benchmark):
     _ = benchmark(series_write, conn=conn)
 
 
-@pytest.mark.benchmark(group="write_series")
-@requires_pkg("pystore")
-def test_benchmark_write_series_pystore(benchmark):
-    path = "./tests/data/pystore"
-    conn = pst.PystoreConnector("test", path)
-    _ = benchmark(series_write, conn=conn)
-
-
-@pytest.mark.benchmark(group="write_series")
-@requires_pkg("arctic")
-def test_benchmark_write_series_arctic(benchmark):
-    connstr = "mongodb://localhost:27017/"
-    conn = pst.ArcticConnector("test", connstr)
-    _ = benchmark(series_write, conn=conn)
-
-
 @pytest.mark.benchmark(group="write_series")
 @requires_pkg("arcticdb")
 def test_benchmark_write_series_arcticdb(benchmark):
@@ -73,22 +57,6 @@ def test_benchmark_read_series_pas(benchmark):
     _ = benchmark(series_read, conn=conn)
 
 
-@pytest.mark.benchmark(group="read_series")
-@requires_pkg("pystore")
-def test_benchmark_read_series_pystore(benchmark):
-    path = "./tests/data/pystore"
-    conn = pst.PystoreConnector("test", path)
-    _ = benchmark(series_read, conn=conn)
-
-
-@pytest.mark.benchmark(group="read_series")
-@requires_pkg("arctic")
-def test_benchmark_read_series_arctic(benchmark):
-    connstr = "mongodb://localhost:27017/"
-    conn = pst.ArcticConnector("test", connstr)
-    _ = benchmark(series_read, conn=conn)
-
-
 @pytest.mark.benchmark(group="read_series")
 @requires_pkg("arcticdb")
 def test_benchmark_read_series_arcticdb(benchmark):
@@ -145,24 +113,6 @@ def test_benchmark_write_model_pas(benchmark):
     _ = benchmark(write_model, conn=conn, ml=ml)
 
 
-@pytest.mark.benchmark(group="write_model")
-@requires_pkg("pystore")
-def test_benchmark_write_model_pystore(benchmark):
-    path = "./tests/data/pystore"
-    conn = pst.PystoreConnector("test", path)
-    ml = build_model(conn)
-    _ = benchmark(write_model, conn=conn, ml=ml)
-
-
-@pytest.mark.benchmark(group="write_model")
-@requires_pkg("arctic")
-def test_benchmark_write_model_arctic(benchmark):
-    connstr = "mongodb://localhost:27017/"
-    conn = pst.ArcticConnector("test", connstr)
-    ml = build_model(conn)
-    _ = benchmark(write_model, conn=conn, ml=ml)
-
-
 @pytest.mark.benchmark(group="write_model")
 @requires_pkg("arcticdb")
 def test_benchmark_write_model_arcticdb(benchmark):
@@ -187,24 +137,6 @@ def test_benchmark_write_model_nocheckts_pas(benchmark):
     _ = benchmark(write_model_nocheckts, conn=conn, ml=ml)
 
 
-@pytest.mark.benchmark(group="write_model")
-@requires_pkg("pystore")
-def test_benchmark_write_model_nocheckts_pystore(benchmark):
-    path = "./tests/data/pystore"
-    conn = pst.PystoreConnector("test", path)
-    ml = build_model(conn)
-    _ = benchmark(write_model_nocheckts, conn=conn, ml=ml)
-
-
-@pytest.mark.benchmark(group="write_model")
-@requires_pkg("arctic")
-def test_benchmark_write_model_nocheckts_arctic(benchmark):
-    connstr = "mongodb://localhost:27017/"
-    conn = pst.ArcticConnector("test", connstr)
-    ml = build_model(conn)
-    _ = benchmark(write_model_nocheckts, conn=conn, ml=ml)
-
-
 @pytest.mark.benchmark(group="write_model")
 @requires_pkg("arcticdb")
 def test_benchmark_write_model_nocheckts_arcticdb(benchmark):
@@ -235,24 +167,6 @@ def test_benchmark_read_model_pas(benchmark):
     pst.util.delete_pas_connector(conn)
 
 
-@pytest.mark.benchmark(group="read_model")
-@requires_pkg("pystore")
-def test_benchmark_read_model_pystore(benchmark):
-    path = "./tests/data/pystore"
-    conn = pst.PystoreConnector("test", path)
-    _ = benchmark(read_model, conn=conn)
-    pst.util.delete_pystore_connector(conn=conn)
-
-
-@pytest.mark.benchmark(group="read_model")
-@requires_pkg("arctic")
-def test_benchmark_read_model_arctic(benchmark):
-    connstr = "mongodb://localhost:27017/"
-    conn = pst.ArcticConnector("test", connstr)
-    _ = benchmark(read_model, conn=conn)
-    pst.util.delete_arctic_connector(conn=conn)
-
-
 @pytest.mark.benchmark(group="read_model")
 @requires_pkg("arcticdb")
 def test_benchmark_read_model_arcticdb(benchmark):