From 34655efc33d305b445fd175a081ca298cb9f3fa5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20M=C3=BCller?= <mueller.seb@posteo.de>
Date: Thu, 27 Feb 2025 10:35:48 +0100
Subject: [PATCH 1/5] tests: make pint test for dimensionless safe
---
tests/data/test_cf_units.py | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/tests/data/test_cf_units.py b/tests/data/test_cf_units.py
index c6e5404f..8ad8833d 100644
--- a/tests/data/test_cf_units.py
+++ b/tests/data/test_cf_units.py
@@ -23,9 +23,11 @@ class TestCfUnits(unittest.TestCase):
self.assertEqual(u("degC"), "°C")
self.assertEqual(u("degree_Celsius"), "°C")
- self.assertEqual(u(""), "1")
- self.assertEqual(u("1"), "1")
- self.assertEqual(u("m/m"), "1")
+ # "dimensionless" representation inconsistent across different pint versions
+ # will be "1" for newer versions (>=0.24.1) to be in line with cf-conventions
+ self.assertTrue(u("") in ("1", "dimensionless", ""))
+ self.assertTrue(u("1") in ("1", "dimensionless", ""))
+ self.assertTrue(u("m/m") in ("1", "dimensionless", ""))
self.assertEqual(u("m/s"), "m s-1")
self.assertEqual(u("m s-1"), "m s-1")
--
GitLab
From 8199e06fa936fcda3a50dcb10981b522002d360b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20M=C3=BCller?= <mueller.seb@posteo.de>
Date: Thu, 27 Feb 2025 10:36:56 +0100
Subject: [PATCH 2/5] update changelog for v1.0
---
CHANGELOG.md | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index cf83c922..c2f3c035 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,9 +1,12 @@
# Release notes
-## [unpublished]
+## [v1.0.0]
### Breaking changes
+* submodule `modules` renamed to `components` for consistency (!289)
+* argument `modules` renamed to `components` in `Composition` for consistency (!289)
+* Components now implement `_next_time` instead of the property `next_time` for consistency (!283)
* All fields of `Composition` are now private (!273)
* `Input.source` is private, `Input.get_source()` becomes property `Input.source`, `Input.set_source` becomes a getter (!273)
* `Output.targets` is private, `Output.get_targets()` becomes property `Output.targets` (!273)
@@ -49,6 +52,7 @@
### Bug fixes
* cells for structured grids in 3D are now created correctly (no negative Volume in VTK/ESMF) (!286)
+* cf_units.py was broken for pint>=0.24 (!282)
### Documentation
@@ -257,7 +261,8 @@
* initial release of FINAM
-[unpublished]: https://git.ufz.de/FINAM/finam/-/compare/v0.5.1...main
+[unpublished]: https://git.ufz.de/FINAM/finam/-/compare/v1.0.0...main
+[v1.0.0]: https://git.ufz.de/FINAM/finam/-/compare/v0.5.1...v1.0.0
[v0.5.1]: https://git.ufz.de/FINAM/finam/-/compare/v0.5.0...v0.5.1
[v0.5.0]: https://git.ufz.de/FINAM/finam/-/compare/v0.4.0...v0.5.0
[v0.4.0]: https://git.ufz.de/FINAM/finam/-/compare/v0.4.0-rc.2...v0.4.0
--
GitLab
From 510c7fcdc9f0794ab9a355cdac1e7110b46722cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20M=C3=BCller?= <mueller.seb@posteo.de>
Date: Thu, 27 Feb 2025 11:11:47 +0100
Subject: [PATCH 3/5] update year to 2025
---
LICENSE.md | 2 +-
README.md | 2 +-
docs/source/index.md | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/LICENSE.md b/LICENSE.md
index b3cff201..74ef1434 100644
--- a/LICENSE.md
+++ b/LICENSE.md
@@ -4,7 +4,7 @@ FINAM is an open-source component-based model coupling framework for environment
## Copyright Notice
-Copyright © 2023, the FINAM developers from Helmholtz-Zentrum für Umweltforschung GmbH - UFZ. All rights reserved.
+Copyright © 2021-2025, the FINAM developers from Helmholtz-Zentrum für Umweltforschung GmbH - UFZ. All rights reserved.
***The code is a property of:***
diff --git a/README.md b/README.md
index c7c5c2d6..e8ba897c 100644
--- a/README.md
+++ b/README.md
@@ -19,4 +19,4 @@ This approach allows for coupling of models irrespective of their internal struc
## License
-LGPLv3, Copyright © 2021-2023, the FINAM developers from Helmholtz-Zentrum für Umweltforschung GmbH - UFZ. All rights reserved.
+LGPLv3, Copyright © 2021-2025, the FINAM developers from Helmholtz-Zentrum für Umweltforschung GmbH - UFZ. All rights reserved.
diff --git a/docs/source/index.md b/docs/source/index.md
index de556749..cb46b1e6 100644
--- a/docs/source/index.md
+++ b/docs/source/index.md
@@ -116,4 +116,4 @@ about/index
### License
-LGPLv3, Copyright © 2021-2023, the FINAM developers from Helmholtz-Zentrum für Umweltforschung GmbH - UFZ. All rights reserved.
+LGPLv3, Copyright © 2021-2025, the FINAM developers from Helmholtz-Zentrum für Umweltforschung GmbH - UFZ. All rights reserved.
--
GitLab
From c4352685d41a5f8a22676c4b46b068bb725cd05f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20M=C3=BCller?= <mueller.seb@posteo.de>
Date: Thu, 13 Mar 2025 12:34:39 +0100
Subject: [PATCH 4/5] update meta-data
---
pyproject.toml | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/pyproject.toml b/pyproject.toml
index 66e30b06..e741bad3 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -14,10 +14,11 @@ readme = "README.md"
license = "LGPL-3.0"
dynamic = ["version"]
classifiers = [
- "Development Status :: 4 - Beta",
+ "Development Status :: 5 - Production/Stable",
"Intended Audience :: Developers",
"Intended Audience :: End Users/Desktop",
"Intended Audience :: Science/Research",
+ "Intended Audience :: Education",
"License :: OSI Approved :: GNU Lesser General Public License v3 (LGPLv3)",
"Natural Language :: English",
"Operating System :: Unix",
@@ -29,6 +30,9 @@ classifiers = [
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
+ "Programming Language :: Python :: 3.11",
+ "Programming Language :: Python :: 3.12",
+ "Programming Language :: Python :: 3.13",
"Topic :: Scientific/Engineering",
"Topic :: Software Development",
"Topic :: Utilities",
@@ -93,7 +97,11 @@ packages = ["src/finam"]
exclude = "_version.py"
target-version = [
"py38",
- "py39"
+ "py39",
+ "py310",
+ "py311",
+ "py312",
+ "py313",
]
[tool.isort]
--
GitLab
From 813ebac553e93db194af51bfffd5e1284a21f809 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20M=C3=BCller?= <mueller.seb@posteo.de>
Date: Thu, 13 Mar 2025 12:59:32 +0100
Subject: [PATCH 5/5] our black version doesn't know py313
---
pyproject.toml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pyproject.toml b/pyproject.toml
index e741bad3..75a6d9c1 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -101,7 +101,7 @@ target-version = [
"py310",
"py311",
"py312",
- "py313",
+ # "py313",
]
[tool.isort]
--
GitLab