From 4c9c86f15e8956947d92b885236b9aeb7d9f529f Mon Sep 17 00:00:00 2001 From: Valeriu Predoi Date: Fri, 8 Jul 2022 14:59:18 +0100 Subject: [PATCH 1/5] pin cf-units --- environment.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/environment.yml b/environment.yml index 15585405dc..4eabdd7b03 100644 --- a/environment.yml +++ b/environment.yml @@ -5,7 +5,7 @@ channels: dependencies: - cartopy - - cf-units>=3.0.0 + - cf-units>=3.0.0,<3.1.0 # github.com/ESMValGroup/ESMValCore/issues/1655 - cftime - compilers # 1.8.18/py39, they seem weary to build manylinux wheels From b04488ced96eabfc42a7facfc98922c120b3cbab Mon Sep 17 00:00:00 2001 From: Valeriu Predoi Date: Fri, 8 Jul 2022 14:59:24 +0100 Subject: [PATCH 2/5] pin cf-units --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 4ee7e89dfd..ddb49306cf 100755 --- a/setup.py +++ b/setup.py @@ -29,7 +29,7 @@ 'install': [ 'cartopy', # see https://github.com/SciTools/cf-units/issues/218 - 'cf-units>=3.0.0,!=3.0.1.post0', + 'cf-units>=3.0.0,<3.1.0', # ESMValCore/issues/1655 'dask[array]', 'esgf-pyclient>=0.3.1', 'esmpy!=8.1.0', # see github.com/ESMValGroup/ESMValCore/issues/1208 From 3c3f35f950225e527f8715e4d0ba156210624658 Mon Sep 17 00:00:00 2001 From: Valeriu Predoi Date: Fri, 8 Jul 2022 15:07:48 +0100 Subject: [PATCH 3/5] trigger ga tests --- .github/workflows/run-tests.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index 2d75ca2d7c..278b8626ac 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -21,6 +21,7 @@ on: push: branches: - main + - pin_cf-units # run the test only if the PR is to main # turn it on if required #pull_request: From 7f6447daf605ef7dc55f212d1b120d0c17b6d3c0 Mon Sep 17 00:00:00 2001 From: Valeriu Predoi Date: Fri, 8 Jul 2022 15:31:36 +0100 Subject: [PATCH 4/5] really dont use the post0 release for cf-units --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index ddb49306cf..9ab0e467f6 100755 --- a/setup.py +++ b/setup.py @@ -29,7 +29,7 @@ 'install': [ 'cartopy', # see https://github.com/SciTools/cf-units/issues/218 - 'cf-units>=3.0.0,<3.1.0', # ESMValCore/issues/1655 + 'cf-units>=3.0.0,<3.1.0,!=3.0.1.post0', # ESMValCore/issues/1655 'dask[array]', 'esgf-pyclient>=0.3.1', 'esmpy!=8.1.0', # see github.com/ESMValGroup/ESMValCore/issues/1208 From 184049e36dff2b3c0a398cfbe9495f552a62a1f4 Mon Sep 17 00:00:00 2001 From: Valeriu Predoi Date: Fri, 8 Jul 2022 17:02:46 +0100 Subject: [PATCH 5/5] remove ga test run on curr branch --- .github/workflows/run-tests.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index 278b8626ac..2d75ca2d7c 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -21,7 +21,6 @@ on: push: branches: - main - - pin_cf-units # run the test only if the PR is to main # turn it on if required #pull_request: