Skip to content
Merged

V020 #47

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
6 changes: 3 additions & 3 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 Down Expand Up @@ -54,7 +54,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 +65,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
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(
'obstools/__init__.py',
'obstools/atacr/classes.py',
'obstools/atacr/plotting.py',
'obstools/atacr/utils.py',
'obstools/atacr/__init__.py',
'obstools/comply/classes.py',
'obstools/comply/__init__.py',
'obstools/scripts/atacr_download_data.py',
'obstools/scripts/atacr_daily_spectra.py',
'obstools/scripts/atacr_clean_spectra.py',
'obstools/scripts/atacr_transfer_functions.py',
'obstools/scripts/atacr_download_event.py',
'obstools/scripts/atacr_correct_event.py',
'obstools/scripts/comply_calculate.py',
'obstools/scripts/__init__.py',
pure: false,
preserve_path: true,
)

4 changes: 2 additions & 2 deletions obstools/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@

.. sourcecode:: bash

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

Activate the newly created environment:

Expand Down Expand Up @@ -105,7 +105,7 @@

"""

__version__ = '0.1.5'
__version__ = '0.2.0'

__author__ = 'Pascal Audet & Helen Janiszewski'

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


[project]
name = "obstools"
version = "0.2.0"
description = "Python tools for ocean bottom seismic instruments"
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"]
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/nfsi-canada/OBStools"
Documentation = "https://nfsi-canada.github.io/OBStools"
"Bug Tracker" = "https://github.com/nfsi-canada/OBStools/issues"

[project.scripts]
atacr_download_data = "obstools.scripts.atacr_download_data:main"
atacr_download_event = "obstools.scripts.atacr_download_event:main"
atacr_daily_spectra = "obstools.scripts.atacr_daily_spectra:main"
atacr_clean_spectra = "obstools.scripts.atacr_clean_spectra:main"
atacr_transfer_functions = "obstools.scripts.atacr_transfer_functions:main"
atacr_correct_event = "obstools.scripts.atacr_correct_event:main"
comply_calculate = "obstools.scripts.comply_calculate:main"
53 changes: 0 additions & 53 deletions setup.py

This file was deleted.

Loading