Skip to content
Merged

V020 #46

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 5 additions & 6 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
strategy:
matrix:
os: ["ubuntu-latest"]
python-version: ["3.10"]
python-version: ["3.12"]

steps:
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
Expand All @@ -39,10 +39,9 @@ jobs:
run: |
conda info
conda config --add channels conda-forge
conda install obspy cartopy libstdcxx-ng
conda install obspy spectrum
pip install stdb
pip install spectrum
pip install -e .
pip install .

# - name: Tests
# shell: bash -l {0}
Expand All @@ -54,7 +53,7 @@ jobs:
# bash <(curl -s https://codecov.io/bash)

- name: Make docs
if: matrix.python-version == '3.10'
if: matrix.python-version == '3.12'
shell: bash -l {0}
run: |
cd docs
Expand All @@ -65,7 +64,7 @@ jobs:
cd ..

- name: Deploy 🚀
if: matrix.python-version == '3.10'
if: matrix.python-version == '3.12'
uses: JamesIves/github-pages-deploy-action@3.7.1
with:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
Expand Down
10 changes: 4 additions & 6 deletions docs/rfpy.rst
Original file line number Diff line number Diff line change
Expand Up @@ -31,15 +31,13 @@ Installation
Dependencies
------------

The current version has been tested using **Python > 3.6** \
The current version has been tested using **Python > 3.9** \
Also, the following packages are required:

- `stdb <https://github.com/paudetseis/StDb>`_
- `obspy <https://github.com/obspy/obspy>`_
- `spectrum <https://github.com/cokelaer/spectrum>`_

Other required packages (e.g., ``obspy``)
will be automatically installed by ``stdb``.

Conda environment
-----------------

Expand All @@ -48,15 +46,15 @@ where ``RfPy`` can be installed along with some of its dependencies.

.. sourcecode:: bash

conda create -n rfpy "python=3.10" "setuptools=60" obspy spectrum -c conda-forge
conda create -n rfpy -c conda-forge python=3.12 obspy spectrum

Activate the newly created environment:

.. sourcecode:: bash

conda activate rfpy

Install remaining dependencies using ``pip`` inside the ``rfpy`` environment:
Install the `StDb` dependency using ``pip`` inside the ``rfpy`` environment:

.. sourcecode:: bash

Expand Down
30 changes: 30 additions & 0 deletions meson.build
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
project('rfpy', 'c',
version : '0.2.0',
license: 'MIT',
meson_version: '>=0.64.0',
)

py_mod = import('python')
py = py_mod.find_installation()
py_dep = py.dependency()

py.install_sources(
'rfpy/rfdata.py',
'rfpy/plotting.py',
'rfpy/hk.py',
'rfpy/harmonics.py',
'rfpy/binning.py',
'rfpy/utils.py',
'rfpy/ccp.py',
'rfpy/__init__.py',
'rfpy/scripts/rfpy_calc.py',
'rfpy/scripts/rfpy_recalc.py',
'rfpy/scripts/rfpy_plot.py',
'rfpy/scripts/rfpy_hk.py',
'rfpy/scripts/rfpy_harmonics.py',
'rfpy/scripts/rfpy_ccp.py',
'rfpy/scripts/__init__.py',
pure: false,
preserve_path: true,
)

38 changes: 38 additions & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
[build-system]
build-backend = "mesonpy"
requires = ["meson-python>0.15.0", "numpy >= 1.25.0"]


[project]
name = "rfpy"
version = "0.2.0"
description = "Python package for calculating and post-processing receiver functions"
authors = [
{ name = "Pascal Audet", email = "pascal.audet@uottawa.ca" }
]
maintainers = [
{ name = "Pascal Audet", email = "pascal.audet@uottawa.ca" }
]
requires-python = ">=3.9"
readme = "README.md"
dependencies = ["numpy>=1.25", "obspy", "spectrum"]
classifiers = [
"Development Status :: 5 - Stable",
"Environment :: Console",
"Intended Audience :: Science/Research",
"Programming Language :: Python :: 3 :: Only",
"Topic :: Scientific/Engineering :: Physics",
]

[project.urls]
Homepage = "https://github.com/paudetseis/RfPy"
Documentation = "https://paudetseis.github.io/RfPy"
"Bug Tracker" = "https://github.com/paudetseis/RfPy/issues"

[project.scripts]
rfpy_calc = "rfpy.scripts.rfpy_calc:main"
rfpy_recalc = "rfpy.scripts.rfpy_recalc:main"
rfpy_plot = "rfpy.scripts.rfpy_plot:main"
rfpy_hk = "rfpy.scripts.rfpy_hk:main"
rfpy_harmonics = "rfpy.scripts.rfpy_harmonics:main"
rfpy_ccp = "rfpy.scripts.rfpy_ccp:main"
2 changes: 1 addition & 1 deletion rfpy/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
# SOFTWARE.

__version__ = '0.1.4'
__version__ = '0.2.0'

__author__ = 'Pascal Audet'

Expand Down
45 changes: 0 additions & 45 deletions setup.py

This file was deleted.

Loading