Merge pull request #95 from pastas/dev

Minor update

.github/workflows/ci.yml

@@ -54,7 +54,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: [3.8, 3.9, "3.10"]
+        python-version: ["3.8", "3.9", "3.10", "3.11"]
         pastas-version:
           [
             "git+https://github.com/pastas/[email protected]",
@@ -81,7 +81,12 @@ jobs:
 
       - name: Run pytest
         run: |
-          pytest
+          pytest -m "not bgmap"
+
+      - name: Test backgroundmap once
+        if: ${{ matrix.python-version == '3.9' && matrix.pastas-version == 'git+https://github.com/pastas/pastas.git@dev' }}
+        run: |
+          pytest -m "bgmap"
 
       - name: Run codacy-coverage-reporter
         if: ${{ github.repository == 'pastas/pastastore' && success() }}

docs/conf.py

@@ -73,7 +73,7 @@
 #
 # This is also used if you do content translation via gettext catalogs.
 # Usually you set "language" from the command line for these cases.
-language = None
+language = "en"
 
 # List of patterns, relative to source directory, that match files and
 # directories to ignore when looking for source files.

pastastore/base.py

@@ -68,7 +68,6 @@ def _get_library(self, libname: str):
         lib : Any
             handle to the library
         """
-        pass
 
     @abstractmethod
     def _add_item(
@@ -94,7 +93,6 @@ def _add_item(
         metadata : dict, optional
             dictionary containing metadata, by default None
         """
-        pass
 
     @abstractmethod
     def _get_item(self, libname: str, name: str) -> Union[FrameorSeriesUnion, Dict]:
@@ -114,7 +112,6 @@ def _get_item(self, libname: str, name: str) -> Union[FrameorSeriesUnion, Dict]:
         item : FrameorSeriesUnion or dict
             item (time series or pastas.Model)
         """
-        pass
 
     @abstractmethod
     def _del_item(self, libname: str, name: str) -> None:
@@ -129,7 +126,6 @@ def _del_item(self, libname: str, name: str) -> None:
         name : str
             name of item to delete
         """
-        pass
 
     @abstractmethod
     def _get_metadata(self, libname: str, name: str) -> Dict:
@@ -149,31 +145,27 @@ def _get_metadata(self, libname: str, name: str) -> Dict:
         metadata : dict
             dictionary containing metadata
         """
-        pass
 
     @abstractproperty
     def oseries_names(self):
         """List of oseries names.
 
         Property must be overriden by subclass.
         """
-        pass
 
     @abstractproperty
     def stresses_names(self):
         """List of stresses names.
 
         Property must be overriden by subclass.
         """
-        pass
 
     @abstractproperty
     def model_names(self):
         """List of model names.
 
         Property must be overriden by subclass.
         """
-        pass
 
     def set_check_model_series_values(self, b: bool):
         """Turn CHECK_MODEL_SERIES_VALUES option on (True) or off (False).

pastastore/store.py

@@ -982,7 +982,7 @@ def get_model_timeseries_names(
                     enam = sm["evap"]["name"]
                     structure.loc[mlnam, pnam] = 1
                     structure.loc[mlnam, enam] = 1
-                else:
+                elif "stress" in sm:
                     for s in sm["stress"]:
                         structure.loc[mlnam, s["name"]] = 1
         if dropna:

pastastore/util.py

@@ -745,7 +745,8 @@ def frontiers_checks(
                         else:
                             check_gain_passed = np.abs(gain) > 2 * gain_std
                         checks.loc[
-                            f"gain > 2*std: {sm_name}-{iw:02g} ({sm.distances.index[iw]})"
+                            f"gain > 2*std: {sm_name}-{iw:02g} ({sm.distances.index[iw]})",
+                            :,
                         ] = (
                             gain,
                             2 * gain_std,
@@ -763,7 +764,7 @@ def frontiers_checks(
                     else:
                         check_gain_passed = np.abs(gain) > 2 * gain_std
                     check_gain_passed = np.abs(gain) > 2 * gain_std
-                    checks.loc[f"gain > 2*std: {sm_name}"] = (
+                    checks.loc[f"gain > 2*std: {sm_name}", :] = (
                         gain,
                         2 * gain_std,
                         "(unit head)/(unit well stress)",

pastastore/version.py

@@ -4,4 +4,4 @@
 PASTAS_VERSION = parse_version(ps.__version__)
 PASTAS_LEQ_022 = PASTAS_VERSION <= parse_version("0.22.0")
 
-__version__ = "1.2.0"
+__version__ = "1.2.1"

pyproject.toml

@@ -34,6 +34,7 @@ classifiers = [
     "Programming Language :: Python :: 3.8",
     "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
+    "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3 :: Only",
     "Topic :: Scientific/Engineering :: Hydrology",
 ]
@@ -61,9 +62,7 @@ pystore = ["fsspec>=0.3.3", "python-snappy", "dask[dataframe]"]
 arctic = [
     "arctic", # will not work as releases not uploaded to PyPI
 ]
-arcticdb = [
-    "arcticdb",
-]
+arcticdb = ["arcticdb"]
 docs = [
     "pastastore[optional]",
     "sphinx_rtd_theme",

pytest.ini

@@ -1,2 +1,4 @@
 [pytest]
-addopts=--durations=0 --cov-report xml:coverage.xml --cov pastastore -v
+addopts=--durations=0 --cov-report xml:coverage.xml --cov pastastore -v 
+markers =
+    bgmap: test tile download for background map

tests/conftest.py

@@ -6,6 +6,10 @@
 import pytest
 
 import pastastore as pst
+import arcticdb_ext
+
+# prevent segmentationfault in GH Actions
+arcticdb_ext.set_config_int("VersionStore.NumIOThreads", 1)
 
 # "arctic" and "pystore" removed for CI, can be tested locally
 params = ["dict", "pas", "arcticdb"]
@@ -134,7 +138,7 @@ def has_pkg(pkg):
     """
     Determines if the given Python package is installed.
 
-    Originally written by Mike Toews ([email protected]) for FloPy.
+    Originally written by Mike Toews for FloPy.
     """
     if pkg not in _has_pkg_cache:
         # for some dependencies, package name and import name are different

tests/test_005_maps_plots.py

@@ -34,6 +34,7 @@ def test_cumulative_hist(request, pstore):
 # %% maps
 
 
+@pytest.mark.bgmap
 def test_map_oseries_w_bgmap(pstore):
     ax = pstore.maps.oseries()
     # only test bgmap once for pas