Skip to content

Commit

Permalink
Merge branch 'main' into bugfixes-maps
Browse files Browse the repository at this point in the history
  • Loading branch information
veenstrajelmer authored Oct 18, 2024
2 parents 9fe0896 + 429c569 commit 8294846
Show file tree
Hide file tree
Showing 5 changed files with 43 additions and 2 deletions.
14 changes: 13 additions & 1 deletion docs/changelog.rst
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,19 @@ All notable changes to this project will be documented in this page.
The format is based on `Keep a Changelog`_, and this project adheres to
`Semantic Versioning`_.

Unreleased
UNRELEASED
==========

Added
-----

Changed
-------

Fixed
-----

v0.3.0 (18 October 2024)
==========
This version includes many code updates to accomodate for newer versions of dependencies.
The only upper bound left is hydromt<1.
Expand Down
1 change: 1 addition & 0 deletions docs/dev_guide/intro.rst
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,4 @@ Furthermore it informs you on planned developments and new features.
Developer's guide <https://deltares.github.io/hydromt/latest/dev/contributing>
dev_install.rst
contributors.rst
release.rst
25 changes: 25 additions & 0 deletions docs/dev_guide/release.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
.. _dev_release:

Releasing
=========

Release steps:

* Change version in __init__.py
* update the changelog
* Check dependencies in pyproj.toml
* run local testbank
* local check with: ``flit build`` and ``twine check dist/*``
* create PR and merge back to main
* create a new release: https://github.com/Deltares/hydromt_delft3dfm/releases/new)
* click ``choose a tag`` and type v+versionnumber (e.g. ``v0.1.0``), click ``create new tag: v0.1.0 on publish``
* set the release title to the tagname (e.g. ``v0.1.0``)
* click `Generate release notes` and replace the `What's Changed` info by a tagged link to ``docs/whats-new.md``
* if all is set, click ``Publish release``
* a release is created and the github action publishes it [on PyPI](https://pypi.org/project/dfm-tools)

Post release:

* Update the version to 0.1.1 (bump patch)
* Initialise changelog unrelease/added/fixed/changed
* Push and merge to main
2 changes: 1 addition & 1 deletion hydromt_delft3dfm/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

from os.path import abspath, dirname, join

__version__ = "0.2.1.dev"
__version__ = "0.3.1"
DATADIR = join(dirname(abspath(__file__)), "data")

from .dflowfm import *
3 changes: 3 additions & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,9 @@ dev = [
"ruff", # linting
"pre-commit", # linting
"pip>=23.1.2", # needed for recursive dependencies
"flit>3.4", # build
"twine", # build
"wheel", # build
]
test = [
"pytest>=2.7.3",
Expand Down

0 comments on commit 8294846

Please sign in to comment.