From 6906e7c3814e24551725ad9aa7c3240f45723068 Mon Sep 17 00:00:00 2001
From: Dmitri Konstantinov <dmitri.konstantinov@cern.ch>
Date: Thu, 21 Apr 2022 16:15:58 +0200
Subject: [PATCH 1/2] SPI-2137 Add rq recipe and rq-1.10.1 to nightly build

---
 cmake/toolchain/heptools-dev-base.cmake |  1 +
 pyexternals/CMakeLists.txt              | 14 ++++++++++++++
 2 files changed, 15 insertions(+)

diff --git a/cmake/toolchain/heptools-dev-base.cmake b/cmake/toolchain/heptools-dev-base.cmake
index a3d8a7c38a..3b977b2181 100644
--- a/cmake/toolchain/heptools-dev-base.cmake
+++ b/cmake/toolchain/heptools-dev-base.cmake
@@ -575,6 +575,7 @@ LCG_external_package(rich              12.0.0
 LCG_external_package(rise              5.5.0                                    )
 # Removed after decision in LIM, 21/7/20 (GGa)
 # LCG_external_package(rpy2              3.0.4                                    )
+LCG_external_package(rq                1.10.1                                   )
 LCG_external_package(rsa               4.0                                      )
 LCG_external_package(ruamel_yaml       0.17.16					)
 LCG_external_package(s3transfer	       0.5.0					)
diff --git a/pyexternals/CMakeLists.txt b/pyexternals/CMakeLists.txt
index 4cb2cea3ad..87fedfa8a7 100644
--- a/pyexternals/CMakeLists.txt
+++ b/pyexternals/CMakeLists.txt
@@ -3872,6 +3872,20 @@ LCGPackage_Add(
   DEPENDS Python setuptools
 )
 
+#--rq--redis_queue-------------------------------------------------------------
+LCGPackage_Add(
+  rq
+  URL ${GenURL}/rq-${click_native_version}.tar.gz
+  CONFIGURE_COMMAND <VOID>
+  BUILD_COMMAND <VOID>
+  INSTALL_COMMAND ${MakeSitePackagesDir}
+          COMMAND ${PYTHON} setup.py install ${PySetupOptions}
+          COMMAND ${CMAKE_SOURCE_DIR}/pyexternals/Python_postinstall.sh <INSTALL_DIR>
+  BUILD_IN_SOURCE 1
+  DEPENDS Python setuptools redis click
+)
+
+
 #---HeapDict--------------------------------------------------------------------
 LCGPackage_Add(
   HeapDict
-- 
GitLab


From f275188b7da79a426d333573f4ef8235d059b606 Mon Sep 17 00:00:00 2001
From: Dmitri Konstantinov <dmitri.konstantinov@cern.ch>
Date: Thu, 21 Apr 2022 16:25:31 +0200
Subject: [PATCH 2/2] fix type in rq recipe

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

diff --git a/pyexternals/CMakeLists.txt b/pyexternals/CMakeLists.txt
index 87fedfa8a7..6a4509aedf 100644
--- a/pyexternals/CMakeLists.txt
+++ b/pyexternals/CMakeLists.txt
@@ -3875,7 +3875,7 @@ LCGPackage_Add(
 #--rq--redis_queue-------------------------------------------------------------
 LCGPackage_Add(
   rq
-  URL ${GenURL}/rq-${click_native_version}.tar.gz
+  URL ${GenURL}/rq-${rq_native_version}.tar.gz
   CONFIGURE_COMMAND <VOID>
   BUILD_COMMAND <VOID>
   INSTALL_COMMAND ${MakeSitePackagesDir}
-- 
GitLab