Add py 3.12 to tests

.github/test_conda_env.yml

@@ -3,6 +3,7 @@ channels:
   - conda-forge
   - defaults
 dependencies:
+  - conda-forge::compilers
   - numpy>=1.12
   - matplotlib>=1.3.0
   - scipy

.github/workflows/runtest.yml

@@ -8,31 +8,21 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
-        python-version: ['3.8', '3.9', '3.10', '3.11']
+        python-version: ['3.9', '3.10', '3.11', '3.12']
       fail-fast: false
 #      continue-on-error: true
 
     steps:
-      - uses: actions/checkout@v3
-
-      - name: Get conda env file
-        shell: bash -l {0}
-        run: |
-          if [ "$RUNNER_OS" == "macOS"  ]; then
-              cp .github/test_conda_env_macOS.yml .github/test_conda_env.yml
-          fi
+      - uses: actions/checkout@v4
 
       - name: Setup conda
-        uses: conda-incubator/setup-miniconda@v2.1.1
+        uses: conda-incubator/setup-miniconda@v3
         with:
-          miniforge-variant: Mambaforge
-          miniforge-version: latest
           python-version: ${{ matrix.python-version }}
           activate-environment: eqcorrscan-test
-          use-mamba: true
 
       - name: Update Env
-        run: mamba env update -n eqcorrscan-test -f .github/test_conda_env.yml
+        run: conda env update -n eqcorrscan-test -f .github/test_conda_env.yml
 
       - name: install eqcorrscan
         shell: bash -l {0}
@@ -72,7 +62,7 @@ jobs:
           py.test -v -m "slow and not serial and not network" --cov-report=xml --cov-append
 
       - name: upload coverage
-        uses: codecov/codecov-action@v3
+        uses: codecov/codecov-action@v4
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
           file: ./coverage.xml
@@ -86,23 +76,20 @@ jobs:
     runs-on: "ubuntu-latest"
     strategy:
       matrix:
-        python-version: ['3.10']
+        python-version: ['3.11']
       fail-fast: false
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Setup conda
-        uses: conda-incubator/setup-miniconda@v2.1.1
+        uses: conda-incubator/setup-miniconda@v3
         with:
-          miniforge-variant: Mambaforge
-          miniforge-version: latest
           python-version: ${{ matrix.python-version }}
           activate-environment: eqcorrscan-test
-          use-mamba: true
 
       - name: Update Env
-        run: mamba env update -n eqcorrscan-test -f .github/test_conda_env.yml
+        run: conda env update -n eqcorrscan-test -f .github/test_conda_env.yml
 
       - name: install eqcorrscan
         shell: bash -l {0}
@@ -131,7 +118,7 @@ jobs:
           py.test -m "superslow" -s eqcorrscan/tests/tutorials_test.py eqcorrscan/tests/subspace_test.py --cov-report=xml --cov-append
 
       - name: upload coverage
-        uses: codecov/codecov-action@v3
+        uses: codecov/codecov-action@v4
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
           file: ./coverage.xml
@@ -144,23 +131,20 @@ jobs:
     runs-on: "ubuntu-latest"
     strategy:
       matrix:
-        python-version: ['3.9']
+        python-version: ['3.11']
       fail-fast: false
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Setup conda
-        uses: conda-incubator/setup-miniconda@v2.1.1
+        uses: conda-incubator/setup-miniconda@v3
         with:
-          miniforge-variant: Mambaforge
-          miniforge-version: latest
           python-version: ${{ matrix.python-version }}
           activate-environment: eqcorrscan-test
-          use-mamba: true
 
       - name: Update Env
-        run: mamba env update -n eqcorrscan-test -f .github/test_conda_env.yml
+        run: conda env update -n eqcorrscan-test -f .github/test_conda_env.yml
 
       - name: install fmf
         shell: bash -l {0}
@@ -189,7 +173,7 @@ jobs:
           py.test eqcorrscan/tests/correlate_test.py --cov-report=xml
 
       - name: upload coverage
-        uses: codecov/codecov-action@v3
+        uses: codecov/codecov-action@v4
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
           file: ./coverage.xml

eqcorrscan/core/match_filter/helpers/processes.py

@@ -25,6 +25,7 @@
 from queue import Empty
 
 from obspy import Stream
+from obspy.clients.fdsn import Client
 
 from eqcorrscan.core.match_filter.helpers import (
     _pickle_stream, _unpickle_stream)
@@ -40,6 +41,25 @@
 
 Logger = logging.getLogger(__name__)
 
+# FDSN_CLIENT_ARGS = inspect.signature(Client).parameters.keys()
+# Only allow a limited subset to be parsed through - this means
+# that authenticated clients won't work.
+FDSN_CLIENT_ARGS = {"base_url", "debug", "timeout"}
+
+
+class _FDSN_parseable_Client:
+    def __init__(self, **kwargs):
+        self.kwargs = kwargs
+
+    @classmethod
+    def from_client(cls, client):
+        kwargs = {key: client.__dict__.get(key, None)
+                  for key in FDSN_CLIENT_ARGS}
+        return cls(**kwargs)
+
+    def to_client(self):
+        return Client(**self.kwargs)
+
 
 ###############################################################################
 #                           Process handlers
@@ -242,6 +262,8 @@
     :param samp_rate: See utils.pre_processing.multi_process
     :param process_length: See utils.pre_processing.multi_process
     """
+    if isinstance(client, _FDSN_parseable_Client):
+        client = client.to_client()
     while True:
         killed = _wait_on_output_to_be_available(
             poison_queue=poison_queue, output_queue=output_filename_queue,

eqcorrscan/core/match_filter/matched_filter.py

@@ -235,7 +235,7 @@ def match_filter(template_names, template_list, st, threshold,
 
         .. math::
 
-            av\_chan\_corr\_thresh=threshold \\times (cccsum\ /\ len(template))
+            av_chan_corr_thresh=threshold \\times (cccsum/len(template))
 
         where :math:`template` is a single template from the input and the
         length is the number of channels within this template.

eqcorrscan/core/match_filter/party.py

@@ -381,7 +381,7 @@ def plot(self, plot_grouped=False, dates=None, min_dets=1, rate=False,
         :type rate: bool
         :param rate: Whether or not to plot the daily rate of detection as
             opposed to cumulative number. Only works with plot_grouped=True.
-        :param \**kwargs: Any other arguments accepted by
+        :param kwargs: Any other arguments accepted by
             :func:`eqcorrscan.utils.plotting.cumulative_detections`
 
         .. rubric:: Examples

eqcorrscan/core/match_filter/template.py

@@ -521,7 +521,7 @@ def detect(self, stream, threshold, threshold_type, trig_int,
 
             .. math::
 
-                av\_chan\_corr\_thresh=threshold \\times (cccsum /
+                av_chan_corr_thresh=threshold \\times (cccsum /
                 len(template))
 
             where :math:`template` is a single template from the input and the

eqcorrscan/core/match_filter/tribe.py

@@ -28,6 +28,7 @@
 
 from obspy import Catalog, Stream, read, read_events
 from obspy.core.event import Comment, CreationInfo
+from obspy.clients.fdsn import Client as FDSNClient
 
 from eqcorrscan.core import template_gen
 from eqcorrscan.core.match_filter.template import (
@@ -817,7 +818,7 @@
 
             .. math::
 
-                av\_chan\_corr\_thresh=threshold \\times (cccsum /
+                av_chan_corr_thresh=threshold \\times (cccsum /
                 len(template))
 
             where :math:`template` is a single template from the input and the
@@ -1364,15 +1365,15 @@
 
             .. math::
 
-                av\_chan\_corr\_thresh=threshold \\times (cccsum /
+                av_chan_corr_thresh=threshold \\times (cccsum /
                 len(template))
 
             where :math:`template` is a single template from the input and the
             length is the number of channels within this template.
         """
         from eqcorrscan.core.match_filter.helpers.tribe import _download_st
         from eqcorrscan.core.match_filter.helpers.processes import (
-            _get_detection_stream)
+            _get_detection_stream, _FDSN_parseable_Client)
 
         # This uses get_waveforms_bulk to get data - not all client types have
         # this, so we check and monkey patch here.
@@ -1457,6 +1458,11 @@
         time_queue = Queue()
         stream_queue = Queue(maxsize=1)
 
+        # Convert client to pickleable client if needed - issue with
+        # Python 3.12 Windows and MacOS
+        if isinstance(client, FDSNClient):
+            client = _FDSN_parseable_Client.from_client(client)
+
         downloader = Process(
             target=_get_detection_stream,
             kwargs=dict(

eqcorrscan/tests/matched_filter/helper_test.py

@@ -23,7 +23,7 @@
     get_waveform_client, _test_event_similarity)
 from eqcorrscan.core.match_filter.helpers.processes import (
     _get_detection_stream, Poison, _prepper, _pre_processor,
-    _make_detections)
+    _make_detections, _FDSN_parseable_Client)
 
 try:
     from pytest_cov.embed import cleanup_on_sigterm
@@ -285,7 +285,7 @@ def setUpClass(cls):
         process_length = 360
         cls.global_kwargs = dict(
             template_channel_ids=[("NZ", "WVZ", "10", "HHZ")],
-            client=Client("GEONET"),
+            client=_FDSN_parseable_Client.from_client(Client("GEONET")),
             retries=3,
             min_gap=0.0,
             buff=3,