Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dev #195

Merged
merged 26 commits into from
Aug 22, 2024
Merged

Dev #195

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
cb7ba18
ci: Replace `black --check` with `black --diff`
pmav99 Apr 23, 2024
f74b63d
tools: Add `get_zarr_encoding()` and `get_netcdf_encoding()`
pmav99 Apr 23, 2024
234d9f5
schism: Add `parse_station_in()`
pmav99 May 2, 2024
a889f3b
mesh: Add gradient as scale
brey Jun 26, 2024
96b5879
dem: Add tiles option
brey Jun 26, 2024
81e4d68
tutorial: expand some Notebooks
brey Jun 27, 2024
5ada7bc
tests: make sure the tests pass
brey Jul 10, 2024
868881c
utils: Add cfl.py
pmav99 Jul 16, 2024
a99197c
scripts: Remove empty lines from environment files
pmav99 Jul 16, 2024
d20c460
schism: Use absolute path in `model.output()`
pmav99 Jul 22, 2024
1468eee
feat: Use `shutil.which()` instead of bash's `which`
pmav99 Jul 22, 2024
7940b8e
docs: Update mkdocs settings
pmav99 Jul 22, 2024
563d19a
feat: Add `find_nearest_nodes()`
pmav99 Jul 22, 2024
dfe7fe8
fix: Let `get_schism_version()` handle development version of schism
pmav99 Jul 22, 2024
44113c3
feat: Add `serialize_stations()`
pmav99 Jul 22, 2024
7ee58c9
fix: Simplify serialized station.in
pmav99 Aug 2, 2024
9ec7034
tests: Mark failing jigsaw tests as xfail.
pmav99 Aug 2, 2024
b399a02
schism: Update schism to 5.12
pmav99 Aug 2, 2024
125801d
schism: Disable ramping
pmav99 Aug 2, 2024
bc1d273
debug: Check contents of `launchSchism.sh` on CI
pmav99 Aug 2, 2024
cbee7a5
deps: Update locks + Restore schism support for Mac OS with mpich.
pmav99 Aug 3, 2024
2cafc87
tests: fix-updates
brey Jul 24, 2024
9859d25
tests: make sure they pass
brey Aug 6, 2024
f0a5492
feat: Add `to_geodataframe()`
pmav99 Aug 22, 2024
5de13af
CI: Stop running actions on `dev` branch.
pmav99 Aug 22, 2024
045232a
test: xfail jigsaw + buffering
pmav99 Aug 22, 2024
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
13 changes: 4 additions & 9 deletions .github/workflows/conda_pip.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
---
name: "Conda + pip"


# Use login shell everywhere
# https://github.com/mamba-org/setup-micromamba/tree/fcc371cea11af9012e5e916ab2dab44b42acdaaa#about-login-shells

Expand All @@ -10,7 +9,6 @@ on:
branches:
- "main"
- "master"
- "dev"
paths:
- "**.py"
- ".github/workflows/*.yml"
Expand All @@ -26,7 +24,6 @@ on:
- "locks/*"

jobs:

run-linters:
name: "Run linters"
runs-on: "ubuntu-latest"
Expand All @@ -44,7 +41,7 @@ jobs:
run: "pip install 'black'"

- name: "Run linters"
run: "black --check ./"
run: "black --diff ./"

run-tests:
needs: "run-linters"
Expand All @@ -56,9 +53,9 @@ jobs:
matrix:
# os: [ "ubuntu-latest", "macos-latest" ]
# mpi: [ "mpich", "openmpi" ]
os: [ "ubuntu-latest"]
mpi: [ "openmpi" ]
python: [ "3.9", "3.10", "3.11", "3.12" ]
os: ["ubuntu-latest"]
mpi: ["openmpi"]
python: ["3.9", "3.10", "3.11", "3.12"]

env:
SCHISM_ENV: "SCHISM_ENV"
Expand All @@ -85,7 +82,6 @@ jobs:
echo export MAMBA_EXE=$(which micromamba) | tee -a ~/.bashrc
echo export MAMBA_ROOT_PREFIX=~/micromamba | tee -a ~/.bashrc
- run: which micromamba

- name: "Create ~/.condarc"
run: |
rm -rf ~/.condarc
Expand All @@ -99,7 +95,6 @@ jobs:
- conda-forge
EOF
- run: cat ~/.condarc

- name: "Cache ${{ env.SCHISM_ENV }}"
uses: actions/cache@v3
id: cache-SCHISM_ENV
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ Tutorial/bgmesh
Tutorial/gmsh
Tutorial/jigsaw
Tutorial/data
Tutorial/global

# the local jigsaw folder
pyPoseidon/tests/jigsaw/*
Expand Down
Loading
Loading