Merge branch 'master' of https://github.com/SCECCode/pycsep

SCECcode · Sep 12, 2023 · 7326e0a · 7326e0a
2 parents 0840c8c + efde281
commit 7326e0a
Show file tree

Hide file tree

Showing 48 changed files with 2,744 additions and 803 deletions.
diff --git a/.github/workflows/build-sphinx-no-deploy.yml b/.github/workflows/build-sphinx-no-deploy.yml
@@ -13,17 +13,16 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2
-      - uses: conda-incubator/setup-miniconda@v2
+      - uses: mamba-org/setup-micromamba@v1
         with:
-          python-version: '3.10'
-          activate-environment: csep-dev
-          channels: conda-forge
-
-      - name: Install dependencies
-        run: |
-          conda env update --file requirements.yml
-          conda info -a
-          conda list
+          generate-run-shell: true
+          environment-file: requirements.yml
+          create-args: >-
+            python=3.10
+            pillow
+            sphinx
+            sphinx-gallery
+            sphinx-rtd-theme
 
       - name: Install pyCSEP
         run: |

diff --git a/.github/workflows/build-sphinx.yml b/.github/workflows/build-sphinx.yml
@@ -13,17 +13,16 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2
-      - uses: conda-incubator/setup-miniconda@v2
+      - uses: mamba-org/setup-micromamba@v1
         with:
-          python-version: '3.10'
-          activate-environment: csep-dev
-          channels: conda-forge
-
-      - name: Install dependencies
-        run: |
-          conda env update --file requirements.yml
-          conda info -a
-          conda list
+          generate-run-shell: true
+          environment-file: requirements.yml
+          create-args: >-
+            python=3.9
+            pillow
+            sphinx
+            sphinx-gallery
+            sphinx-rtd-theme
 
       - name: Install pyCSEP
         run: |

diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
@@ -3,12 +3,12 @@ name: tests
 on:
   push:
     branches-ignore:
-    - 'v*'
+      - 'v*'
   pull_request:
 
 jobs:
   build:
-    if: github.repository == 'SCECCode/pycsep'
+    if: github.repository == 'SCECcode/pycsep'
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
@@ -20,30 +20,25 @@ jobs:
         shell: bash -l {0}
 
     steps:
-    - uses: actions/checkout@v2
-    - uses: conda-incubator/setup-miniconda@v2
-      with:
-        python-version: ${{ matrix.python-version }}
-        activate-environment: csep-dev
-        channels: conda-forge
+      - uses: actions/checkout@v2
+      - uses: mamba-org/setup-micromamba@v1
+        with:
+          generate-run-shell: true
+          environment-file: requirements.yml
+          create-args: >-
+            python=${{ matrix.python-version }}
 
-    - name: Install dependencies
-      run: |
-        conda env update --file requirements.yml
-        conda info -a
-        conda list
+      - name: Install pyCSEP
+        run: |
+          pip install --no-deps -e .
+          python -c "import csep; print('Version: ', csep.__version__)"
 
-    - name: Install pyCSEP
-      run: |
-        pip install --no-deps -e .
-        python -c "import csep; print('Version: ', csep.__version__)"
+      - name: Test with pytest
+        run: |
+          pip install vcrpy==4.3.1 pytest pytest-cov
+          pytest --cov=./ --cov-config=.coveragerc
 
-    - name: Test with pytest
-      run: |
-        conda install pytest-cov
-        pytest --cov=./ --cov-config=.coveragerc
-
-    - name: Upload coverage
-      if: matrix.os == 'ubuntu-latest' && matrix.python-version == '3.10'
-      run: |
-        bash <(curl -s https://codecov.io/bash) || echo 'Codecov failed to upload'
+      - name: Upload coverage
+        if: matrix.os == 'ubuntu-latest' && matrix.python-version == '3.10'
+        run: |
+          bash <(curl -s https://codecov.io/bash) || echo 'Codecov failed to upload'
diff --git a/.github/workflows/publish-pypi.yml b/.github/workflows/publish-pypi.yml
@@ -16,15 +16,15 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2
-      - uses: conda-incubator/setup-miniconda@v2
+      - uses: mamba-org/setup-micromamba@v1
         with:
-          activate-environment: csep-dev
-          python-version: '3.10'
-          channels: conda-forge
+          generate-run-shell: true
+          environment-file: requirements.yml
+          create-args: >-
+            python=3.10
 
-      - name: Install dependencies
+      - name: Check dependencies
         run: |
-          conda env update --file requirements.yml
           conda info -a
           conda list
 

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,7 +1,42 @@
+# v0.6.2 (6/16/2023)
+
+# Change-log
+Fixed an error-bar bug for normalized consistency plots ([#222](https://github.com/SCECcode/pycsep/pull/222))
+Fixed handles URL exception or SSL verifications errors for both python 3.8 and 3.11 inclusive ([#231](https://github.com/SCECcode/pycsep/pull/231))
+Included CMT Catalog accessor ([#217](https://github.com/SCECcode/pycsep/pull/217))
+Added NZ catalog reader ([#213](https://github.com/SCECcode/pycsep/pull/213))
+
+## Credits
+Pablo Iturrieta (@pabloitu)
+Kenny Graham (@KennyGraham1)
+Fabio Silva (@fabiolsilva)
+
+# v0.6.1 (12/12/2022)
+
+# Change-log
+Added quadtree csv reader ([#186](https://github.com/SCECcode/pycsep/pull/186))  
+Non-Poissonian tests
+([#189](https://github.com/SCECcode/pycsep/pull/189),
+[#205](https://github.com/SCECcode/pycsep/pull/205),
+[#208](https://github.com/SCECcode/pycsep/pull/208),
+[#209](https://github.com/SCECcode/pycsep/pull/209))  
+Added plots for p-values, and confidence ranges for consistency tests ([#190](https://github.com/SCECcode/pycsep/pull/190))    
+Added NZ testing and collection regions ([#198](https://github.com/SCECcode/pycsep/pull/198))  
+Fixed region border plotting issue ([#199](https://github.com/SCECcode/pycsep/pull/199))  
+Added documentation for non-Poissonian tests ([#202](https://github.com/SCECcode/pycsep/pull/202))  
+Support for BSI catalog ([#201](https://github.com/SCECcode/pycsep/pull/201))  
+Fixed compatibility with new version of matplotlib ([#206](https://github.com/SCECcode/pycsep/pull/206))
+
+## Credits
+Pablo Iturrieta (@pabloitu)  
+Jose Bayona (@bayonato89)  
+Khawaja Asim (@khawajasim)  
+William Savran (@wsavran)
+
 # v0.6.0 (02/04/2022)
 
 ## Change-log
-Adds support for quadtree regions [#184](https://github.com/SCECcode/pycsep/pull/184)
+Adds support for quadtree regions ([#184](https://github.com/SCECcode/pycsep/pull/184))
 
 ## Credits
 Khawaja Asim (@khawajasim)  

diff --git a/CITATION.cff b/CITATION.cff
@@ -14,6 +14,6 @@ authors:
     given-names: Philip J.
     orcid: 0000-0002-9221-7068
 title: "pyCSEP - Tools for Earthquake Forecast Developers"
-version: 0.4.1
+version: 0.6.1
 repository: https://github.com/SCECcode/pycsep
 date-released: 2021-04-20 
diff --git a/CREDITS.md b/CREDITS.md
@@ -13,5 +13,7 @@ Contributors:
 * Max Werner, University of Bristol
 * Danijel Schorlemmner, GFZ Potsdam
 * Philip Maechling, Southern California Earthquake Center
+* Fabio Silva, Southern Caifornia Earthquake Center
+* Kenny Graham, GNS Science
 
 Thanks to everyone for all your contributions! 
diff --git a/README.md b/README.md
@@ -76,7 +76,7 @@ Software support for pyCSEP is provided by that Southern California Earthquake C
 This group supports several research software distributions including UCVM. Users can report issues and feature requests 
 using the pyCSEP github-based issue tracking link below. Developers will also respond to emails sent to the SCEC software contact listed below.
 1. [pyCSEP Issues](https://github.com/SCECcode/pycsep/issues)
-2. Email Contact: software [at] scec [dot] usc [dot] edu
+2. Email Contact: software [at] scec [dot] org
 
 # Contributing:
 We welcome contributions to the pyCSEP Toolkit.  If you would like to contribute to this package, including software, tests, and documentation, 

diff --git a/codemeta.json b/codemeta.json
@@ -5,11 +5,11 @@
     "codeRepository": "https://github.com/SCECcode/pycsep.git",
     "dateCreated": "2021-10-31",
     "datePublished": "2020-10-20",
-    "dateModified": "2022-01-25",
+    "dateModified": "2023-06-16",
     "downloadUrl": "https://github.com/SCECcode/pycsep",
     "issueTracker": "https://github.com/SCECcode/pycsep/issues",
     "name": "pyCSEP",
-    "version": "v0.6.0",
+    "version": "v0.6.2",
     "description": "The pyCSEP Toolkit helps earthquake forecast model developers evaluate their forecasts with the goal of understanding earthquake predictability.",
     "applicationCategory": "Seismology",
     "developmentStatus": "active",
@@ -30,16 +30,16 @@
         "NumPy 1.21.3 or later (https://numpy.org)",
         "SciPy 1.7.1 or later (https://scipy.org)",
         "pandas 1.3.4 or later (https://pandas.pydata.org)",
-        "cartopy 0.20.0 or later (https://scitools.org.uk/cartopy/docs/latest)",
+        "cartopy 0.21.5 or later (https://scitools.org.uk/cartopy/docs/latest)",
         "GEOS 3.7.2 or later (https://trac.osgeo.org/geos/)",
         "PROJ 8.0.0 or later (https://proj.org/)"
     ],
     "author": [
         {
             "@type": "Person",
-            "givenName": "William",
-            "familyName": "Savran",
-            "email": "wsavran@usc.edu",
+            "givenName": "Fabio",
+            "familyName": "Silva",
+            "email": "fsilva@usc.edu",
             "affiliation": {
                 "@type": "Organization",
                 "name": "University of Southern California"