karabo.cpp 3.0.1__tar.gz → 3.0.3__tar.gz

{karabo_cpp-3.0.1 → karabo_cpp-3.0.3}/CMakeLists.txt

@@ -37,9 +37,7 @@ install(DIRECTORY extern/build/include/
         PATTERN "boost/fusion"        EXCLUDE
         PATTERN "boost/geometry"      EXCLUDE
         PATTERN "boost/spirit"        EXCLUDE
-        PATTERN "boost/mpl"           EXCLUDE
         PATTERN "boost/preprocessor"  EXCLUDE
-        PATTERN "boost/math"          EXCLUDE
         PATTERN "boost/wave"          EXCLUDE
         PATTERN "boost/beast"         EXCLUDE
         PATTERN "boost/qvm"           EXCLUDE

{karabo_cpp-3.0.1 → karabo_cpp-3.0.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: karabo.cpp
-Version: 3.0.1
+Version: 3.0.3
 Summary: Karabo's C++ API and Python bindings thereof
 Keywords: Karabo,SCADA,async,control system
 Author-Email: European XFEL GmbH <opensource@xfel.eu>
@@ -13,7 +13,7 @@ Project-URL: Homepage, https://github.com/European-XFEL/Karabo
 Project-URL: Bug Reports, https://github.com/European-XFEL/Karabo/issues
 Project-URL: Source, https://github.com/European-XFEL/Karabo
 Requires-Python: ==3.12.*
-Requires-Dist: karabo-native==3.0.1
+Requires-Dist: karabo-native==3.0.3
 Description-Content-Type: text/markdown
 
 # Karabo SCADA Framework - C++ API and Service Devices

{karabo_cpp-3.0.1 → karabo_cpp-3.0.3}/extern/build.sh

@@ -64,6 +64,19 @@ checkReturnCode() {
     fi
 }
 
+add_conan_mirrors() {
+    # Setup mirrors for conan to look for
+    for mirror in "${!CONAN_MIRRORS[@]}"; do
+        mirror_url="${CONAN_MIRRORS[$mirror]}"
+        if conan remote list | grep -q "$mirror_url"; then
+            echo "Remote $mirror is already added."
+        else
+            echo "Adding remote $mirror with URL $mirror_url"
+            safeRunCommandQuiet conan remote add "$mirror" "$mirror_url"
+        fi
+    done
+}
+
 safeRunCommand() {
     typeset cmnd="$*"
     typeset ret_code
@@ -99,6 +112,7 @@ install_python() {
     # create default build profile
     safeRunCommandQuiet "conan profile detect --force"
 
+    add_conan_mirrors
     # configure prefix paths
     local folder_opts="--deployer=karabo_deployer --deployer-folder=$INSTALL_PREFIX --output-folder=$INSTALL_PREFIX/conan_toolchain"
     # build python if not found in conan cache
@@ -164,6 +178,7 @@ install_from_deps() {
     # create default build profile
     safeRunCommandQuiet "$INSTALL_PREFIX/bin/conan profile detect --force"
 
+        add_conan_mirrors
         # export local conan recipes (for packages where no public recipe exists
         # we keep custom conan recipes in extern/resources/<pkg_name>)
         safeRunCommandQuiet "$INSTALL_PREFIX/bin/conan export ./resources/daemontools/conanfile.py --name daemontools-encore --version $DAEMONTOOLS_VERSION --user karabo --channel $CONAN_RECIPE_CHANNEL"

{karabo_cpp-3.0.1 → karabo_cpp-3.0.3}/pyproject.toml

@@ -3,7 +3,7 @@ requires = ["scikit-build-core"]
 build-backend = "scikit_build_core.build"
 
 [project]
-version = "3.0.1"
+version = "3.0.3"
 name = "karabo.cpp"
 description = "Karabo's C++ API and Python bindings thereof"
 readme = "README.md"
@@ -38,7 +38,7 @@ classifiers = [
 # For an analysis of this field vs pip's requirements files see:
 # https://packaging.python.org/discussions/install-requires-vs-requirements/
 dependencies = [
-  "karabo-native==3.0.1",
+  "karabo-native==3.0.3",
   ]
 
 
@@ -130,5 +130,5 @@ before-build = "pip3 install conan==2.19.0 && pip3 install numpy==2.0.1 && pytho
 
 test-requires = ["pytest"]
 # these are minimally required for a C++ server to start
-before-test = "mkdir /karabo && mkdir /karabo/var && mkdir /karabo/var/data && mkdir /karabo/plugins && pip install karabo.native==3.0.1 --index-url 'https://gitlab-ci-token:glcbt-64_XFkzG_tDMnFxgnGkpFU_@git.xfel.eu/api/v4/projects/5003/packages/pypi/simple' --extra-index-url https://pypi.org"
+before-test = "mkdir /karabo && mkdir /karabo/var && mkdir /karabo/var/data && mkdir /karabo/plugins && pip install karabo.native==3.0.3 --index-url 'https://gitlab-ci-token:glcbt-64_ywxqxzTszQXmxeVm8idj@git.xfel.eu/api/v4/projects/5003/packages/pypi/simple' --extra-index-url https://pypi.org"
 test-command = "KARABO=/karabo KARABO_BROKER=amqp://xfel:karabo@exfl-broker-1:5672 pytest {project}/wheel_tests"

{karabo_cpp-3.0.1 → karabo_cpp-3.0.3}/src/karabind/PyXmsSignalSlotable.cc

@@ -208,8 +208,6 @@ namespace karabind {
             explicit RequestorWrap(karabo::xms::SignalSlotable* signalSlotable)
                 : karabo::xms::SignalSlotable::Requestor(signalSlotable) {}
 
-            RequestorWrap timeoutPy(const int& milliseconds);
-
             template <typename... Args>
             RequestorWrap& requestPy(const std::string& slotInstanceId, const std::string& slotFunction,
                                      const Args&... args) {
@@ -550,6 +548,7 @@ namespace karabind {
             if (s) {
                 auto hash = std::make_shared<karabo::data::Hash>();
                 packPy(*hash, args...);
+                py::gil_scoped_release release;
                 s->emit<Args...>(hash);
             }
         }
@@ -558,6 +557,7 @@ namespace karabind {
         void callPy(const std::string& instanceId, const std::string& functionName, const Args&... args) const {
             auto body = std::make_shared<karabo::data::Hash>();
             packPy(*body, args...);
+            py::gil_scoped_release release;
             const std::string& id = (instanceId.empty() ? m_instanceId : instanceId);
             auto header = prepareCallHeader(id);
             doSendMessage(id, functionName, header, body);
@@ -567,6 +567,7 @@ namespace karabind {
         void replyPy(const Args&... args) {
             auto reply(std::make_shared<karabo::data::Hash>());
             packPy(*reply, args...);
+            // Can keep GIL: only a mutex lock in C++, no I/O
             registerReply(reply);
         }
 

{karabo_cpp-3.0.1 → karabo_cpp-3.0.3}/src/karabo/CMakeLists.txt

@@ -66,10 +66,10 @@ endif()
 # Extracts KARABO_VERSION from the appropriate Git tag, writes to
 # a file to be used by the Karabo Framework at build time.
 message(STATUS "Resolving Karabo Version from Git repository")
-set(KARABO_VERSION "3.0.1")
+set(KARABO_VERSION "3.0.3")
 set(KARABO_VERSION_MAJOR "3")
 set(KARABO_VERSION_MINOR "0")
-set(KARABO_VERSION_PATCH "1")
+set(KARABO_VERSION_PATCH "3")
 message(STATUS "Karabo Version: ${KARABO_VERSION}")
 message(STATUS "Karabo Version Major: ${KARABO_VERSION_MAJOR}")
 message(STATUS "Karabo Version Minor: ${KARABO_VERSION_MINOR}")