From bfdf9a92d99a5f0bb450391c3cc40d1e2fd58683 Mon Sep 17 00:00:00 2001
From: Alejandro Homs Puron <ahoms@esrf.fr>
Date: Wed, 11 Mar 2020 17:45:55 +0100
Subject: [PATCH 1/2] CMake: update test with PROJECT_NAME variable

---
 test/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index a059bb7..a259ac8 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -24,5 +24,5 @@ set(test_src test_slsdetector
              test_slsdetector_control
              test_thread_cpu_affinity)
 
-limatools_run_camera_tests("${test_src}" ${NAME})
+limatools_run_camera_tests("${test_src}" ${PROJECT_NAME})
 
-- 
GitLab


From b4922b1fbb0c219b04534c3a8a8e4f4bb4e6846d Mon Sep 17 00:00:00 2001
From: Alejandro Homs Puron <ahoms@esrf.fr>
Date: Wed, 1 Apr 2020 13:11:19 +0200
Subject: [PATCH 2/2] Conda: remove numpy explicit dependency from host
 requirements

---
 conda/camera/meta.yaml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/conda/camera/meta.yaml b/conda/camera/meta.yaml
index fcf13b2..2e2575c 100644
--- a/conda/camera/meta.yaml
+++ b/conda/camera/meta.yaml
@@ -18,7 +18,6 @@ build:
 requirements:
   host:
     - python {{ python }}
-    - numpy
     - sip 4.19.8              # For compatibility with pyqt 5.9.2
     - lima-core
     - libnuma
-- 
GitLab