From 8cdbfa4eb094756d81cee6ee3fc73fec66c8aaee Mon Sep 17 00:00:00 2001 From: krwood Date: Wed, 1 May 2024 10:03:29 -0700 Subject: [PATCH 1/2] pick up older version of pyyaml-include as v2.0 has breaking changes --- test/env-nompi.yaml | 1 + test/env.yaml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/test/env-nompi.yaml b/test/env-nompi.yaml index b1e77383..41b59e0d 100644 --- a/test/env-nompi.yaml +++ b/test/env-nompi.yaml @@ -12,5 +12,6 @@ dependencies: - scikit-learn - pip - pip: + - pyyaml-include=1.3.2 - adc64format>=0.0.2 - pylandau diff --git a/test/env.yaml b/test/env.yaml index 9422e3aa..a3010407 100644 --- a/test/env.yaml +++ b/test/env.yaml @@ -17,7 +17,7 @@ dependencies: - pytest-mpi - pip - pip: - - pyyaml-include + - pyyaml-include=1.3.2 - h5py --no-binary=h5py - adc64format>=0.0.2 - pylandau From e4f8b34a5ac38de033b70648dcab66ea23fe2841 Mon Sep 17 00:00:00 2001 From: krwood Date: Wed, 1 May 2024 10:12:54 -0700 Subject: [PATCH 2/2] fixes syntax error --- test/env-nompi.yaml | 2 +- test/env.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/env-nompi.yaml b/test/env-nompi.yaml index 41b59e0d..0bd8c21d 100644 --- a/test/env-nompi.yaml +++ b/test/env-nompi.yaml @@ -12,6 +12,6 @@ dependencies: - scikit-learn - pip - pip: - - pyyaml-include=1.3.2 + - pyyaml-include==1.3.2 - adc64format>=0.0.2 - pylandau diff --git a/test/env.yaml b/test/env.yaml index a3010407..cfe2246e 100644 --- a/test/env.yaml +++ b/test/env.yaml @@ -17,7 +17,7 @@ dependencies: - pytest-mpi - pip - pip: - - pyyaml-include=1.3.2 + - pyyaml-include==1.3.2 - h5py --no-binary=h5py - adc64format>=0.0.2 - pylandau