Skip to content

Commit

Permalink
Merge branch 'main' of https://github.com/Deltares/hydromt_sfincs int…
Browse files Browse the repository at this point in the history
…o regular_subgrid
  • Loading branch information
roeldegoede committed Jan 3, 2024
2 parents b48f339 + a9ecc17 commit 4631307
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 23 deletions.
23 changes: 10 additions & 13 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,24 +60,21 @@ jobs:
ls -ltrh
ls -ltrh dist
- name: Setup environment
uses: conda-incubator/setup-miniconda@v2
- uses: actions/setup-python@v5
id: pip
with:
python-version: "3.9"
mamba-version: "*"
channels: conda-forge,defaults
channel-priority: true
environment-file: envs/hydromt-sfincs-min.yml
activate-environment: hydromt-sfincs-min
# caching, see https://github.com/actions/setup-python/blob/main/docs/advanced-usage.md#caching-packages
cache: 'pip'
cache-dependency-path: pyproject.toml
python-version: '3.11'

- name: Conda info
- name: Install wheel
run: |
conda info
conda list
pip install --upgrade pip
python -m pip install dist/hydromt_sfincs*.whl
- name: Verify the built dist/wheel is valid
- name: Verify the built wheel is valid
run: |
python -m pip install dist/hydromt_sfincs*.whl
python -c 'from hydromt_sfincs import __version__ as v; print(v)'
echo "$(hydromt --models)"
Expand Down
11 changes: 3 additions & 8 deletions docs/changelog.rst
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,10 @@ Distinction is made between new methods (Added), changes to existing methods (Ch
The format is based on `Keep a Changelog`_, and this project adheres to
`Semantic Versioning`_.

v1.0.3 (in development)
v1.0.3 (3 January 2024)
=======================

Added
-----
This release contains several changes and fixes. Most notably, models with a geographical CRS can now be build.
Also note the changes in the default values in the sfincs.inp file.

Changed
-------
Expand All @@ -25,10 +24,6 @@ Fixed
- fix a bug that caused some model files to be read twice (#161)
- bugfix in workflows.bathymetry that was encountered while burning in rivers (#166)

Deprecated
----------



v1.0.2 (9 November 2023)
========================
Expand Down
2 changes: 1 addition & 1 deletion hydromt_sfincs/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
from os.path import dirname, join, abspath


__version__ = "1.0.3.dev0"
__version__ = "1.0.3"

DATADIR = join(dirname(abspath(__file__)), "data")

Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ authors = [
dependencies = [
"affine",
"geopandas>=0.8",
"hydromt>=0.9.1",
"hydromt>=0.9.1, <0.10",
"numba",
"numpy",
"pandas",
Expand Down

0 comments on commit 4631307

Please sign in to comment.