diff --git a/CHANGELOG.md b/CHANGELOG.md index cf83c922635ebbd8dee34ba7b6e83ebfe6fbce1a..c2f3c0354da89592845c34d2f9f31f2f91072fce 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 diff --git a/LICENSE.md b/LICENSE.md index b3cff2011e9a9a8f55a139ca765781f865737b1b..74ef1434240ab816b4700e20f419b2510bc19ed3 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 c7c5c2d6eb95968a5ff64436fe9ceb8070a3cef7..e8ba897c2ebdfbbe0d3a0c2c6502af68dd974e26 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 de556749a9fccbf8c0a6808dbcb102fb5477d7ee..cb46b1e6b4739f694afdf809ace9a95ab173f10f 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. diff --git a/pyproject.toml b/pyproject.toml index 66e30b06337a471f3f7019bceee8f3cf11caeda0..75a6d9c1f53344967b2a8f4ca4b2c402c6aac635 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] diff --git a/tests/data/test_cf_units.py b/tests/data/test_cf_units.py index c6e5404f4c62edfe17e19496bc73bfb9cf35d660..8ad8833da24b7c45894483b4ad288eecc29bea5a 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")