From 82a12aa352fa4279fee454331e7fdb72a4006253 Mon Sep 17 00:00:00 2001 From: Samuel Debionne <samuel.debionne@esrf.fr> Date: Mon, 10 Feb 2020 13:18:12 +0100 Subject: [PATCH 1/2] Remove numpy from the host dependencies --- conda/debug/meta.yaml | 2 -- conda/release/meta.yaml | 2 -- 2 files changed, 4 deletions(-) diff --git a/conda/debug/meta.yaml b/conda/debug/meta.yaml index fa45357f3..ec8b3d754 100644 --- a/conda/debug/meta.yaml +++ b/conda/debug/meta.yaml @@ -20,7 +20,6 @@ build: requirements: host: - python {{ python }} - - numpy - sip 4.19.8 #For the SIP module - processlib - libconfig 1.7* @@ -37,7 +36,6 @@ requirements: - {{ compiler('cxx') }} run: - python - - numpy - sip >=4.19.4, <=4.19.8 # For compatibility with pyqt 5.9.2 - {{ pin_compatible('processlib', max_pin='x.x') }} - libconfig 1.7* diff --git a/conda/release/meta.yaml b/conda/release/meta.yaml index 63d1be5ac..910a660b1 100644 --- a/conda/release/meta.yaml +++ b/conda/release/meta.yaml @@ -18,7 +18,6 @@ build: requirements: host: - python {{ python }} - - numpy - sip 4.19.8 #For the SIP module - processlib - libconfig 1.7* @@ -35,7 +34,6 @@ requirements: - {{ compiler('cxx') }} run: - python - - numpy - sip >=4.19.4, <=4.19.8 # For compatibility with pyqt 5.9.2 - {{ pin_compatible('processlib', max_pin='x.x') }} - libconfig 1.7* -- GitLab From e46b680e9ef9cb3e2f017e50ecb942fd9edafb8b Mon Sep 17 00:00:00 2001 From: Alejandro Homs Puron <ahoms@esrf.fr> Date: Mon, 17 Feb 2020 14:35:34 +0100 Subject: [PATCH 2/2] Update Processlib with numpy-related fixes --- third-party/Processlib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/third-party/Processlib b/third-party/Processlib index 26ad5b9af..0aa03fc7a 160000 --- a/third-party/Processlib +++ b/third-party/Processlib @@ -1 +1 @@ -Subproject commit 26ad5b9af0ee533ce6b0797b82cd2abf79ac65a8 +Subproject commit 0aa03fc7ade320ae21d4fa270e13ce85a69a7326 -- GitLab