Skip to content

Commit 73e7ab7

Browse files
authored
Merge pull request #46 from paudetseis/v020
V020
2 parents 91584f0 + d3949ee commit 73e7ab7

File tree

6 files changed

+78
-58
lines changed

6 files changed

+78
-58
lines changed

.github/workflows/deploy.yml

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
strategy:
2424
matrix:
2525
os: ["ubuntu-latest"]
26-
python-version: ["3.10"]
26+
python-version: ["3.12"]
2727

2828
steps:
2929
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
@@ -39,10 +39,9 @@ jobs:
3939
run: |
4040
conda info
4141
conda config --add channels conda-forge
42-
conda install obspy cartopy libstdcxx-ng
42+
conda install obspy spectrum
4343
pip install stdb
44-
pip install spectrum
45-
pip install -e .
44+
pip install .
4645
4746
# - name: Tests
4847
# shell: bash -l {0}
@@ -54,7 +53,7 @@ jobs:
5453
# bash <(curl -s https://codecov.io/bash)
5554

5655
- name: Make docs
57-
if: matrix.python-version == '3.10'
56+
if: matrix.python-version == '3.12'
5857
shell: bash -l {0}
5958
run: |
6059
cd docs
@@ -65,7 +64,7 @@ jobs:
6564
cd ..
6665
6766
- name: Deploy 🚀
68-
if: matrix.python-version == '3.10'
67+
if: matrix.python-version == '3.12'
6968
uses: JamesIves/[email protected]
7069
with:
7170
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

docs/rfpy.rst

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,15 +31,13 @@ Installation
3131
Dependencies
3232
------------
3333

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

3737
- `stdb <https://github.com/paudetseis/StDb>`_
38+
- `obspy <https://github.com/obspy/obspy>`_
3839
- `spectrum <https://github.com/cokelaer/spectrum>`_
3940

40-
Other required packages (e.g., ``obspy``)
41-
will be automatically installed by ``stdb``.
42-
4341
Conda environment
4442
-----------------
4543

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

4947
.. sourcecode:: bash
5048

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

5351
Activate the newly created environment:
5452

5553
.. sourcecode:: bash
5654

5755
conda activate rfpy
5856

59-
Install remaining dependencies using ``pip`` inside the ``rfpy`` environment:
57+
Install the `StDb` dependency using ``pip`` inside the ``rfpy`` environment:
6058

6159
.. sourcecode:: bash
6260

meson.build

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
project('rfpy', 'c',
2+
version : '0.2.0',
3+
license: 'MIT',
4+
meson_version: '>=0.64.0',
5+
)
6+
7+
py_mod = import('python')
8+
py = py_mod.find_installation()
9+
py_dep = py.dependency()
10+
11+
py.install_sources(
12+
'rfpy/rfdata.py',
13+
'rfpy/plotting.py',
14+
'rfpy/hk.py',
15+
'rfpy/harmonics.py',
16+
'rfpy/binning.py',
17+
'rfpy/utils.py',
18+
'rfpy/ccp.py',
19+
'rfpy/__init__.py',
20+
'rfpy/scripts/rfpy_calc.py',
21+
'rfpy/scripts/rfpy_recalc.py',
22+
'rfpy/scripts/rfpy_plot.py',
23+
'rfpy/scripts/rfpy_hk.py',
24+
'rfpy/scripts/rfpy_harmonics.py',
25+
'rfpy/scripts/rfpy_ccp.py',
26+
'rfpy/scripts/__init__.py',
27+
pure: false,
28+
preserve_path: true,
29+
)
30+

pyproject.toml

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
[build-system]
2+
build-backend = "mesonpy"
3+
requires = ["meson-python>0.15.0", "numpy >= 1.25.0"]
4+
5+
6+
[project]
7+
name = "rfpy"
8+
version = "0.2.0"
9+
description = "Python package for calculating and post-processing receiver functions"
10+
authors = [
11+
{ name = "Pascal Audet", email = "[email protected]" }
12+
]
13+
maintainers = [
14+
{ name = "Pascal Audet", email = "[email protected]" }
15+
]
16+
requires-python = ">=3.9"
17+
readme = "README.md"
18+
dependencies = ["numpy>=1.25", "obspy", "spectrum"]
19+
classifiers = [
20+
"Development Status :: 5 - Stable",
21+
"Environment :: Console",
22+
"Intended Audience :: Science/Research",
23+
"Programming Language :: Python :: 3 :: Only",
24+
"Topic :: Scientific/Engineering :: Physics",
25+
]
26+
27+
[project.urls]
28+
Homepage = "https://github.com/paudetseis/RfPy"
29+
Documentation = "https://paudetseis.github.io/RfPy"
30+
"Bug Tracker" = "https://github.com/paudetseis/RfPy/issues"
31+
32+
[project.scripts]
33+
rfpy_calc = "rfpy.scripts.rfpy_calc:main"
34+
rfpy_recalc = "rfpy.scripts.rfpy_recalc:main"
35+
rfpy_plot = "rfpy.scripts.rfpy_plot:main"
36+
rfpy_hk = "rfpy.scripts.rfpy_hk:main"
37+
rfpy_harmonics = "rfpy.scripts.rfpy_harmonics:main"
38+
rfpy_ccp = "rfpy.scripts.rfpy_ccp:main"

rfpy/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
2121
# SOFTWARE.
2222

23-
__version__ = '0.1.4'
23+
__version__ = '0.2.0'
2424

2525
__author__ = 'Pascal Audet'
2626

setup.py

Lines changed: 0 additions & 45 deletions
This file was deleted.

0 commit comments

Comments
 (0)