requake 0.6__tar.gz → 0.7.2__tar.gz

{requake-0.6 → requake-0.7.2}/CHANGELOG.md

@@ -1,6 +1,56 @@
 # Requake Changelog
 
-Copyright (c) 2021-2024 Claudio Satriano <satriano@ipgp.fr>
+Copyright (c) 2021-2026 Claudio Satriano <satriano@ipgp.fr>
+
+## v0.7.2 - 2026-04-13
+
+This release is intended to validate the new release workflow.
+It introduces no new features or bug fixes.
+
+## v0.7.1 - 2026-04-13
+
+This release is intended to validate the new release workflow.
+It introduces no new features or bug fixes.
+
+## v0.7 - 2026-04-10
+
+This version requires at least Python 3.9.
+
+Note: you might want to run `requake update_config` to update your config file
+to the latest version.
+
+- New option `--shorterthan` to select families with a duration shorter than a
+  given value. For this option and for `--longerthan` it is now possible to
+  specify the duration in seconds, minutes, hours, or months, in addition to
+  days and years.
+- New option `--colorby` for many plot commands, to color families by a
+  specific attribute other than the family number
+- New option `--colormap` for many plot commands, to select a colormap
+  for coloring families. If not specified, a default colormap for each
+  attribute specified in `--colorby` is used.
+- New option `--range` to manually specify the range of values for the color
+  scale
+- New option `--force` for commands that write files, to overwrite existing
+  files without asking
+- New option `--freq_band` for trace plotting commands, to override the
+  frequency band specified in the config file
+- New option `--detailed` for `print_families`, to print more detailed
+  information about each family, including the list of events
+- New option `--output` to save plots to files instead of showing them on
+  screen
+- Config option `waveform_data_path` renamed to `sds_data_path`
+- New config option `event_data_path` to specify the path to a local directory
+  with waveform files organized per event
+- Add missing `street` map style for `map_families`
+- Catalog scan: when more than a station is provided and the closest station
+  to the event is not available, use the next closest station instead.
+- Catalog scan: accurate estimation of the number of event pairs to process
+- Initial support for plotting families found with template scan
+- Improved reading of CSV catalog files:
+  - avoid duplicated column guessing
+  - ensure that prefectly matching column field names are correctly guessed
+  - warn if an invalid time format is found
+- Colored terminal output for warnings and errors
 
 ## v0.6 - 2024-05-04
 

{requake-0.6 → requake-0.7.2}/PKG-INFO

@@ -1,39 +1,43 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: requake
-Version: 0.6
+Version: 0.7.2
 Summary: Repeating earthquakes search and analysis
-Home-page: https://requake.seismicsource.org
-Author: Claudio Satriano
-Author-email: satriano@ipgp.fr
-License: GNU General Public License v3 or later (GPLv3+)
+Author-email: Claudio Satriano <satriano@ipgp.fr>
+License-Expression: GPL-3.0-or-later
 Project-URL: Homepage, https://requake.seismicsource.org
 Project-URL: Source, https://github.com/SeismicSource/requake
 Project-URL: Documentation, https://requake.readthedocs.io
-Platform: OS Independent
+Platform: OS
+Platform: Independent
 Classifier: Development Status :: 4 - Beta
 Classifier: Environment :: Console
 Classifier: Intended Audience :: Science/Research
-Classifier: License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.7
-Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Classifier: Topic :: Scientific/Engineering
 Classifier: Topic :: Scientific/Engineering :: Physics
-Requires-Python: >3.7
+Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE.txt
 Requires-Dist: scipy>=1.5.0
 Requires-Dist: obspy>=1.2.0
+Requires-Dist: cartopy
 Requires-Dist: argcomplete
 Requires-Dist: tqdm
 Requires-Dist: tabulate
+Requires-Dist: pygments
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: license-file
 
-<img src="https://cdn.jsdelivr.net/gh/SeismicSource/requake@dc9a6e6fd818e57e0c0d74f9c16f2bfc6d4d148c/imgs/Requake_logo.svg" width="400">
+<img src="https://cdn.jsdelivr.net/gh/SeismicSource/requake@b6498527a861637124bae1b49943b83f9ca4a7d2/imgs/Requake_logo.svg" width="400">
 
 # Requake
 
@@ -45,7 +49,7 @@ Repeating earthquakes search and analysis.
 [![docs-badge]][docs-link]
 [![DOI-badge]][DOI-link]
 
-Copyright (c) 2021-2024 Claudio Satriano <satriano@ipgp.fr>
+Copyright (c) 2021-2026 Claudio Satriano <satriano@ipgp.fr>
 
 ## Description
 
@@ -55,18 +59,43 @@ It can either scan an existing earthquake catalog to search for similar events,
 or perform template matching on a continuous waveform stream.
 
 Catalogs and waveforms can be read from local files or downloaded using
-standard [FDSN web services](https://www.fdsn.org/webservices/).
+standard [FDSN web services].
 
-Requake is written in Python and uses [ObsPy](https://obspy.org) as backend.
+Requake is written in Python and uses [ObsPy] as backend.
 
 ## Installation
 
 ### Installing the latest release
 
-#### Using pip and PyPI (preferred method)
+#### Using Anaconda
 
-The latest release of Requake is available on the
-[Python Package Index](https://pypi.org/project/requake/).
+The following command will automatically create an [Anaconda] environment
+named `requake`, install the required packages and install the latest
+version of SourceSpec via `pip`:
+
+    conda env create --file https://raw.githubusercontent.com/SeismicSource/requake/main/requake_conda_env.yml
+
+If you want a different name for your environment, use:
+
+    conda env create -n YOUR_ENV_NAME --file https://raw.githubusercontent.com/SeismicSource/requake/main/requake_conda_env.yml
+
+Activate the environment with:
+
+    conda activate requake
+
+(or `conda activate YOUR_ENV_NAME`)
+
+To keep Requake updated run the following command from within the environment:
+
+    pip install --upgrade requake
+
+Or, to switch to a development snapshot, run:
+
+    pip install git+https://github.com/SeismicSource/requake.git
+
+#### Using pip and PyPI
+
+The latest release of Requake is available on the [Python Package Index].
 
 You can install it easily through `pip`:
 
@@ -75,9 +104,8 @@ You can install it easily through `pip`:
 ### Installing a development snapshot
 
 If you need a recent feature that is not in the latest release (see the
-`unreleased` section in [CHANGELOG](CHANGELOG.md)), you want to use the more
-recent development snapshot from the
-[Requake GitHub repository](https://github.com/SeismicSource/requake).
+`unreleased` section in [CHANGELOG][changelog-link]), you want to use the more
+recent development snapshot from the [Requake GitHub repository].
 
 #### Using pip
 
@@ -149,9 +177,14 @@ Certain commands (e.g., `plot_pair`) require further arguments (use, e.g.,
 `requake plot_pair -h` to get help).
 
 Requake supports command line tab completion for commands and arguments, thanks
-to [argcomplete](https://kislyuk.github.io/argcomplete/).
-To enable command line tab completion, add the following line to your `.bashrc`
-or `.zshrc`:
+to [argcomplete].
+To enable command line tab completion run:
+
+    activate-global-python-argcomplete
+
+(This is a one-time command that needs to be run only once).
+
+Or, alternatively, add the following line to your `.bashrc` or `.zshrc`:
 
     eval "$(register-python-argcomplete requake)"
 
@@ -193,8 +226,8 @@ parallelization will be implemented.
 
 If you used Requake for a scientific paper, please cite it as:
 
-> Satriano, C. (2024). Requake: Repeating earthquakes search and analysis (X.Y).
-> [doi: 10.5281/ZENODO.10832204]
+> Satriano, C. (2026). Requake: Repeating earthquakes search and analysis (X.Y).
+> [doi: 10.5281/ZENODO.10832203]
 
 Please replace `X.Y` with the Requake version number you used.
 
@@ -215,9 +248,17 @@ You can also cite the following abstract presented at the
 [docs-link]: https://requake.readthedocs.io/en/latest/?badge=latest
 [changelog-badge]: https://img.shields.io/badge/Changelog-136CB6.svg
 [changelog-link]: https://github.com/SeismicSource/requake/blob/main/CHANGELOG.md
-[DOI-badge]: https://zenodo.org/badge/DOI/10.5281/zenodo.10832204.svg
-[DOI-link]: https://doi.org/10.5281/zenodo.10832204
+[DOI-badge]: https://zenodo.org/badge/DOI/10.5281/zenodo.10832203.svg
+[DOI-link]: https://doi.org/10.5281/zenodo.10832203
+[Requake GitHub repository]: https://github.com/SeismicSource/requake
+
+<!-- External links -->
+[FDSN web services]: https://www.fdsn.org/webservices/
+[ObsPy]: https://obspy.org
+[Anaconda]: https://www.anaconda.com/download
+[Python Package Index]: https://pypi.org/project/requake/
+[argcomplete]: https://kislyuk.github.io/argcomplete/
 
 <!-- References -->
-[doi: 10.5281/ZENODO.10832204]: https://doi.org/10.5281/ZENODO.10832204
+[doi: 10.5281/ZENODO.10832203]: https://doi.org/10.5281/ZENODO.10832203
 [bibcode: 2021AGUFM.T25A0167S]: https://ui.adsabs.harvard.edu/abs/2021AGUFM.T25A0167S

{requake-0.6 → requake-0.7.2}/README.md

@@ -10,7 +10,7 @@ Repeating earthquakes search and analysis.
 [![docs-badge]][docs-link]
 [![DOI-badge]][DOI-link]
 
-Copyright (c) 2021-2024 Claudio Satriano <satriano@ipgp.fr>
+Copyright (c) 2021-2026 Claudio Satriano <satriano@ipgp.fr>
 
 ## Description
 
@@ -20,18 +20,43 @@ It can either scan an existing earthquake catalog to search for similar events,
 or perform template matching on a continuous waveform stream.
 
 Catalogs and waveforms can be read from local files or downloaded using
-standard [FDSN web services](https://www.fdsn.org/webservices/).
+standard [FDSN web services].
 
-Requake is written in Python and uses [ObsPy](https://obspy.org) as backend.
+Requake is written in Python and uses [ObsPy] as backend.
 
 ## Installation
 
 ### Installing the latest release
 
-#### Using pip and PyPI (preferred method)
+#### Using Anaconda
 
-The latest release of Requake is available on the
-[Python Package Index](https://pypi.org/project/requake/).
+The following command will automatically create an [Anaconda] environment
+named `requake`, install the required packages and install the latest
+version of SourceSpec via `pip`:
+
+    conda env create --file https://raw.githubusercontent.com/SeismicSource/requake/main/requake_conda_env.yml
+
+If you want a different name for your environment, use:
+
+    conda env create -n YOUR_ENV_NAME --file https://raw.githubusercontent.com/SeismicSource/requake/main/requake_conda_env.yml
+
+Activate the environment with:
+
+    conda activate requake
+
+(or `conda activate YOUR_ENV_NAME`)
+
+To keep Requake updated run the following command from within the environment:
+
+    pip install --upgrade requake
+
+Or, to switch to a development snapshot, run:
+
+    pip install git+https://github.com/SeismicSource/requake.git
+
+#### Using pip and PyPI
+
+The latest release of Requake is available on the [Python Package Index].
 
 You can install it easily through `pip`:
 
@@ -40,9 +65,8 @@ You can install it easily through `pip`:
 ### Installing a development snapshot
 
 If you need a recent feature that is not in the latest release (see the
-`unreleased` section in [CHANGELOG](CHANGELOG.md)), you want to use the more
-recent development snapshot from the
-[Requake GitHub repository](https://github.com/SeismicSource/requake).
+`unreleased` section in [CHANGELOG][changelog-link]), you want to use the more
+recent development snapshot from the [Requake GitHub repository].
 
 #### Using pip
 
@@ -114,9 +138,14 @@ Certain commands (e.g., `plot_pair`) require further arguments (use, e.g.,
 `requake plot_pair -h` to get help).
 
 Requake supports command line tab completion for commands and arguments, thanks
-to [argcomplete](https://kislyuk.github.io/argcomplete/).
-To enable command line tab completion, add the following line to your `.bashrc`
-or `.zshrc`:
+to [argcomplete].
+To enable command line tab completion run:
+
+    activate-global-python-argcomplete
+
+(This is a one-time command that needs to be run only once).
+
+Or, alternatively, add the following line to your `.bashrc` or `.zshrc`:
 
     eval "$(register-python-argcomplete requake)"
 
@@ -158,8 +187,8 @@ parallelization will be implemented.
 
 If you used Requake for a scientific paper, please cite it as:
 
-> Satriano, C. (2024). Requake: Repeating earthquakes search and analysis (X.Y).
-> [doi: 10.5281/ZENODO.10832204]
+> Satriano, C. (2026). Requake: Repeating earthquakes search and analysis (X.Y).
+> [doi: 10.5281/ZENODO.10832203]
 
 Please replace `X.Y` with the Requake version number you used.
 
@@ -180,9 +209,17 @@ You can also cite the following abstract presented at the
 [docs-link]: https://requake.readthedocs.io/en/latest/?badge=latest
 [changelog-badge]: https://img.shields.io/badge/Changelog-136CB6.svg
 [changelog-link]: https://github.com/SeismicSource/requake/blob/main/CHANGELOG.md
-[DOI-badge]: https://zenodo.org/badge/DOI/10.5281/zenodo.10832204.svg
-[DOI-link]: https://doi.org/10.5281/zenodo.10832204
+[DOI-badge]: https://zenodo.org/badge/DOI/10.5281/zenodo.10832203.svg
+[DOI-link]: https://doi.org/10.5281/zenodo.10832203
+[Requake GitHub repository]: https://github.com/SeismicSource/requake
+
+<!-- External links -->
+[FDSN web services]: https://www.fdsn.org/webservices/
+[ObsPy]: https://obspy.org
+[Anaconda]: https://www.anaconda.com/download
+[Python Package Index]: https://pypi.org/project/requake/
+[argcomplete]: https://kislyuk.github.io/argcomplete/
 
 <!-- References -->
-[doi: 10.5281/ZENODO.10832204]: https://doi.org/10.5281/ZENODO.10832204
-[bibcode: 2021AGUFM.T25A0167S]: https://ui.adsabs.harvard.edu/abs/2021AGUFM.T25A0167S
+[doi: 10.5281/ZENODO.10832203]: https://doi.org/10.5281/ZENODO.10832203
+[bibcode: 2021AGUFM.T25A0167S]: https://ui.adsabs.harvard.edu/abs/2021AGUFM.T25A0167S

requake-0.7.2/pyproject.toml

@@ -0,0 +1,72 @@
+[build-system]
+requires = ["setuptools>=77", "versioneer[toml]"]
+build-backend = "setuptools.build_meta"
+
+[project]
+name = "requake"
+dynamic = ["version", "readme"]
+authors = [
+    { name = "Claudio Satriano", email = "satriano@ipgp.fr" },
+]
+description = "Repeating earthquakes search and analysis"
+license = "GPL-3.0-or-later"
+license-files = ["LICENSE.txt"]
+classifiers = [
+    "Development Status :: 4 - Beta",
+    "Environment :: Console",
+    "Intended Audience :: Science/Research",
+    "Operating System :: OS Independent",
+    "Programming Language :: Python",
+    "Programming Language :: Python :: 3",
+    "Programming Language :: Python :: 3.9",
+    "Programming Language :: Python :: 3.10",
+    "Programming Language :: Python :: 3.11",
+    "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",
+    "Programming Language :: Python :: 3.14",
+    "Topic :: Scientific/Engineering",
+    "Topic :: Scientific/Engineering :: Physics",
+]
+requires-python = ">=3.9"
+dependencies = [
+    "scipy>=1.5.0",
+    "obspy>=1.2.0",
+    "cartopy",
+    "argcomplete",
+    "tqdm",
+    "tabulate",
+    "pygments",
+]
+
+[project.urls]
+Homepage = "https://requake.seismicsource.org"
+Source = "https://github.com/SeismicSource/requake"
+Documentation = "https://requake.readthedocs.io"
+
+[project.scripts]
+requake = "requake.main:main"
+
+[tool.setuptools]
+include-package-data = true
+platforms = [
+    "OS",
+    "Independent",
+]
+
+[tool.setuptools.packages.find]
+include = ["requake", "requake.*"]
+
+[tool.setuptools.package-data]
+"*" = ["LICENSE"]
+"requake.config" = ["*.conf"]
+
+[tool.setuptools.dynamic]
+version = {attr = "requake.__version__"}
+
+[tool.versioneer]
+VCS = "git"
+style = "pep440"
+versionfile_source = "requake/_version.py"
+versionfile_build = "requake/_version.py"
+tag_prefix = "v"
+parentdir_prefix = "requake-"

{requake-0.6 → requake-0.7.2}/requake/__init__.py

@@ -4,11 +4,10 @@
 Initialize requake package.
 
 :copyright:
-    2021-2024 Claudio Satriano <satriano@ipgp.fr>
+    2021-2026 Claudio Satriano <satriano@ipgp.fr>
 :license:
     GNU General Public License v3.0 or later
     (https://www.gnu.org/licenses/gpl-3.0-standalone.html)
 """
-from ._version import get_versions
-__version__ = get_versions()['version']
-del get_versions
+from . import _version
+__version__ = _version.get_versions()['version']

{requake-0.6 → requake-0.7.2}/requake/_version.py

@@ -1,5 +1,5 @@
 
-# This file was generated by 'versioneer.py' (0.19) from
+# This file was generated by 'versioneer.py' (0.29) from
 # revision-control system data, or from the parent directory name of an
 # unpacked source archive. Distribution tarballs contain a pre-generated copy
 # of this file.
@@ -8,11 +8,11 @@ import json
 
 version_json = '''
 {
- "date": "2024-05-04T17:23:20+0200",
+ "date": "2026-04-13T09:24:19+0200",
  "dirty": false,
  "error": null,
- "full-revisionid": "dc9a6e6fd818e57e0c0d74f9c16f2bfc6d4d148c",
- "version": "0.6"
+ "full-revisionid": "b6498527a861637124bae1b49943b83f9ca4a7d2",
+ "version": "0.7.2"
 }
 '''  # END VERSION_JSON
 

{requake-0.6 → requake-0.7.2}/requake/catalog/__init__.py

@@ -4,10 +4,14 @@
 Functions and data structures for managing earthquake catalogs.
 
 :copyright:
-    2021-2024 Claudio Satriano <satriano@ipgp.fr>
+    2021-2026 Claudio Satriano <satriano@ipgp.fr>
 :license:
     GNU General Public License v3.0 or later
     (https://www.gnu.org/licenses/gpl-3.0-standalone.html)
 """
+from .catalog import (  # noqa
+    RequakeCatalog, RequakeEvent, generate_evid,
+    fix_non_locatable_events, read_stored_catalog
+)
 from .read_catalog import read_catalog  # noqa
 from .print_catalog import print_catalog  # noqa

{requake-0.6 → requake-0.7.2}/requake/catalog/catalog.py

@@ -4,15 +4,16 @@
 Classes and functions for downloading, reading and writing catalogs.
 
 :copyright:
-    2021-2024 Claudio Satriano <satriano@ipgp.fr>
+    2021-2026 Claudio Satriano <satriano@ipgp.fr>
 :license:
     GNU General Public License v3.0 or later
     (https://www.gnu.org/licenses/gpl-3.0-standalone.html)
 """
 import numpy as np
 from obspy import UTCDateTime
-from ..formulas.conversion import float_or_none
-from ..waveforms.station_metadata import get_traceid_coords
+from ..config import config
+from ..formulas import float_or_none
+from ..waveforms import get_traceid_coords
 
 
 class RequakeEvent():
@@ -91,8 +92,8 @@ class RequakeEvent():
             self.mag = float_or_none(word[10])
             self.mag_author = word[11]
             self.location_name = word[12]
-        except IndexError as e:
-            raise ValueError(f'Invalid line: {line}') from e
+        except IndexError as err:
+            raise ValueError(f'Invalid line: {line}') from err
 
     def fdsn_text(self):
         """
@@ -181,13 +182,13 @@ class RequakeCatalog(list):
             for ev in self:
                 fp.write(ev.fdsn_text() + '\n')
 
-
     def filter(
             self, starttime=None, endtime=None,
             minlatitude=None, maxlatitude=None,
             minlongitude=None, maxlongitude=None,
             mindepth=None, maxdepth=None,
-            minmagnitude=None, maxmagnitude=None):
+            minmagnitude=None, maxmagnitude=None
+    ):
         """
         Filter the catalog, based on the specified criteria.
 
@@ -248,13 +249,10 @@ class RequakeCatalog(list):
         return outcat
 
 
-def read_stored_catalog(config):
+def read_stored_catalog():
     """
     Read the catalog stored in the output directory.
 
-    :param config: Configuration object.
-    :type config: config.Config
-
     :return: Catalog object.
     :rtype: RequakeCatalog
 
@@ -268,24 +266,22 @@ def read_stored_catalog(config):
         if not cat:
             raise ValueError('Empty catalog')
         return cat
-    except ValueError as m:
+    except ValueError as err:
         raise ValueError(
-            f'Error reading catalog file {config.scan_catalog_file}: {m}'
-        ) from m
-    except FileNotFoundError as m:
+            f'Error reading catalog file {config.scan_catalog_file}: {err}'
+        ) from err
+    except (FileNotFoundError, NotADirectoryError) as err:
         raise FileNotFoundError(
             f'Catalog file {config.scan_catalog_file} not found'
-        ) from m
+        ) from err
 
 
-def fix_non_locatable_events(catalog, config):
+def fix_non_locatable_events(catalog):
     """
     Fix non-locatable events in catalog.
 
     :param catalog: a RequakeCatalog object
     :type catalog: RequakeCatalog
-    :param config: a Config object
-    :type config: config.Config
     """
     if not any(ev.lat is None or ev.lon is None for ev in catalog):
         return

{requake-0.6 → requake-0.7.2}/requake/catalog/print_catalog.py

@@ -4,29 +4,25 @@
 Print the event catalog to screen.
 
 :copyright:
-    2021-2024 Claudio Satriano <satriano@ipgp.fr>
+    2021-2026 Claudio Satriano <satriano@ipgp.fr>
 :license:
     GNU General Public License v3.0 or later
     (https://www.gnu.org/licenses/gpl-3.0-standalone.html)
 """
 import logging
+from ..config import rq_exit, generic_printer
 from .catalog import read_stored_catalog
-from ..config.generic_printer import generic_printer
-from ..config.rq_setup import rq_exit
 logger = logging.getLogger(__name__.rsplit('.', maxsplit=1)[-1])
 
 
-def print_catalog(config):
+def print_catalog():
     """
     Print the event catalog to screen.
-
-    :param config: Configuration object.
-    :type config: config.Config
     """
     try:
-        catalog = read_stored_catalog(config)
-    except (ValueError, FileNotFoundError) as m:
-        logger.error(m)
+        catalog = read_stored_catalog()
+    except (ValueError, FileNotFoundError) as msg:
+        logger.error(msg)
         rq_exit(1)
 
     headers_fmt = [
@@ -50,4 +46,4 @@ def print_catalog(config):
         ]
         for ev in catalog
     ]
-    generic_printer(config, rows, headers_fmt)
+    generic_printer(rows, headers_fmt)