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
10 changes: 5 additions & 5 deletions .github/workflows/run_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,15 @@ on:
- master
paths:
- "**.py"
- ".github/workflows/test*.yml"
- ".github/workflows/run_tests.yml"
- "pyproject.toml"
- "poetry.lock"
- "conda-lock.yml"
- "requirements/*"
pull_request:
paths:
- "**.py"
- ".github/workflows/test*.yml"
- ".github/workflows/run_tests.yml"
- "pyproject.toml"
- "poetry.lock"
- "conda-lock.yml"
Expand All @@ -31,13 +31,13 @@ jobs:
os:
- "ubuntu"
python-version:
- "3.9"
- "3.10"
- "3.11"
- "3.12"
- "3.13"
- "3.14"
include:
- os: "macos"
python-version: "3.9"
python-version: "3.11"
runs-on: "${{ matrix.os }}-latest"
defaults:
run:
Expand Down
23 changes: 13 additions & 10 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,10 @@ fail_fast: false

repos:
- repo: "https://github.com/pre-commit/pre-commit-hooks"
rev: "v5.0.0"
rev: "v6.0.0"
hooks:
- id: "check-added-large-files"
- id: "check-ast"
- id: "check-byte-order-marker"
- id: "check-docstring-first"
- id: "check-executables-have-shebangs"
- id: "check-json"
Expand All @@ -24,6 +23,7 @@ repos:
- id: "debug-statements"
- id: "end-of-file-fixer"
exclude: ".+\\.ipynb"
- id: "fix-byte-order-marker"
- id: "name-tests-test"
- id: "trailing-whitespace"

Expand All @@ -35,39 +35,42 @@ repos:
- id: "python-use-type-annotations"

- repo: "https://github.com/python-jsonschema/check-jsonschema"
rev: "0.29.4"
rev: "0.37.2"
hooks:
- id: "check-github-workflows"

- repo: "https://github.com/asottile/reorder_python_imports"
rev: "v3.14.0"
rev: "v3.16.0"
hooks:
- id: "reorder-python-imports"
args:
- "--py39-plus"

- repo: "https://github.com/psf/black"
rev: "24.10.0"
rev: "26.5.1"
hooks:
- id: "black"

- repo: "https://github.com/charliermarsh/ruff-pre-commit"
# Ruff version.
rev: "v0.7.2"
rev: "v0.15.15"
hooks:
- id: "ruff"

- repo: "https://github.com/kynan/nbstripout"
rev: "0.8.0"
rev: "0.9.1"
hooks:
- id: "nbstripout"

- repo: "https://github.com/python-poetry/poetry"
rev: "1.8.0"
rev: "2.4.1"
hooks:
- id: "poetry-check"
- id: "poetry-lock"
args: ["--check"]
args: ["--lock"]

- repo: "https://github.com/python-poetry/poetry-plugin-export"
rev: "1.10.0"
hooks:
- id: "poetry-export"
name: "poetry export main"
args:
Expand Down
28 changes: 14 additions & 14 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -20,30 +20,30 @@ test:
python -m pytest -vl --durations=10

deps:
pre-commit run poetry-lock -a
pre-commit run poetry-check -a
pre-commit run poetry-export -a

conda_lock_ci:
conda-lock lock --mamba --check-input-hash --platform linux-64 --platform osx-64 -f ci/py3.9.yml --lockfile ci/conda-lock-py3.9.yml
conda-lock lock --mamba --check-input-hash --platform linux-64 --platform osx-64 -f ci/py3.10.yml --lockfile ci/conda-lock-py3.10.yml
conda-lock lock --mamba --check-input-hash --platform linux-64 --platform osx-64 -f ci/py3.11.yml --lockfile ci/conda-lock-py3.11.yml
conda-lock lock --mamba --check-input-hash --platform linux-64 --platform osx-64 -f ci/py3.12.yml --lockfile ci/conda-lock-py3.12.yml
conda-lock render --platform linux-64 --filename-template ci/conda-lock-{platform}-py3.9 ci/conda-lock-py3.9.yml
conda-lock render --platform linux-64 --filename-template ci/conda-lock-{platform}-py3.10 ci/conda-lock-py3.10.yml
conda-lock lock --mamba --check-input-hash --platform linux-64 --platform osx-64 -f ci/py3.13.yml --lockfile ci/conda-lock-py3.13.yml
conda-lock lock --mamba --check-input-hash --platform linux-64 --platform osx-64 -f ci/py3.14.yml --lockfile ci/conda-lock-py3.14.yml
conda-lock render --platform linux-64 --filename-template ci/conda-lock-{platform}-py3.11 ci/conda-lock-py3.11.yml
conda-lock render --platform linux-64 --filename-template ci/conda-lock-{platform}-py3.12 ci/conda-lock-py3.12.yml
conda-lock render --platform osx-64 --filename-template ci/conda-lock-{platform}-py3.9 ci/conda-lock-py3.9.yml
conda-lock render --platform osx-64 --filename-template ci/conda-lock-{platform}-py3.10 ci/conda-lock-py3.10.yml
conda-lock render --platform linux-64 --filename-template ci/conda-lock-{platform}-py3.13 ci/conda-lock-py3.13.yml
conda-lock render --platform linux-64 --filename-template ci/conda-lock-{platform}-py3.14 ci/conda-lock-py3.14.yml
conda-lock render --platform osx-64 --filename-template ci/conda-lock-{platform}-py3.11 ci/conda-lock-py3.11.yml
conda-lock render --platform osx-64 --filename-template ci/conda-lock-{platform}-py3.12 ci/conda-lock-py3.12.yml
mv ci/conda-lock-linux-64-py3.9 ci/conda-lock-Linux-64-py3.9
mv ci/conda-lock-linux-64-py3.10 ci/conda-lock-Linux-64-py3.10
conda-lock render --platform osx-64 --filename-template ci/conda-lock-{platform}-py3.13 ci/conda-lock-py3.13.yml
conda-lock render --platform osx-64 --filename-template ci/conda-lock-{platform}-py3.14 ci/conda-lock-py3.14.yml
mv ci/conda-lock-linux-64-py3.11 ci/conda-lock-Linux-64-py3.11
mv ci/conda-lock-linux-64-py3.12 ci/conda-lock-Linux-64-py3.12
mv ci/conda-lock-osx-64-py3.9 ci/conda-lock-macOS-64-py3.9
mv ci/conda-lock-osx-64-py3.10 ci/conda-lock-macOS-64-py3.10
mv ci/conda-lock-linux-64-py3.13 ci/conda-lock-Linux-64-py3.13
mv ci/conda-lock-linux-64-py3.14 ci/conda-lock-Linux-64-py3.14
mv ci/conda-lock-osx-64-py3.11 ci/conda-lock-macOS-64-py3.11
mv ci/conda-lock-osx-64-py3.12 ci/conda-lock-macOS-64-py3.12
mv ci/conda-lock-osx-64-py3.13 ci/conda-lock-macOS-64-py3.13
mv ci/conda-lock-osx-64-py3.14 ci/conda-lock-macOS-64-py3.14

conda_lock:
conda-lock lock --mamba --check-input-hash -f pyproject.toml --lockfile conda-lock.yml
Expand All @@ -53,9 +53,9 @@ conda_lock:


poetry_lock:
poetry lock --no-update
poetry lock
poetry export -f requirements.txt --without-hashes -o requirements/requirements.txt
poetry export -f requirements.txt --without-hashes -E grib -o requirements/requirements-extras.txt
poetry export -f requirements.txt --without-hashes --with dev -E grib -o requirements/requirements-dev.txt
poetry export -f requirements.txt --without-hashes -E all -o requirements/requirements-extras.txt
poetry export -f requirements.txt --without-hashes --with dev -E all -o requirements/requirements-dev.txt

lock: conda_lock poetry_lock
112 changes: 0 additions & 112 deletions ci/conda-lock-Linux-64-py3.10

This file was deleted.

Loading
Loading