Merge branch 'main' into feature/621_extforce_converter

Deltares · Feb 4, 2025 · e662a5c · e662a5c
2 parents a727619 + 68ca8e9
commit e662a5c
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 21 deletions.
diff --git a/docs/changelog.md b/docs/changelog.md
@@ -1,3 +1,14 @@
+## 0.8.1 (2025-02-04)
+
+### Feat
+
+- Support Fortran scientific notation in .tim files (e.g., 1d0) (#720)
+- Corrected comment for layerType (#697)
+
+### Fix
+
+- failing docs (#728)
+
 ## 0.8.0 (2024-07-09)
 
 ### Feat

diff --git a/docs/guides/contributing.md b/docs/guides/contributing.md
@@ -62,38 +62,27 @@ To prepare for releasing, please make sure you have a clean checkout of the late
  * Go to the root level your hydrolib-core checkout location
  * Open your command line in this location
  * Perform the following commands:
-	 * If commitizen is not installed yet:
+	 * Ensure that you are using the poetry environment (this contains commitizen), optionally run this command in a fresh environment:
 	 ```
-	 pip install commitizen
+	 poetry install
 	 ```
-	 * Prepare the Changelog before bumping the release version:
+	 * Update the Changelog before bumping the release version (use the version tag instead of the raw version number (so without "v" in our case)):
 	 ```
 	 cz changelog --unreleased-version="0.3.1" --incremental
 	 ```
-	 In the above command, use the version tag instead of the raw version number (so without "v" in our case).
-	 If you don't know the version tag yet, you can do a dry-run of the next step, for example via:
-	 ```
-	 cz bump --dry-run --increment PATCH
-	 ```
-	 * In the updated `docs/changelog.md`, manually add links to GitHub PR numbers (or issue numbers) at the end of each line, if appropriate.
-         It is recommended to use the macros `{{gh_pr(123)}}`, resp. `{{gh_issue(345)}}` to get automatic hyperlinks (where 123 and 345 are GitHub's PR and issue numbers, respectively).
 	 * Use MAJOR, MINOR or PATCH to increment the version
 	 ```
 	 cz bump --increment {MAJOR,MINOR,PATCH}
 	 ```
-	 * Or let commitizen detect the increment automatically
-	 ```
-	 cz bump
-	 ```
 	 * Push the tags and changes to git
 	 ```
 	 git push --tags
 	 git push
 	 ```
-	 * Build the wheels and publish the package to PyPi
+	 * Build the wheels and publish the package to PyPi (get an API token in your PyPI account)
 	 ```
 	 poetry build
-	 poetry publish
+	 poetry publish --username __token__ --password [PYPI_API_TOKEN]
 	 ```
 	 You will need a PyPI account and permissions for this publish step. Ask a maintainer for help if you need this.
 * Go to the hydrolib-core GitHub page.

diff --git a/hydrolib/core/__init__.py b/hydrolib/core/__init__.py
@@ -1 +1 @@
-__version__ = "0.8.0"
+__version__ = "0.8.1"
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "hydrolib-core"
-version = "0.8.0"
+version = "0.8.1"
 description = "Python wrappers around D-HYDRO Suite."
 authors = ["Deltares"]
 license = "MIT"
@@ -83,7 +83,7 @@ pre-commit-commit-msg-hooks = "^0.1.0"
 
 [tool.commitizen]
 name = "cz_conventional_commits"
-version = "0.8.0"
+version = "0.8.1"
 tag_format = "$version"
 version_files = [
   "hydrolib/core/__init__.py",

diff --git a/tests/data/reference/dimr/test_serialize.xml b/tests/data/reference/dimr/test_serialize.xml
@@ -2,7 +2,7 @@
 <dimrConfig xmlns="http://schemas.deltares.nl/dimr" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://schemas.deltares.nl/dimr http://content.oss.deltares.nl/schemas/dimr-1.3.xsd">
   <documentation>
     <fileVersion>1.3</fileVersion>
-    <createdBy>hydrolib-core 0.8.0</createdBy>
+    <createdBy>hydrolib-core 0.8.1</createdBy>
     <creationDate>2020-03-17T10:02:49.4520672Z</creationDate>
   </documentation>
   <control>

diff --git a/tests/data/reference/model/test_dimr_model_save.xml b/tests/data/reference/model/test_dimr_model_save.xml
@@ -2,7 +2,7 @@
 <dimrConfig xmlns="http://schemas.deltares.nl/dimr" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://schemas.deltares.nl/dimr http://content.oss.deltares.nl/schemas/dimr-1.3.xsd">
   <documentation>
     <fileVersion>1.3</fileVersion>
-    <createdBy>hydrolib-core 0.8.0</createdBy>
+    <createdBy>hydrolib-core 0.8.1</createdBy>
     <creationDate>2021-07-29T12:45:00</creationDate>
   </documentation>
   <control>