From fa28b8205698a7c6230c73cd7e6ce2d76b26e7c7 Mon Sep 17 00:00:00 2001 From: shane knapp Date: Wed, 11 Sep 2024 13:27:59 -0700 Subject: [PATCH 1/3] maybe make builds workie again --- environment.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/environment.yml b/environment.yml index bfb1fb8..5667d19 100644 --- a/environment.yml +++ b/environment.yml @@ -47,7 +47,7 @@ dependencies: - Pillow=10.3.0 # For ELENG 120 https://github.com/berkeley-dsep-infra/datahub/issues/3566 -- scipy=1.11.3 +- scipy=1.14.1 - gcc=10.4.0 # https://github.com/berkeley-dsep-infra/datahub/issues/4460 @@ -61,7 +61,7 @@ dependencies: - pip: # From https://github.com/berkeley-dsep-infra/datahub/issues/1639 - opencv-python==4.9.0.80 - - PyQt5==5.15.4 + - PyQt5==5.15.11 # From https://github.com/berkeley-dsep-infra/datahub/issues/1363#issuecomment-598916469 - lcapy==0.96 # make webpdf export work DH-326 From c756987709c3d2135f46ae96d7fbb8d9f31b1e80 Mon Sep 17 00:00:00 2001 From: shane knapp Date: Wed, 11 Sep 2024 13:38:58 -0700 Subject: [PATCH 2/3] bump pillow --- environment.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/environment.yml b/environment.yml index 5667d19..97d1aa9 100644 --- a/environment.yml +++ b/environment.yml @@ -44,7 +44,7 @@ dependencies: - git=2.33.0 # From https://github.com/berkeley-dsep-infra/datahub/issues/1505 -- Pillow=10.3.0 +- Pillow=10.4.0 # For ELENG 120 https://github.com/berkeley-dsep-infra/datahub/issues/3566 - scipy=1.14.1 From 9488e4f41e2abe7560193dfe2e727c1080a274d3 Mon Sep 17 00:00:00 2001 From: shane knapp Date: Wed, 11 Sep 2024 13:54:24 -0700 Subject: [PATCH 3/3] debumping pillow --- environment.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/environment.yml b/environment.yml index 97d1aa9..316ff3a 100644 --- a/environment.yml +++ b/environment.yml @@ -44,7 +44,7 @@ dependencies: - git=2.33.0 # From https://github.com/berkeley-dsep-infra/datahub/issues/1505 -- Pillow=10.4.0 +- Pillow=9.5.0 # sknapp had to downgrade 2024/09/11 to unstick builds =10.4.0 # For ELENG 120 https://github.com/berkeley-dsep-infra/datahub/issues/3566 - scipy=1.14.1