Merge pull request #212 from ArtesiaWater/dev

release 0.11.3

Author: OnnoEbbens

hydropandas/io/dino.py

@@ -347,7 +347,7 @@ def read_dino_groundwater_csv(
             meta["unit"] = "m NAP"
         elif not to_mnap:
             meta["unit"] = "cm NAP"
-        if remove_duplicates:
+        if remove_duplicates and measurements is not None:
             measurements = measurements[~measurements.index.duplicated(keep=keep_dup)]
 
         # add time variant metadata to measurements

hydropandas/io/knmi.py

@@ -376,8 +376,7 @@ def get_stations(meteo_var: str) -> pd.DataFrame:
         os.path.join(dir_path, "../data/knmi_neerslagstation.json")
     )
 
-    with pd.option_context("future.no_silent_downcasting", True):
-        stations = pd.concat([mstations, pstations], axis=0).fillna(False)
+    stations = pd.concat([mstations, pstations], axis=0).fillna(False)
     if meteo_var in ("makkink", "penman", "hargreaves"):
         meteo_var = "EV24"
     return stations.loc[

hydropandas/obs_collection.py

@@ -2353,7 +2353,7 @@ def interpolate(
                 f" found {', '.join([x.__name__ for x in otype])}."
             )
 
-        xy_oc = self.loc[:, ["x", "y"]]
+        xy_oc = pd.concat([self.loc[:, "x"], self.loc[:, "y"]], axis=1)
         obsdf = util.oc_to_df(self, col=col)
 
         fill_df = util.interpolate(

hydropandas/version.py

@@ -1,7 +1,7 @@
 from importlib import metadata
 from sys import version as os_version
 
-__version__ = "0.11.2"
+__version__ = "0.11.3"
 
 
 def show_versions():

pyproject.toml

@@ -16,7 +16,7 @@ maintainers = [
     { name = "M.A. Vonk", email = "[email protected]" },
 ]
 requires-python = ">=3.9"
-dependencies = ["scipy", "pandas", "matplotlib", "tqdm", "requests", "colorama"]
+dependencies = ["scipy", "pandas <= 2.2.1", "matplotlib", "tqdm", "requests", "colorama"]
 classifiers = [
     "Development Status :: 4 - Beta",
     "Intended Audience :: Science/Research",