Fix plot install (#95)

* Fix plot install

* Fix some warnings

* Use multiprocessing backend

* Update builds

* Update cartopy version

* Update build

* Add macos buillds back in

* Switch back to threading backend

* Update changelog

Author: wpreimes

.github/workflows/build.yml

@@ -42,7 +42,6 @@ jobs:
           auto-update-conda: true
           python-version: ${{ matrix.python-version }}
           channel-priority: flexible
-          # mamba-version: "*"
           activate-environment: ismn
           auto-activate-base: false
       - name: Print environment infos
@@ -64,8 +63,8 @@ jobs:
       - name: Install plot requirements and run plot tests
         shell: bash -l {0}
         run: |
-          conda install -c conda-forge cartopy
           pip install -e .[plot]
+          python -c "import matplotlib, cartopy"
           pytest -m "requires_plot" --cov-append
       - name: Export Environment
         shell: bash -l {0}

CHANGELOG.rst

@@ -6,6 +6,11 @@ Unreleased changes in master branch
 ===================================
 -
 
+Version 1.5.2
+=============
+- Fixed dependency list for `ismn[plot]` install (PyQt5 and cartopy>=0.22)
+- Use `repurpose.process.parallel_process` now
+
 Version 1.5.1
 =============
 - Fixed a bug where missing optional requirements (xarray, dask) lead to an error

setup.cfg

@@ -54,7 +54,8 @@ exclude =
 # `pip install ismn[plot]` like:
 plot =
     matplotlib
-    cartopy
+    cartopy>=0.22
+    PyQt5
 
 # only packages required for xarray conversion
 xr =
@@ -102,8 +103,10 @@ norecursedirs =
 testpaths = tests
 
 markers =
-    requires_plot: Run tests for parts of the ismn package that require optional dependencies from `pip install ismn[plot]`
-    requires_xr: Run tests for parts of the ismn package that require optional dependencies from `pip install ismn[xr]`
+    requires_plot: Marks tests for parts of the ismn package that require optional dependencies from `pip install ismn[plot]`
+    requires_xr: Marks tests for parts of the ismn package that require optional dependencies from `pip install ismn[xr]`
+    data_from_zip: Marks tests that read data from zip file
+
 
 [aliases]
 dists = bdist_wheel

src/ismn/filecollection.py

@@ -32,7 +32,7 @@
 from typing import List, Tuple
 import pandas as pd
 from collections import OrderedDict
-from repurpose.process import parallel_process_async
+from repurpose.process import parallel_process
 import traceback
 
 from ismn.base import IsmnRoot
@@ -270,7 +270,7 @@ def build_from_scratch(
             'stat_dir': process_stat_dirs
         }
 
-        res = parallel_process_async(
+        res = parallel_process(
             _read_station_dir, ITER_KWARGS=ITER_KWARGS,
             STATIC_KWARGS=STATIC_KWARGS,
             n_proc=n_proc, show_progress_bars=True,

src/ismn/interface.py

@@ -22,7 +22,7 @@
 # SOFTWARE.
 
 import os
-from repurpose.process import parallel_process_async  # keep this import
+from repurpose.process import parallel_process  # keep this import
 import numpy as np
 from pathlib import Path
 from tempfile import gettempdir
@@ -1020,5 +1020,4 @@ def print_climate_dict(self) -> None:
 
     def close_files(self):
         # close all open filehandlers
-        self.__file_collection.close()
-
+        self.__file_collection.close()

tests/test_components.py

@@ -290,7 +290,7 @@ def test_sensor_coverage(self):
         start = self.sensor.metadata['timerange_from'].val.to_pydatetime()
         assert self.sensor.get_coverage(start=start-timedelta(days=100)) < cov
         np.testing.assert_almost_equal(
-            self.sensor.get_coverage(freq='2H'), 113.492, decimal=3)
+            self.sensor.get_coverage(freq='2h'), 113.492, decimal=3)
 
     def test_sensor_attributes(self):
         """

tests/test_filecollection.py

@@ -131,7 +131,7 @@ def setUpClass(cls):
         cls.coll = IsmnFileCollection.build_from_scratch(testdata_path_unzipped)
 
 
-@pytest.mark.zip
+@pytest.mark.data_from_zip
 class Test_FileCollectionCeopSepZipped(Test_FileCollectionCeopSepUnzipped):
     # same tests as for ceop sep format,
 
@@ -149,7 +149,7 @@ def setUpClass(cls):
         cls.coll = IsmnFileCollection.build_from_scratch(testdata_zip_path)
 
 
-@pytest.mark.zip
+@pytest.mark.data_from_zip
 class Test_FileCollectionHeaderValuesZipped(Test_FileCollectionCeopSepUnzipped):
     # same tests as for ceop sep format,
     @classmethod

tests/test_interface.py

@@ -310,7 +310,7 @@ def setUp(self) -> None:
         self.ds = ISMN_Interface(self.testdata)
 
 
-@pytest.mark.zip
+@pytest.mark.data_from_zip
 class Test_ISMN_Interface_CeopZipped(Test_ISMN_Interface_CeopUnzipped):
     @classmethod
     def setUpClass(cls):
@@ -332,7 +332,7 @@ def setUp(self) -> None:
         self.ds = ISMN_Interface(self.testdata_zip_path)
 
 
-@pytest.mark.zip
+@pytest.mark.data_from_zip
 class Test_ISMN_Interface_HeaderValuesZipped(Test_ISMN_Interface_CeopUnzipped):
     @classmethod
     def setUpClass(cls):