Merge pull request #282 from cseptesting/v0.8.0-candidate

V0.8.0 candidate

Author: pabloitu

.coveragerc

@@ -5,7 +5,6 @@ omit =
     tests/*
     docs/*
     examples/*
-    csep/utils/plots.py
     csep/utils/constants.py
     csep/utils/datasets.py
     csep/utils/documents.py

.github/workflows/build-sphinx-no-deploy.yml

@@ -16,7 +16,7 @@ jobs:
       - uses: mamba-org/setup-micromamba@v1
         with:
           generate-run-shell: true
-          environment-file: requirements.yml
+          environment-file: environment.yml
           create-args: >-
             python=3.10
             pillow

.github/workflows/build-sphinx.yml

@@ -16,7 +16,7 @@ jobs:
       - uses: mamba-org/setup-micromamba@v1
         with:
           generate-run-shell: true
-          environment-file: requirements.yml
+          environment-file: environment.yml
           create-args: >-
             python=3.9
             pillow

.github/workflows/build-test.yml

@@ -2,13 +2,12 @@ name: tests
 
 on:
   push:
-    branches-ignore:
-      - 'v*'
+    branches: [main]
   pull_request:
 
 jobs:
   build:
-    if: github.repository == 'SCECcode/pycsep'
+    if: github.repository == 'cseptesting/pycsep'
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
@@ -27,7 +26,7 @@ jobs:
       - uses: mamba-org/setup-micromamba@v1
         with:
           generate-run-shell: true
-          environment-file: requirements.yml
+          environment-file: environment.yml
           create-args: >-
             python=${{ matrix.python-version }}
 
@@ -48,7 +47,7 @@ jobs:
 
 
   build_pip:
-    if: github.repository == 'SCECcode/pycsep'
+    if: github.repository == 'cseptesting/pycsep'
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false

.github/workflows/publish-pypi.yml

@@ -19,7 +19,7 @@ jobs:
       - uses: mamba-org/setup-micromamba@v1
         with:
           generate-run-shell: true
-          environment-file: requirements.yml
+          environment-file: environment.yml
           create-args: >-
             python=3.10
 
@@ -28,13 +28,13 @@ jobs:
           conda info -a
           conda list
 
-      - name: Create sdist
+      - name: Create sdist and wheel
         run: |
-          python setup.py check
-          python setup.py sdist
+          python -m pip install --upgrade pip build
+          python -m build
 
       - name: Publish Package
-        uses: pypa/gh-action-pypi-publish@master
+        uses: pypa/gh-action-pypi-publish@release/v1
         with:
           user: __token__
           password: ${{ secrets.pypi_upload_token }}

LICENSE.txt LICENSELICENSE.txt renamed to LICENSE

@@ -2,7 +2,7 @@ include README.md
 include CONTRIBUTING.md
 include CODE_OF_CONDUCT.md
 include Dockerfile
-include LICENSE.txt
+include LICENSE
 include CHANGELOG.md
 include CREDITS.md
 include codemeta.json
@@ -23,8 +23,5 @@ global-exclude .git*
 global-exclude *.pyc
 global-exclude *.html
 global-exclude *.so
-global-exclude *.xls
-global-exclude *.xlsm
-global-exclude *.xlsx
 global-exclude *~
 global-exclude .DS_Store

MANIFEST.in

@@ -89,4 +89,4 @@ Development of pyCSEP is a group effort. A list of developers that have contribu
 are listed in the [credits](CREDITS.md) file in this repository.
 
 # License:
-The pyCSEP software is distributed under the BSD 3-Clause open-source license. Please see the [license](LICENSE.txt) file for more information.
+The pyCSEP software is distributed under the BSD 3-Clause open-source license. Please see the [license](LICENSE) file for more information.

README.md

@@ -2,8 +2,6 @@
 import os
 import time
 
-from csep._version import __version__
-
 from csep.core import forecasts
 from csep.core import catalogs
 from csep.core import poisson_evaluations
@@ -37,6 +35,13 @@
     utc_now_epoch
 )
 
+from importlib.metadata import version as _pkg_version, PackageNotFoundError
+
+try:
+    __version__ = _pkg_version("pycsep")
+except PackageNotFoundError:
+    __version__ = "0+unknown"
+
 # this defines what is imported on a `from csep import *`
 __all__ = [
     'load_json',
@@ -80,8 +85,8 @@ def load_stochastic_event_sets(filename, type='csv', format='native',
         (generator): :class:`~csep.core.catalogs.AbstractBaseCatalog`
 
     """
-    if type not in ('ucerf3', 'csv'):
-        raise ValueError("type must be one of the following: (ucerf3)")
+    if type not in ('ucerf3', 'csv', 'csep'):
+        raise ValueError("type must be one of the following: (ucerf3, csv, csep)")
 
     # use mapping to dispatch to correct function
     # in general, stochastic event sets are loaded with classmethods and single catalogs use the
@@ -105,7 +110,7 @@ def load_stochastic_event_sets(filename, type='csv', format='native',
         elif format == 'csep':
             yield catalog.get_csep_format()
         else:
-            raise ValueError('format must be either "native" or "csep!')
+            raise ValueError('format must be either "native" or "csep!"')
 
 
 def load_catalog(filename, type='csep-csv', format='native', loader=None,
@@ -333,7 +338,7 @@ def query_gns(start_time, end_time,  min_magnitude=2.950,
         verbose (bool): print catalog summary statistics
 
     Returns:
-        :class:`csep.core.catalogs.CSEPCatalog
+        :class:`csep.core.catalogs.CSEPCatalog`
     """
 
     # Timezone should be in UTC
@@ -366,7 +371,7 @@ def query_gcmt(start_time, end_time, min_magnitude=5.0,
                max_depth=None,
                catalog_id=None,
                min_latitude=None, max_latitude=None,
-               min_longitude=None, max_longitude=None):
+               min_longitude=None, max_longitude=None, verbose=True):
 
     eventlist = readers._query_gcmt(start_time=start_time,
                                      end_time=end_time,
@@ -381,6 +386,17 @@ def query_gcmt(start_time, end_time, min_magnitude=5.0,
                                    name='gCMT',
                                    catalog_id=catalog_id,
                                    date_accessed=utc_now_datetime())
+
+    if verbose:
+        print("Downloaded catalog from GCMT with following parameters")
+        print("Start Date: {}\nEnd Date: {}".format(str(catalog.start_time),
+                                                    str(catalog.end_time)))
+        print("Min Latitude: {} and Max Latitude: {}".format(catalog.min_latitude,
+                                                             catalog.max_latitude))
+        print("Min Longitude: {} and Max Longitude: {}".format(catalog.min_longitude,
+                                                               catalog.max_longitude))
+        print("Min Magnitude: {}".format(catalog.min_magnitude))
+        print(f"Found {catalog.event_count} events in the gns catalog.")
     return catalog