Skip to content

Commit ca2556a

Browse files
authored
Merge pull request #47 from nfsi-canada/v020
V020
2 parents 4cc306b + 4a45bf5 commit ca2556a

File tree

5 files changed

+74
-58
lines changed

5 files changed

+74
-58
lines changed

.github/workflows/deploy.yml

Lines changed: 3 additions & 3 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
@@ -54,7 +54,7 @@ jobs:
5454
# bash <(curl -s https://codecov.io/bash)
5555

5656
- name: Make docs
57-
if: matrix.python-version == '3.10'
57+
if: matrix.python-version == '3.12'
5858
shell: bash -l {0}
5959
run: |
6060
cd docs
@@ -65,7 +65,7 @@ jobs:
6565
cd ..
6666
6767
- name: Deploy 🚀
68-
if: matrix.python-version == '3.10'
68+
if: matrix.python-version == '3.12'
6969
uses: JamesIves/github-pages-deploy-action@3.7.1
7070
with:
7171
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

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+
'obstools/__init__.py',
13+
'obstools/atacr/classes.py',
14+
'obstools/atacr/plotting.py',
15+
'obstools/atacr/utils.py',
16+
'obstools/atacr/__init__.py',
17+
'obstools/comply/classes.py',
18+
'obstools/comply/__init__.py',
19+
'obstools/scripts/atacr_download_data.py',
20+
'obstools/scripts/atacr_daily_spectra.py',
21+
'obstools/scripts/atacr_clean_spectra.py',
22+
'obstools/scripts/atacr_transfer_functions.py',
23+
'obstools/scripts/atacr_download_event.py',
24+
'obstools/scripts/atacr_correct_event.py',
25+
'obstools/scripts/comply_calculate.py',
26+
'obstools/scripts/__init__.py',
27+
pure: false,
28+
preserve_path: true,
29+
)
30+

obstools/__init__.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
6767
.. sourcecode:: bash
6868
69-
conda create -n obs "python=3.10" "setuptools=60"" obspy -c conda-forge
69+
conda create -n obs -c conda-forge python=3.12 obspy
7070
7171
Activate the newly created environment:
7272
@@ -105,7 +105,7 @@
105105
106106
"""
107107

108-
__version__ = '0.1.5'
108+
__version__ = '0.2.0'
109109

110110
__author__ = 'Pascal Audet & Helen Janiszewski'
111111

pyproject.toml

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
[build-system]
2+
build-backend = "mesonpy"
3+
requires = ["meson-python>0.15.0", "numpy >= 1.25.0"]
4+
5+
6+
[project]
7+
name = "obstools"
8+
version = "0.2.0"
9+
description = "Python tools for ocean bottom seismic instruments"
10+
authors = [
11+
{ name = "Pascal Audet", email = "pascal.audet@uottawa.ca" }
12+
]
13+
maintainers = [
14+
{ name = "Pascal Audet", email = "pascal.audet@uottawa.ca" }
15+
]
16+
requires-python = ">=3.9"
17+
readme = "README.md"
18+
dependencies = ["numpy>=1.25", "obspy"]
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/nfsi-canada/OBStools"
29+
Documentation = "https://nfsi-canada.github.io/OBStools"
30+
"Bug Tracker" = "https://github.com/nfsi-canada/OBStools/issues"
31+
32+
[project.scripts]
33+
atacr_download_data = "obstools.scripts.atacr_download_data:main"
34+
atacr_download_event = "obstools.scripts.atacr_download_event:main"
35+
atacr_daily_spectra = "obstools.scripts.atacr_daily_spectra:main"
36+
atacr_clean_spectra = "obstools.scripts.atacr_clean_spectra:main"
37+
atacr_transfer_functions = "obstools.scripts.atacr_transfer_functions:main"
38+
atacr_correct_event = "obstools.scripts.atacr_correct_event:main"
39+
comply_calculate = "obstools.scripts.comply_calculate:main"

setup.py

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

0 commit comments

Comments
 (0)