pastastore 1.10.2__py3-none-any.whl → 1.12.0__py3-none-any.whl

pastastore/yaml_interface.py

@@ -6,6 +6,7 @@ import os
 import tempfile
 from contextlib import contextmanager
 from copy import deepcopy
+from pathlib import Path
 from typing import Any, Dict, List, Optional, Union
 
 import numpy as np
@@ -13,8 +14,6 @@ import pandas as pd
 import pastas as ps
 import yaml
 
-from pastastore.version import PASTAS_LEQ_022
-
 logger = logging.getLogger(__name__)
 
 
@@ -38,9 +37,9 @@ def _convert_dict_dtypes_for_yaml(d: Dict[str, Any]):
         elif isinstance(v, datetime.datetime):
             d[k] = pd.to_datetime(v).strftime("%Y-%m-%d %H:%M:%S")
         elif isinstance(v, pd.Timedelta):
-            d[k] = v.to_timedelta64().__str__()
+            d[k] = str(v.to_timedelta64())
         elif isinstance(v, datetime.timedelta):
-            d[k] = pd.to_timedelta(v).to_timedelta64().__str__()
+            d[k] = str(pd.to_timedelta(v).to_timedelta64())
         elif isinstance(v, np.int64):
             d[k] = int(v)
         elif isinstance(v, np.float64):
@@ -109,7 +108,7 @@ def reduce_to_minimal_dict(d, keys=None):
             "stress",
             "prec",
             "evap",
-            "stressmodel" if PASTAS_LEQ_022 else "class",
+            "class",
         ]
 
     # also keep stressmodels by adding names to keys list
@@ -133,7 +132,7 @@ def temporary_yaml_from_str(yaml):
     temp.write(yaml.encode("utf-8"))
     temp.close()
     try:
-        yield temp.name
+        yield Path(temp.name)
     finally:
         os.unlink(temp.name)
 
@@ -230,7 +229,7 @@ class PastastoreYAML:
             else:
                 kind = "prec"
             pnam = self.pstore.get_nearest_stresses(onam, kind=kind).iloc[0, 0]
-            logger.info(f"  | using nearest stress with kind='{kind}': '{pnam}'")
+            logger.info("  | using nearest stress with kind='%s': '%s'", kind, pnam)
             p, pmeta = self.pstore.get_stresses(pnam, return_metadata=True)
             prec = {
                 "name": pnam,
@@ -266,7 +265,7 @@ class PastastoreYAML:
             else:
                 kind = "evap"
             enam = self.pstore.get_nearest_stresses(onam, kind=kind).iloc[0, 0]
-            logger.info(f"  | using nearest stress with kind='{kind}': '{enam}'")
+            logger.info("  | using nearest stress with kind='%s': '%s'", kind, enam)
             e, emeta = self.pstore.get_stresses(enam, return_metadata=True)
             evap = {
                 "name": enam,
@@ -291,11 +290,11 @@ class PastastoreYAML:
         if "rfunc" not in d:
             logger.info("  | no 'rfunc' provided, using 'Exponential'")
         # for pastas >= 0.23.0, convert rfunc value to dictionary with 'class' key
-        elif not isinstance(d["rfunc"], dict) and not PASTAS_LEQ_022:
+        elif not isinstance(d["rfunc"], dict):
             d["rfunc"] = {"class": d["rfunc"]}
 
         # stressmodel
-        classkey = "stressmodel" if PASTAS_LEQ_022 else "class"
+        classkey = "class"
         if classkey not in d:
             d[classkey] = "RechargeModel"
 
@@ -303,7 +302,7 @@ class PastastoreYAML:
         if ("recharge" not in d) and (d[classkey] == "RechargeModel"):
             logger.info("  | no 'recharge' type provided, using 'Linear'")
         # if pastas >= 0.23.0, recharge value must be dict with class key
-        elif not isinstance(d["recharge"], dict) and not PASTAS_LEQ_022:
+        elif not isinstance(d["recharge"], dict):
             d["recharge"] = {"class": d["recharge"]}
 
         # tarsomodel logic
@@ -314,7 +313,8 @@ class PastastoreYAML:
             if ((dmin is None) or (dmax is None)) and (oseries is None):
                 logger.info(
                     "  | no 'dmin/dmax' or 'oseries' provided,"
-                    f" filling in 'oseries': '{onam}'"
+                    " filling in 'oseries': '%s'",
+                    onam,
                 )
                 d["oseries"] = onam
 
@@ -365,7 +365,7 @@ class PastastoreYAML:
                 snam = self.pstore.get_nearest_oseries(onam).iloc[0, 0]
             else:
                 snam = self.pstore.get_nearest_stresses(onam, kind=kind).iloc[0, 0]
-            logger.info(f"  | using nearest stress with kind='{kind}': {snam}")
+            logger.info("  | using nearest stress with kind='%s': %s", kind, snam)
 
         s, smeta = self.pstore.get_stresses(snam, return_metadata=True)
         s = {
@@ -374,7 +374,7 @@ class PastastoreYAML:
             "metadata": smeta,
             "series": s.squeeze(),
         }
-        d["stress"] = [s] if PASTAS_LEQ_022 else s
+        d["stress"] = s
 
         # use stress name if not provided
         if "name" not in d:
@@ -383,9 +383,9 @@ class PastastoreYAML:
         # rfunc
         if "rfunc" not in d:
             logger.info("  | no 'rfunc' provided, using 'Gamma'")
-            d["rfunc"] = "Gamma" if PASTAS_LEQ_022 else {"class": "Gamma"}
+            d["rfunc"] = {"class": "Gamma"}
         # for pastas >= 0.23.0, convert rfunc value to dictionary with 'class' key
-        elif not isinstance(d["rfunc"], dict) and not PASTAS_LEQ_022:
+        elif not isinstance(d["rfunc"], dict):
             d["rfunc"] = {"class": d["rfunc"]}
 
         return d
@@ -441,7 +441,10 @@ class PastastoreYAML:
                     .values
                 )
                 logger.info(
-                    f"  | using {n} nearest stress(es) with kind='{kind}': {snames}"
+                    "  | using %d nearest stress(es) with kind='%s': %s",
+                    n,
+                    kind,
+                    snames,
                 )
             else:
                 snames = [snames]
@@ -472,11 +475,9 @@ class PastastoreYAML:
         # rfunc
         if "rfunc" not in d:
             logger.info("  | no 'rfunc' provided, using 'HantushWellModel'")
-            d["rfunc"] = (
-                "HantushWellModel" if PASTAS_LEQ_022 else {"class": "HantushWellModel"}
-            )
+            d["rfunc"] = {"class": "HantushWellModel"}
         # for pastas >= 0.23.0, convert rfunc value to dictionary with 'class' key
-        elif not isinstance(d["rfunc"], dict) and not PASTAS_LEQ_022:
+        elif not isinstance(d["rfunc"], dict):
             d["rfunc"] = {"class": d["rfunc"]}
 
         if "up" not in d:
@@ -510,7 +511,7 @@ class PastastoreYAML:
         else:
             onam = str(mlyml.pop("oseries"))
 
-        logger.info(f"Building model '{mlnam}' for oseries '{onam}'")
+        logger.info("Building model '%s' for oseries '%s'", mlnam, onam)
         o, ometa = self.pstore.get_oseries(onam, return_metadata=True)
 
         # create model to obtain default model settings
@@ -528,14 +529,11 @@ class PastastoreYAML:
                 name = smyml.get("name", smnam)
             else:
                 name = smnam
-            logger.info(f"| parsing stressmodel: '{name}'")
+            logger.info("| parsing stressmodel: '%s'", name)
 
             # check whether smtyp is defined
-            classkey = "stressmodel" if PASTAS_LEQ_022 else "class"
+            classkey = "class"
             if smyml is not None:
-                if PASTAS_LEQ_022:
-                    if "class" in smyml:
-                        smyml["stressmodel"] = smyml.pop("class")
                 if classkey in smyml:
                     smtyp = True
                 else:
@@ -637,10 +635,10 @@ class PastastoreYAML:
         """
         if "\n" in fyaml or "\r" in fyaml:
             with temporary_yaml_from_str(fyaml) as fyaml:
-                with open(fyaml, "r") as f:
+                with fyaml.open("r", encoding="utf-8") as f:
                     yml = yaml.load(f, Loader=yaml.CFullLoader)
-        elif os.path.exists(fyaml):
-            with open(fyaml, "r") as f:
+        elif Path(fyaml).exists():
+            with Path(fyaml).open("r", encoding="utf-8") as f:
                 yml = yaml.load(f, Loader=yaml.CFullLoader)
         else:
             raise ValueError(
@@ -655,8 +653,8 @@ class PastastoreYAML:
 
             mldict = self.construct_mldict(mlyml, mlnam)
 
-            # load model
-            ml = ps.io.base._load_model(mldict)
+            # Use pastas' internal _load_model - required for model reconstruction
+            ml = ps.io.base._load_model(mldict)  # noqa: SLF001
             models.append(ml)
 
         return models
@@ -664,7 +662,7 @@ class PastastoreYAML:
     def export_stored_models_per_oseries(
         self,
         oseries: Optional[Union[List[str], str]] = None,
-        outdir: Optional[str] = ".",
+        outdir: Optional[Path | str] = ".",
         minimal_yaml: Optional[bool] = False,
         use_nearest: Optional[bool] = False,
     ):
@@ -690,7 +688,7 @@ class PastastoreYAML:
             the time series are actually the nearest ones! Only used
             when minimal_yaml=True. Default is False.
         """
-        onames = self.pstore.conn._parse_names(oseries, "oseries")
+        onames = self.pstore.conn.parse_names(oseries, "oseries")
 
         for onam in onames:
             try:
@@ -716,7 +714,7 @@ class PastastoreYAML:
                 name = d.pop("name")
                 model_dicts[name] = d
 
-            with open(os.path.join(outdir, f"{onam}.yaml"), "w") as f:
+            with (Path(outdir) / f"{onam}.yaml").open("w", encoding="utf-8") as f:
                 yaml.dump(model_dicts, f, Dumper=yaml.CDumper)
 
     def export_models(
@@ -758,7 +756,7 @@ class PastastoreYAML:
             filename for YAML file, only used if `split=False`
         """
         if models is None:
-            modelnames = self.pstore.conn._parse_names(modelnames, "models")
+            modelnames = self.pstore.conn.parse_names(modelnames, "models")
             model_list = self.pstore.get_models(
                 modelnames, return_dict=True, squeeze=False
             )
@@ -783,13 +781,13 @@ class PastastoreYAML:
                 name = d.pop("name")
                 model_dicts[name] = d
 
-            with open(os.path.join(outdir, filename), "w") as f:
+            with (Path(outdir) / filename).open("w", encoding="utf-8") as f:
                 yaml.dump(model_dicts, f, Dumper=yaml.CDumper)
 
     @staticmethod
     def export_model(
         ml: Union[ps.Model, dict],
-        outdir: Optional[str] = ".",
+        outdir: Optional[Path | str] = ".",
         minimal_yaml: Optional[bool] = False,
         use_nearest: Optional[bool] = False,
     ):
@@ -816,7 +814,7 @@ class PastastoreYAML:
             name = ml["name"]
         else:
             name = ml.name
-        with open(os.path.join(outdir, f"{name}.yaml"), "w") as f:
+        with (Path(outdir) / f"{name}.yaml").open("w", encoding="utf-8") as f:
             if isinstance(ml, ps.Model):
                 mldict = deepcopy(ml.to_dict(series=False))
             elif isinstance(ml, dict):

{pastastore-1.10.2.dist-info → pastastore-1.12.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pastastore
-Version: 1.10.2
+Version: 1.12.0
 Summary: Tools for managing Pastas time series models.
 Author: D.A. Brakenhoff
 Maintainer-email: "D.A. Brakenhoff" <d.brakenhoff@artesia-water.nl>, "R. Calje" <r.calje@artesia-water.nl>, "M.A. Vonk" <m.vonk@artesia-water.nl>
@@ -46,12 +46,14 @@ Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: 3 :: Only
 Classifier: Topic :: Scientific/Engineering :: Hydrology
-Requires-Python: >=3.10
+Requires-Python: >=3.11
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: pastas>=0.13
 Requires-Dist: tqdm>=4.36
 Requires-Dist: pyyaml
+Requires-Dist: colorama
+Requires-Dist: pandas<3.0
 Provides-Extra: full
 Requires-Dist: pastastore[arcticdb,optional]; extra == "full"
 Requires-Dist: hydropandas; extra == "full"
@@ -63,7 +65,6 @@ Requires-Dist: pyproj; extra == "optional"
 Requires-Dist: adjustText; extra == "optional"
 Provides-Extra: arcticdb
 Requires-Dist: arcticdb; extra == "arcticdb"
-Requires-Dist: protobuf<6,>=3.5.0.post1; extra == "arcticdb"
 Provides-Extra: lint
 Requires-Dist: ruff; extra == "lint"
 Provides-Extra: pytest
@@ -74,16 +75,17 @@ Requires-Dist: pytest-cov; extra == "pytest"
 Requires-Dist: pytest-dependency; extra == "pytest"
 Requires-Dist: pytest-benchmark; extra == "pytest"
 Requires-Dist: codacy-coverage; extra == "pytest"
-Provides-Extra: test
-Requires-Dist: pastastore[arcticdb,lint,optional,pytest]; extra == "test"
-Requires-Dist: hydropandas[full]; extra == "test"
 Provides-Extra: docs
 Requires-Dist: pastastore[optional]; extra == "docs"
 Requires-Dist: sphinx_rtd_theme; extra == "docs"
 Requires-Dist: Ipython; extra == "docs"
 Requires-Dist: ipykernel; extra == "docs"
-Requires-Dist: nbsphinx; extra == "docs"
-Requires-Dist: nbsphinx_link; extra == "docs"
+Requires-Dist: myst_nb; extra == "docs"
+Provides-Extra: test
+Requires-Dist: pastastore[arcticdb,optional,pytest]; extra == "test"
+Requires-Dist: hydropandas[full]; extra == "test"
+Provides-Extra: dev
+Requires-Dist: pastastore[docs,lint,test]; extra == "dev"
 Dynamic: license-file
 
 ![pastastore](https://github.com/pastas/pastastore/workflows/pastastore/badge.svg)
@@ -106,8 +108,12 @@ left off without having to reload everything.
 
 Install the module with `pip install pastastore`.
 
-For installing in development mode, clone the repository and install by typing
-`pip install -e .` from the module root directory.
+For development, clone the repository and install all development, testing, and
+documentation dependencies with:
+
+```sh
+pip install -e .[dev]
+```
 
 For plotting background maps, the `contextily` and `pyproj` packages are
 required. For a full install, including optional dependencies for plotting and
@@ -180,4 +186,4 @@ pstore.to_zip("my_backup.zip")
 ```
 
 For more elaborate examples, refer to the
-[Notebooks](https://pastastore.readthedocs.io/latest/examples.html#example-notebooks).
+[Notebooks](https://pastastore.readthedocs.io/en/latest/examples.html#example-notebooks).

pastastore-1.12.0.dist-info/RECORD

@@ -0,0 +1,31 @@
+docs/conf.py,sha256=RFWVsGSGtqXc-N0ett9Z5XVrTKDzj3ukbXPQZM9wQIM,4186
+pastastore/__init__.py,sha256=It_5KcVu7tMdo0QL9DXUNWtMKUDSLNfjzcuomkRdnUE,547
+pastastore/base.py,sha256=KCfv13XnY7ryXqZ1Oz02ROvitJ_NndxhkrtXL5FINSQ,72407
+pastastore/connectors.py,sha256=ArR053kp8ogwbtRgSCOC8f5wyMw16WNSLRzb_Kx1b6k,35291
+pastastore/datasets.py,sha256=0ZjeXRX5uRTAbZPfAVoLjfR2sh0MDpMSatfKu7Imeg0,6007
+pastastore/plotting.py,sha256=Zvesn7yY_z4LXdTLNT5TDui1YJ1wcm_yTvgqw6h2iQg,55697
+pastastore/store.py,sha256=ymXP9UyXPqARlJ6lNPasucFe1qURf3bn5Sc1oBZx6xY,70004
+pastastore/styling.py,sha256=aw7rTrllLyL574EcLqMSwNTuQaT3jpFAK92MyJzhLL8,2423
+pastastore/typing.py,sha256=wsn50wH_LV3J6WXNpAUcRnSJppmGqYsX6kGCg49uGzY,376
+pastastore/util.py,sha256=VrtJUYaFGnYApbcSBZZbc2NRdy8S93v-FyuT1bq3fjY,35578
+pastastore/validator.py,sha256=Kwl0QoLCOYk1eLbBhaaZJNq0XMtsRwM2Uo1qlWu_f5w,20236
+pastastore/version.py,sha256=Af4ycb4-UpzBjuM58vVI_e7Nw5K5IZJovwNmfp4B3xg,1148
+pastastore/yaml_interface.py,sha256=x05edO_N-F9ia-nn5LlKzGdGATFHaGs9rwQAGvuDrnM,30577
+pastastore/extensions/__init__.py,sha256=pHZQha6yhq3fwsoDWvXW-lYEbUUmlfCcHMrYoK_1Hxs,505
+pastastore/extensions/accessor.py,sha256=kftQM6dqMDoySbyTKcvmkjC5gJRp465KA18G4NVXUO0,367
+pastastore/extensions/hpd.py,sha256=bTX3UebPKAVZikIgDfHh6xrK7sHVAT2EbiImh1e7_OE,29728
+pastastore-1.12.0.dist-info/licenses/LICENSE,sha256=MB_6p4kXDCUsYNjslcMByBu6i7wMNRKPC36JnhzpN4o,1087
+tests/conftest.py,sha256=5fko9oJ7vsFkxhvldHSRHa0XA6TzUgYOHZMSSn9f6ho,7943
+tests/test_001_import.py,sha256=o31MWpMNxngnytJeEnPz_0UTcT-XbG1JqggvrWLvSUY,238
+tests/test_002_connectors.py,sha256=o5uXrylGUiHvOAaQ-IqhM8LJ4WC1ktHBecmZ0TUreqg,9442
+tests/test_003_pastastore.py,sha256=7Ebtk-f963b4QAOG8TAJxipM5IEpxfFuLbaG0i0MMlA,11456
+tests/test_004_yaml.py,sha256=3hMNjb9s0S2rbmpyEjW6FDRAxfUZS_U1qoPl4wB-cCo,4440
+tests/test_005_maps_plots.py,sha256=HVfkTQhtpONl8N8Uv39nJMrkLYOmMYy9T2AjpzYmUp4,2152
+tests/test_006_benchmark.py,sha256=hEk2kpYKpghI7RDQaSuWkSzkF9lNphm8VgBxouVtWAU,4940
+tests/test_007_hpdextension.py,sha256=QKXct8sBKIypAYmI7URypYPaAtCJgM464u7D3yJMNow,4304
+tests/test_008_stressmodels.py,sha256=733fyCvuzjKcaLjvSMt5dTTLp-T4alzNJAToSxTIUug,4003
+tests/test_009_parallel.py,sha256=aDFEcLSz9cwbgKXpbRmNwIKA2IQ3rAPLYnA-U1nDZ1o,15039
+pastastore-1.12.0.dist-info/METADATA,sha256=qHAscjDQ4XPmM2gVLRDBqYtHLuo8OPkRrFwc5qGZbXA,7696
+pastastore-1.12.0.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+pastastore-1.12.0.dist-info/top_level.txt,sha256=1bgyMk1p23f04RK83Jju2_YAQBwyoQD_fInxoPB4YRw,22
+pastastore-1.12.0.dist-info/RECORD,,

{pastastore-1.10.2.dist-info → pastastore-1.12.0.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.9.0)
+Generator: setuptools (80.10.2)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

tests/conftest.py

@@ -1,5 +1,6 @@
 # ruff: noqa: D100 D103
 import importlib
+import inspect
 from importlib import metadata
 
 import pandas as pd
@@ -8,54 +9,94 @@ import pytest
 
 import pastastore as pst
 
-params = ["dict", "pas", "arcticdb"]
+params = [
+    "dict",
+    "pas",
+    "arcticdb",
+]
+
+
+@pytest.fixture(scope="module")
+def data1():
+    d = {
+        "oseries1": pd.read_csv("./tests/data/obs.csv", index_col=0, parse_dates=True),
+        "oseries1_meta": {"x": 165000, "y": 424000},
+        "prec1": pd.read_csv("./tests/data/rain.csv", index_col=0, parse_dates=True),
+        "prec1_meta": {"x": 165050, "y": 424050},
+        "evap1": pd.read_csv("./tests/data/evap.csv", index_col=0, parse_dates=True),
+        "evap1_meta": {"x": 164500, "y": 424000},
+    }
+    return d
+
+
+@pytest.fixture(scope="module")
+def data2():
+    d = {
+        "oseries2": pd.read_csv(
+            "./tests/data/head_nb1.csv", index_col=0, parse_dates=True
+        ),
+        "oseries2_meta": {"x": 164000, "y": 423000},
+        "prec2": pd.read_csv(
+            "./tests/data/rain_nb1.csv", index_col=0, parse_dates=True
+        ),
+        "prec2_meta": {"x": 164010, "y": 423000},
+        "evap2": pd.read_csv(
+            "./tests/data/evap_nb1.csv", index_col=0, parse_dates=True
+        ),
+        "evap2_meta": {"x": 164000, "y": 423030},
+    }
+    return d
+
+
+@pytest.fixture(scope="module")
+def data3():
+    w = pd.read_csv("./tests/data/well_month_end.csv", index_col=0, parse_dates=True)
+    w = ps.ts.timestep_weighted_resample(
+        w,
+        pd.date_range(w.index[0] - pd.offsets.MonthBegin(), w.index[-1], freq="D"),
+    ).bfill()
+
+    d = {
+        "oseries3": pd.read_csv(
+            "./tests/data/gw_obs.csv", index_col=0, parse_dates=True
+        ),
+        "oseries3_meta": {"x": 165554, "y": 422685},
+        "well1": w,
+        "well1_meta": {"x": 164691, "y": 423579},
+        "well2": w + 10,
+        "well2_meta": {"x": 164691 + 2000, "y": 423579 + 2000},  # far away
+    }
+    return d
+
+
+def initialize_project(conn, data1, data2, data3):
+    pstore = pst.PastaStore(conn, "test_project")
 
+    # dataset 1
+    pstore.add_oseries(data1["oseries1"], "oseries1", metadata=data1["oseries1_meta"])
+    pstore.add_stress(
+        data1["prec1"], "prec1", kind="prec", metadata=data1["prec1_meta"]
+    )
+    pstore.add_stress(
+        data1["evap1"], "evap1", kind="evap", metadata=data1["evap1_meta"]
+    )
 
-def initialize_project(conn):
-    pstore = pst.PastaStore(conn, "test_project")
+    # dataset 2
+    pstore.add_oseries(data2["oseries2"], "oseries2", metadata=data2["oseries2_meta"])
+    pstore.add_stress(
+        data2["prec2"], "prec2", kind="prec", metadata=data2["prec2_meta"]
+    )
+    pstore.add_stress(
+        data2["evap2"], "evap2", kind="evap", metadata=data2["evap2_meta"]
+    )
 
-    # oseries 1
-    o = pd.read_csv("./tests/data/obs.csv", index_col=0, parse_dates=True)
-    pstore.add_oseries(o, "oseries1", metadata={"x": 165000, "y": 424000})
-
-    # oseries 2
-    o = pd.read_csv("./tests/data/head_nb1.csv", index_col=0, parse_dates=True)
-    pstore.add_oseries(o, "oseries2", metadata={"x": 164000, "y": 423000})
-
-    # oseries 3
-    o = pd.read_csv("./tests/data/gw_obs.csv", index_col=0, parse_dates=True)
-    pstore.add_oseries(o, "oseries3", metadata={"x": 165554, "y": 422685})
-
-    # prec 1
-    s = pd.read_csv("./tests/data/rain.csv", index_col=0, parse_dates=True)
-    pstore.add_stress(s, "prec1", kind="prec", metadata={"x": 165050, "y": 424050})
-
-    # prec 2
-    s = pd.read_csv("./tests/data/rain_nb1.csv", index_col=0, parse_dates=True)
-    pstore.add_stress(s, "prec2", kind="prec", metadata={"x": 164010, "y": 423000})
-
-    # evap 1
-    s = pd.read_csv("./tests/data/evap.csv", index_col=0, parse_dates=True)
-    pstore.add_stress(s, "evap1", kind="evap", metadata={"x": 164500, "y": 424000})
-
-    # evap 2
-    s = pd.read_csv("./tests/data/evap_nb1.csv", index_col=0, parse_dates=True)
-    pstore.add_stress(s, "evap2", kind="evap", metadata={"x": 164000, "y": 423030})
-
-    # well 1
-    s = pd.read_csv("./tests/data/well_month_end.csv", index_col=0, parse_dates=True)
-    try:
-        s = ps.ts.timestep_weighted_resample(
-            s,
-            pd.date_range(s.index[0] - pd.offsets.MonthBegin(), s.index[-1], freq="D"),
-        ).bfill()
-    except AttributeError:
-        # pastas<=0.22.0
-        pass
-    pstore.add_stress(s, "well1", kind="well", metadata={"x": 164691, "y": 423579})
-    # add second well
+    # dataset 3
+    pstore.add_oseries(data3["oseries3"], "oseries3", metadata=data3["oseries3_meta"])
+    pstore.add_stress(
+        data3["well1"], "well1", kind="well", metadata=data3["well1_meta"]
+    )
     pstore.add_stress(
-        s + 10, "well2", kind="well", metadata={"x": 164691 + 200, "y": 423579_200}
+        data3["well2"], "well2", kind="well", metadata=data3["well2_meta"]
     )
 
     return pstore
@@ -67,7 +108,7 @@ def conn(request):
     name = f"test_{request.param}"
     # connect to dbase
     if request.param == "arcticdb":
-        uri = "lmdb://./arctic_db/"
+        uri = "lmdb://./tests/data/arcticdb/"
         conn = pst.ArcticDBConnector(name, uri)
     elif request.param == "dict":
         conn = pst.DictConnector(name)
@@ -80,33 +121,25 @@ def conn(request):
 
 
 @pytest.fixture(scope="module", params=params)
-def pstore(request):
+def pstore(request, data1, data2, data3):
     if request.param == "arcticdb":
-        name = "test_project"
-        uri = "lmdb://./arctic_db/"
+        name = "testdb"
+        uri = "lmdb://./tests/data/arcticdb/"
         connector = pst.ArcticDBConnector(name, uri)
     elif request.param == "dict":
-        name = "test_project"
+        name = "testdb"
         connector = pst.DictConnector(name)
     elif request.param == "pas":
-        name = "test_project"
+        name = "testdb"
         connector = pst.PasConnector(name, "./tests/data/pas")
     else:
         raise ValueError("Unrecognized parameter!")
-    pstore = initialize_project(connector)
+    pstore = initialize_project(connector, data1, data2, data3)
     pstore.type = request.param  # added here for defining test dependencies
     yield pstore
     pst.util.delete_pastastore(pstore)
 
 
-def delete_arcticdb_test_db():
-    connstr = "lmdb://./arctic_db/"
-    name = "test_project"
-    connector = pst.ArcticDBConnector(name, connstr)
-    pst.util.delete_arcticdb_connector(connector)
-    print("ArcticDBConnector 'test_project' deleted.")
-
-
 _has_pkg_cache = {}
 
 
@@ -163,3 +196,67 @@ def requires_pkg(*pkgs):
         reason=f"missing package{'s' if len(missing) != 1 else ''}: "
         + ", ".join(missing),
     )
+
+
+def for_connectors(connectors=None):
+    """Decorate to run tests only for specified connector types.
+
+    Parameters
+    ----------
+    connectors : list of str, optional
+        List of connector types for which the test should run.
+        If None, defaults to all connector types: ["dict", "pas", "arcticdb"].
+
+    Returns
+    -------
+    function
+        Decorated test function that runs only for specified connectors.
+    """
+    if connectors is None:
+        connectors = ["dict", "pas", "arcticdb"]
+
+    def decorator(func):
+        def wrapper(self, *args, **kwargs):
+            # Get the connector type from fixtures passed
+            # Could be in args or kwargs depending on how pytest passes it
+            store = None
+
+            # Check kwargs first (fixture passed by name)
+            for fixture_name in ["pstore_with_models", "pstore", "conn"]:
+                if fixture_name in kwargs:
+                    store = kwargs[fixture_name]
+                    break
+
+            # If not in kwargs, check first positional arg
+            if store is None and len(args) > 0:
+                store = args[0]
+
+            if store is None:
+                # Call without checking (shouldn't happen)
+                return func(self, *args, **kwargs)
+
+            # Check if we should skip based on connector type
+            if hasattr(store, "conn"):
+                conn_type = store.conn.conn_type
+            elif hasattr(store, "conn_type"):
+                conn_type = store.conn_type
+            else:
+                # If we can't determine connector type, just run the test
+                return func(self, *args, **kwargs)
+
+            if conn_type not in connectors:
+                pytest.skip(
+                    f"Test skipped for {conn_type} connector "
+                    f"(only runs for: {connectors})"
+                )
+
+            return func(self, *args, **kwargs)
+
+        # Preserve the original function signature and metadata for pytest
+        wrapper.__signature__ = inspect.signature(func)
+        wrapper.__name__ = func.__name__
+        wrapper.__doc__ = func.__doc__
+
+        return wrapper
+
+    return decorator

tests/test_001_import.py

@@ -5,4 +5,5 @@ import warnings
 def test_import():
     with warnings.catch_warnings():
         warnings.simplefilter(action="ignore", category=FutureWarning)
-        import pastastore  # noqa: F401
+        import pastastore
+    pastastore.show_versions(optional=True)