From 8ad68158d350546cf99fca1f69b3767ee1234da3 Mon Sep 17 00:00:00 2001 From: Laurent Claustre Date: Thu, 12 Aug 2021 14:38:54 +0200 Subject: [PATCH 1/2] * increase proceslib version deps to 1.8 * sync on submodule processlib --- conda/debug/meta.yaml | 2 +- conda/release/meta.yaml | 2 +- third-party/Processlib | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/conda/debug/meta.yaml b/conda/debug/meta.yaml index 52a3dcdb..020b38c7 100644 --- a/conda/debug/meta.yaml +++ b/conda/debug/meta.yaml @@ -21,7 +21,7 @@ requirements: host: - python {{ python }} - sip 4.19.8 #For the SIP module - - processlib 1.7* + - processlib 1.8* - libconfig 1.7* # I/O formats - zlib diff --git a/conda/release/meta.yaml b/conda/release/meta.yaml index 6ff42b97..77b17fd1 100644 --- a/conda/release/meta.yaml +++ b/conda/release/meta.yaml @@ -19,7 +19,7 @@ requirements: host: - python {{ python }} - sip 4.19.8 #For the SIP module - - processlib 1.7* + - processlib 1.8* - libconfig 1.7* # I/O formats - zlib diff --git a/third-party/Processlib b/third-party/Processlib index db674127..93efd755 160000 --- a/third-party/Processlib +++ b/third-party/Processlib @@ -1 +1 @@ -Subproject commit db6741275cab63603d9c0f6008a44055511a5733 +Subproject commit 93efd755f3ec4f8c4726101aa348495bdace2ec8 From 1b6bb70814d2779eec42c62cd46a637f50be61c3 Mon Sep 17 00:00:00 2001 From: Laurent Claustre Date: Thu, 12 Aug 2021 16:04:00 +0200 Subject: [PATCH 2/2] sync with pytango server submodule for roi_overflow new feature --- applications/tango/python | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/applications/tango/python b/applications/tango/python index 00f2b471..b4317713 160000 --- a/applications/tango/python +++ b/applications/tango/python @@ -1 +1 @@ -Subproject commit 00f2b47187546c371a76dc48d7b13de9fab48a1a +Subproject commit b431771321a61796afeae00382c577c94f1e36b2