Skip to content
Merged
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
35 changes: 35 additions & 0 deletions .github/workflows/codecov_lints.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
name: Code coverage report

# no permissions by default
permissions: {}

on:
pull_request:
push:

jobs:
run:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
with:
persist-credentials: false

- name: Set up Python
uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97 # v7.0.0
with:
python-version: "3.x"

- name: Install gsw
run: >
python -m pip install --group dev
&& python -m pip install -e .

- name: Run tests with coverage
run: |
python -m pytest -s -rxs -v --cov=gsw gsw/tests

- name: Run linters
run: >
prek run --all-files
2 changes: 1 addition & 1 deletion .github/workflows/deploy-docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:

- name: Install gsw
run: >
python -m pip install -r requirements-dev.txt
python -m pip install --group dev
&& python -m pip install -e .

- name: Build documentation
Expand Down
19 changes: 0 additions & 19 deletions .github/workflows/pre-commit.yml

This file was deleted.

10 changes: 3 additions & 7 deletions .github/workflows/test_code_generation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,10 @@ jobs:
with:
python-version: "3.x"

- name: Install gsw
run: >
python -m pip install -r requirements-dev.txt
&& python -m pip install -e .

- name: Test Code Generation
run: >
git clone https://github.com/TEOS-10/GSW-C.git ../GSW-C
python -m pip install --group dev
&& git clone https://github.com/TEOS-10/GSW-C.git ../GSW-C
&& git clone https://github.com/TEOS-10/GSW-Matlab.git ../GSW-Matlab
&& python tools/copy_from_GSW-C.py
&& python tools/mat2npz.py
Expand All @@ -41,7 +37,7 @@ jobs:

- name: Install gsw
run: >
python -m pip install -v -e . --no-deps --no-build-isolation --force-reinstall
python -m pip install -e .
&& python -m pytest -s -rxs -v gsw/tests
permissions:
actions: none
5 changes: 2 additions & 3 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
python-version: [ "3.11", "3.12", "3.13", "3.14" ]
python-version: [ "3.11", "3.15-dev" ]
os: [ windows-latest, ubuntu-latest, macos-latest ]
fail-fast: false

Expand All @@ -31,9 +31,8 @@ jobs:

- name: Install gsw
run: >
python -m pip install -r requirements-dev.txt
python -m pip install --group dev
&& python -m pip install -e .
&& python -m pip install numpy${{ matrix.numpy-version }}

- name: Tests
run: |
Expand Down
4 changes: 2 additions & 2 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,13 @@ repos:
- --ignore-words-list=nin,preformed,wih,pres,

- repo: https://github.com/tox-dev/pyproject-fmt
rev: v2.29.3
rev: v2.29.4
hooks:
- id: pyproject-fmt


- repo: https://github.com/charliermarsh/ruff-pre-commit
rev: v0.16.6
rev: v0.16.7
hooks:
- id: ruff

Expand Down
15 changes: 15 additions & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ classifiers = [
"Programming Language :: Python :: 3.12",
"Programming Language :: Python :: 3.13",
"Programming Language :: Python :: 3.14",
"Programming Language :: Python :: 3.15",
"Topic :: Scientific/Engineering",
]
dynamic = [
Expand All @@ -30,6 +31,20 @@ dynamic = [
dependencies = [
"numpy>=2",
]

[dependency-groups]
dev = [
"dask",
"numpydoc",
"pandas>=2",
"prek",
"pytest",
"pytest-cov",
"scipy",
"sphinx",
"sphinx-rtd-theme",
"xarray",
]
urls.documentation = "https://teos-10.github.io/GSW-Python/"
urls.homepage = "https://www.teos-10.org/"
urls.repository = "https://github.com/TEOS-10/GSW-python"
Expand Down
9 changes: 0 additions & 9 deletions requirements-dev.txt

This file was deleted.

Loading