From 80b79519a4d4616078124122d2ac6a80bee84351 Mon Sep 17 00:00:00 2001 From: Laura Murgatroyd <60604372+lauramurgatroyd@users.noreply.github.com> Date: Mon, 20 Nov 2023 09:21:49 +0000 Subject: [PATCH 1/4] Fix dependency versions --- Wrappers/Python/conda-recipe/environment.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Wrappers/Python/conda-recipe/environment.yml b/Wrappers/Python/conda-recipe/environment.yml index 0c68a0bb..1e4b1e4f 100644 --- a/Wrappers/Python/conda-recipe/environment.yml +++ b/Wrappers/Python/conda-recipe/environment.yml @@ -5,11 +5,11 @@ channels: dependencies: - python - numpy - - vtk >=9.0.3 + - vtk=9.0.3 - pyside2 - - eqt>=0.7.0 + - eqt=0.7.1 - importlib_metadata # [py<38] - h5py - - cil-data >=22.0.0 + - cil-data=22.0.0 - pillow - schema From 9652d4a5e6973357863fc5040ced291405ecb6bf Mon Sep 17 00:00:00 2001 From: Laura Murgatroyd <60604372+lauramurgatroyd@users.noreply.github.com> Date: Mon, 8 Jan 2024 15:10:59 +0000 Subject: [PATCH 2/4] force action to run --- Wrappers/Python/conda-recipe/environment.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Wrappers/Python/conda-recipe/environment.yml b/Wrappers/Python/conda-recipe/environment.yml index 1e4b1e4f..ed3ab8ea 100644 --- a/Wrappers/Python/conda-recipe/environment.yml +++ b/Wrappers/Python/conda-recipe/environment.yml @@ -2,7 +2,7 @@ name: cilviewer_dev channels: - ccpi - conda-forge -dependencies: +dependencies: - python - numpy - vtk=9.0.3 From 5a02a904a96398379278d9aa8e125c97c20561ef Mon Sep 17 00:00:00 2001 From: lauramurgatroyd Date: Mon, 15 Jan 2024 13:09:30 +0000 Subject: [PATCH 3/4] Update meta.yml --- Wrappers/Python/conda-recipe/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Wrappers/Python/conda-recipe/meta.yaml b/Wrappers/Python/conda-recipe/meta.yaml index dc736e18..cb5b2a67 100644 --- a/Wrappers/Python/conda-recipe/meta.yaml +++ b/Wrappers/Python/conda-recipe/meta.yaml @@ -35,12 +35,12 @@ requirements: - numpy - vtk {{ vtk }} - pyside2 - - eqt>=0.7.0 + - eqt=0.7.0 - importlib_metadata # [py<38] - h5py - schema - pyyaml - - cil-data >=22.0.0 + - cil-data =22.0.0 about: home: http://www.ccpi.ac.uk From ac664d6c7ad53692c0cca1b40ff2c4b949dbb997 Mon Sep 17 00:00:00 2001 From: Laura Murgatroyd <60604372+lauramurgatroyd@users.noreply.github.com> Date: Mon, 15 Jan 2024 17:00:07 +0000 Subject: [PATCH 4/4] Update Wrappers/Python/conda-recipe/meta.yaml --- Wrappers/Python/conda-recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Wrappers/Python/conda-recipe/meta.yaml b/Wrappers/Python/conda-recipe/meta.yaml index cb5b2a67..54a387de 100644 --- a/Wrappers/Python/conda-recipe/meta.yaml +++ b/Wrappers/Python/conda-recipe/meta.yaml @@ -35,7 +35,7 @@ requirements: - numpy - vtk {{ vtk }} - pyside2 - - eqt=0.7.0 + - eqt=0.7.1 - importlib_metadata # [py<38] - h5py - schema