Merge branch 'master' of https://github.com/paudetseis/RfPy

Author: paudetseis

.github/workflows/deploy.yml

@@ -21,16 +21,17 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-latest]
-        python-version: [3.7, 3.8, 3.9]
+        os: ["ubuntu-latest", "macos-latest"]
+        python-version: ["3.10"]
 
     steps:
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
-      - uses: actions/checkout@v2
-      - uses: conda-incubator/setup-miniconda@v2
+      - uses: actions/checkout@v4
+      - uses: conda-incubator/setup-miniconda@v3
         with:
           activate-environment: test
           auto-activate-base: false
+          python-version: ${{ matrix.python-version }}
 
       - name: Install
         shell: bash -l {0}

rfpy/__init__.py

@@ -20,7 +20,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-__version__ = '0.1.1'
+__version__ = '0.1.2'
 
 __author__ = 'Pascal Audet'
 

setup.py

@@ -2,7 +2,7 @@
 import os.path
 from os import listdir
 import re
-from numpy.distutils.core import setup
+from setuptools import setup
 from pathlib import Path
 
 
@@ -31,14 +31,15 @@ def find_version(*paths):
          'Programming Language :: Python :: 3.6',
          'Programming Language :: Python :: 3.7',
          'Programming Language :: Python :: 3.8',
-         'Programming Language :: Python :: 3.9'],
+         'Programming Language :: Python :: 3.9',
+         'Programming Language :: Python :: 3.10'],
     install_requires=['numpy', 'obspy', 'stdb>=0.2.0'],
-    python_requires='>=3.6',
+    python_requires='>=3.7',
     packages=setuptools.find_packages(),
-    entry_points={'console_scripts':[
-    'rfpy_calc=rfpy.scripts.rfpy_calc:main',
-    'rfpy_recalc=rfpy.scripts.rfpy_recalc:main',
-    'rfpy_plot=rfpy.scripts.rfpy_plot:main',
-    'rfpy_harmonics=rfpy.scripts.rfpy_harmonics:main',
-    'rfpy_hk=rfpy.scripts.rfpy_hk:main',
-    'rfpy_ccp=rfpy.scripts.rfpy_ccp:main']})
+    entry_points={'console_scripts': [
+        'rfpy_calc=rfpy.scripts.rfpy_calc:main',
+        'rfpy_recalc=rfpy.scripts.rfpy_recalc:main',
+        'rfpy_plot=rfpy.scripts.rfpy_plot:main',
+        'rfpy_harmonics=rfpy.scripts.rfpy_harmonics:main',
+        'rfpy_hk=rfpy.scripts.rfpy_hk:main',
+        'rfpy_ccp=rfpy.scripts.rfpy_ccp:main']})