From 5b1eb69aa7efca39bd1ceffbe01ca879d7363339 Mon Sep 17 00:00:00 2001 From: mcflugen Date: Mon, 5 Feb 2024 10:47:59 -0400 Subject: [PATCH 1/7] bump version to 0.5.8 --- src/bmi_tester/_version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bmi_tester/_version.py b/src/bmi_tester/_version.py index ab4bb7e..fc0a843 100644 --- a/src/bmi_tester/_version.py +++ b/src/bmi_tester/_version.py @@ -1 +1 @@ -__version__ = "0.5.8.dev0" +__version__ = "0.5.8" From fdf62b3a1282b5540edb8701ee8e29d006974e48 Mon Sep 17 00:00:00 2001 From: mcflugen Date: Sun, 3 Mar 2024 13:02:01 -0700 Subject: [PATCH 2/7] require newer versions of gimli, standard-names --- pyproject.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index a5229a2..30feaa6 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -32,11 +32,11 @@ classifiers = [ ] dependencies = [ "importlib-resources; python_version < '3.12'", - "model-metadata>=0.8", + "model-metadata>=0.8.1", "numpy", "pytest", "pytest-dependency", - "standard-names", + "standard-names>=0.2.8", ] dynamic = [ "readme", @@ -48,7 +48,7 @@ text = "MIT" [project.optional-dependencies] units = [ - "gimli.units" + "gimli.units>=0.3.2" ] dev = [ "black", From 4448d91278b9fdb5cdc847e722b15171bec32975 Mon Sep 17 00:00:00 2001 From: mcflugen Date: Sun, 3 Mar 2024 13:02:15 -0700 Subject: [PATCH 3/7] pip-install requirements --- noxfile.py | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/noxfile.py b/noxfile.py index 3d5a93f..4b01190 100644 --- a/noxfile.py +++ b/noxfile.py @@ -11,11 +11,10 @@ PYTHON_VERSION = "3.12" -@nox.session(python=PYTHON_VERSION, venv_backend="conda") +@nox.session def test(session: nox.Session) -> None: """Run the tests.""" - session.install(".[testing]") - session.conda_install("gimli.units", channel=["nodefaults", "conda-forge"]) + session.install(".[units,testing]") args = ["--cov", PROJECT, "-vvv"] + session.posargs @@ -30,10 +29,8 @@ def test(session: nox.Session) -> None: @nox.session(name="test-cli", python=PYTHON_VERSION, venv_backend="conda") def test_cli(session: nox.Session) -> None: """Run the tests.""" - session.install(".") - session.conda_install( - "gimli.units", "pymt_topography", channel=["nodefaults", "conda-forge"] - ) + session.install(".[units]") + session.conda_install("pymt_topography", channel=["nodefaults", "conda-forge"]) session.run("bmi-test", "pymt_topography:Topography") From 813328c3b634094a24fbc28e8173b5935f65743e Mon Sep 17 00:00:00 2001 From: mcflugen Date: Sun, 3 Mar 2024 13:03:34 -0700 Subject: [PATCH 4/7] modifications for new gimli, standard-names --- src/bmi_tester/_tests/stage_1/info_test.py | 7 ++++--- src/bmi_tester/api.py | 17 ++++++++++------- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/src/bmi_tester/_tests/stage_1/info_test.py b/src/bmi_tester/_tests/stage_1/info_test.py index dd1237c..5611e9f 100644 --- a/src/bmi_tester/_tests/stage_1/info_test.py +++ b/src/bmi_tester/_tests/stage_1/info_test.py @@ -1,7 +1,8 @@ import warnings import pytest -import standard_names +from standard_names.standardname import StandardName +from standard_names.standardname import is_valid_name def test_get_component_name(initialized_bmi): @@ -15,8 +16,8 @@ def test_get_component_name(initialized_bmi): def test_var_names(var_name): """Test var names are valid.""" assert isinstance(var_name, str) - if standard_names.is_valid_name(var_name): - standard_names.StandardName(var_name) + if is_valid_name(var_name): + StandardName(var_name) else: warnings.warn(f"not a valid standard name: {var_name}", stacklevel=2) diff --git a/src/bmi_tester/api.py b/src/bmi_tester/api.py index c064a13..40fa68a 100644 --- a/src/bmi_tester/api.py +++ b/src/bmi_tester/api.py @@ -4,13 +4,16 @@ from collections.abc import Sequence try: - import gimli + from gimli._udunits2 import UdunitsError + from gimli.errors import IncompatibleUnitsError + from gimli.errors import UnitNameError + from gimli.units import units except ImportError: WITH_GIMLI_UNITS = False SECONDS = None else: WITH_GIMLI_UNITS = True - SECONDS = gimli.units.Unit("s") + SECONDS = units.Unit("s") import pytest @@ -57,8 +60,8 @@ def check_bmi( def check_unit_is_valid(unit): try: - gimli.units.Unit(unit) - except gimli.UnitNameError: + units.Unit(unit) + except (UnitNameError, UdunitsError): return False else: return True @@ -66,12 +69,12 @@ def check_unit_is_valid(unit): def check_unit_is_time(unit): try: - gimli.units.Unit(unit).to(SECONDS) - except gimli.IncompatibleUnitsError: + units.Unit(unit).to(SECONDS) + except (IncompatibleUnitsError, UdunitsError): return False else: return True def check_unit_is_dimensionless(unit): - return gimli.units.Unit(unit).is_dimensionless + return units.Unit(unit).is_dimensionless From 2a9570f74ea948e17dd2ab2c05b8d2299bb5949e Mon Sep 17 00:00:00 2001 From: mcflugen Date: Sun, 3 Mar 2024 13:09:13 -0700 Subject: [PATCH 5/7] no need to force python version for tests --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 6a779f6..0b3a9e9 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -34,7 +34,7 @@ jobs: - name: Test run: | pip install nox - nox -s test --force-pythons="${{ matrix.python-version }}" + nox -s test - name: Test CLI run: | From 6a312666f926861ca39a8a3cf1b37908f7c39772 Mon Sep 17 00:00:00 2001 From: mcflugen Date: Sun, 3 Mar 2024 13:22:47 -0700 Subject: [PATCH 6/7] bump version to 0.5.9 --- src/bmi_tester/_version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bmi_tester/_version.py b/src/bmi_tester/_version.py index fc0a843..40e294f 100644 --- a/src/bmi_tester/_version.py +++ b/src/bmi_tester/_version.py @@ -1 +1 @@ -__version__ = "0.5.8" +__version__ = "0.5.9" From f22b1950ff873f34c93617a886985b1d7f1c386d Mon Sep 17 00:00:00 2001 From: mcflugen Date: Sun, 3 Mar 2024 13:36:55 -0700 Subject: [PATCH 7/7] back to 0.5.10.dev0 --- src/bmi_tester/_version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bmi_tester/_version.py b/src/bmi_tester/_version.py index 40e294f..adf159a 100644 --- a/src/bmi_tester/_version.py +++ b/src/bmi_tester/_version.py @@ -1 +1 @@ -__version__ = "0.5.9" +__version__ = "0.5.10.dev0"