From 5fb1ed2f10eaf50a7855e6d39b522e792679dfc1 Mon Sep 17 00:00:00 2001
From: Ramon Nou <ramon.nou@bsc.es>
Date: Tue, 13 May 2025 13:19:49 +0200
Subject: [PATCH] updated spdlog / fmt / pytest

---
 CHANGELOG.md                            |  3 ++-
 CMakeLists.txt                          |  4 ++--
 external/fmt                            |  2 +-
 external/spdlog                         |  2 +-
 include/daemon/daemon.hpp               | 15 +++++++++++++++
 tests/integration/pytest.ini.in         |  2 ++
 tests/integration/pytest.install.ini.in |  2 ++
 tests/integration/requirements.txt.in   |  8 ++++----
 8 files changed, 29 insertions(+), 9 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f22307a3d..afe76a5a0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -27,7 +27,8 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
   - Update CLI11 in modules ([!232](https://storage.bsc.es/gitlab/hpc/gekkofs/-/merge_requests/232)).
   - Faster initialization relaying on host_files information instead of server RPC ([!242](https://storage.bsc.es/gitlab/hpc/gekkofs/-/merge_requests/242))
   - Directories shows . and .. to support scandir ([!248](https://storage.bsc.es/gitlab/hpc/gekkofs/-/merge_requests/248))
-  
+  - updated fmt, spdlog and pytest versions ([!249](https://storage.bsc.es/gitlab/hpc/gekkofs/-/merge_requests/249))
+
 ### Fixed
   - Dup3 is supported if O_CLOEXEC is not used (i.e. hexdump) ([!228](https://storage.bsc.es/gitlab/hpc/gekkofs/-/merge_requests/228))
   - gkfs_do_write uses int instead of ssize_t causing overflow ([!229](https://storage.bsc.es/gitlab/hpc/gekkofs/-/merge_requests/229))
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 09ffe45ed..1b82e8112 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -229,7 +229,7 @@ include_from_source(fmt
     MESSAGE "[${PROJECT_NAME}] Searching for {fmt}"
     SOURCE_DIR ${GKFS_DEPENDENCIES_PATH}/fmt
     GIT_REPOSITORY https://github.com/fmtlib/fmt
-    GIT_TAG e69e5f977d458f2650bb346dadf2ad30c5320281 # v10.1.0
+    GIT_TAG 40626af88bd7df9a5fb80be7b25ac85b122d6c21 # v11.2.0
 )
 
 # ensure that fmt is linked as PIC
@@ -240,7 +240,7 @@ include_from_source(spdlog
     MESSAGE "[${PROJECT_NAME}] Searching for spdlog"
     SOURCE_DIR ${GKFS_DEPENDENCIES_PATH}/spdlog
     GIT_REPOSITORY https://github.com/gabime/spdlog.git
-    GIT_TAG eb3220622e73a4889eee355ffa37972b3cac3df5 # v1.9.2
+    GIT_TAG 6fa36017cfd5731d617e1a934f0e5ea9c4445b13 # v1.15.3
 )
 
 ### CLI11: used for parsing command-line options
diff --git a/external/fmt b/external/fmt
index e69e5f977..40626af88 160000
--- a/external/fmt
+++ b/external/fmt
@@ -1 +1 @@
-Subproject commit e69e5f977d458f2650bb346dadf2ad30c5320281
+Subproject commit 40626af88bd7df9a5fb80be7b25ac85b122d6c21
diff --git a/external/spdlog b/external/spdlog
index eb3220622..6fa36017c 160000
--- a/external/spdlog
+++ b/external/spdlog
@@ -1 +1 @@
-Subproject commit eb3220622e73a4889eee355ffa37972b3cac3df5
+Subproject commit 6fa36017cfd5731d617e1a934f0e5ea9c4445b13
diff --git a/include/daemon/daemon.hpp b/include/daemon/daemon.hpp
index 82f8286e1..dfdc0998f 100644
--- a/include/daemon/daemon.hpp
+++ b/include/daemon/daemon.hpp
@@ -55,6 +55,21 @@ extern "C" {
 #include <margo.h>
 }
 
+#include <spdlog/fmt/ostr.h> // Must include before any spdlog headers
+
+// If hg_return is your custom type
+namespace fmt {
+template <>
+struct formatter<hg_return> : formatter<string_view> {
+    auto
+    format(const hg_return& value, format_context& ctx) const {
+        // Implement your formatting logic
+        return formatter<string_view>::format(
+                fmt::format("hg_return({})", static_cast<int>(value)), ctx);
+    }
+};
+} // namespace fmt
+
 #include <daemon/classes/fs_data.hpp>
 #include <daemon/classes/rpc_data.hpp>
 #include <common/rpc/distributor.hpp>
diff --git a/tests/integration/pytest.ini.in b/tests/integration/pytest.ini.in
index 798442d4f..03794de1d 100644
--- a/tests/integration/pytest.ini.in
+++ b/tests/integration/pytest.ini.in
@@ -16,3 +16,5 @@ testpaths = @CMAKE_CURRENT_SOURCE_DIR@
 addopts = @PYTEST_BINDIR_ARGS@ @PYTEST_LIBDIR_ARGS@ --interface=@GKFS_TESTS_INTERFACE@
 enable_assertion_pass_hook = true
 junit_family = xunit1
+filterwarnings =
+    ignore:.*fork\\(\\) may lead to deadlocks.*
\ No newline at end of file
diff --git a/tests/integration/pytest.install.ini.in b/tests/integration/pytest.install.ini.in
index 9fb0ede47..ff3853e3a 100644
--- a/tests/integration/pytest.install.ini.in
+++ b/tests/integration/pytest.install.ini.in
@@ -16,3 +16,5 @@ testpaths = @CMAKE_INSTALL_FULL_DATAROOTDIR@/gkfs/tests
 addopts = --bin-dir=@CMAKE_INSTALL_FULL_BINDIR@ --bin-dir=@CMAKE_INSTALL_FULL_LIBDIR@ --lib-dir=@CMAKE_INSTALL_FULL_LIBDIR@ --interface=@GKFS_TESTS_INTERFACE@
 enable_assertion_pass_hook = true
 junit_family = xunit1
+filterwarnings =
+    ignore:.*fork\\(\\) may lead to deadlocks.*
diff --git a/tests/integration/requirements.txt.in b/tests/integration/requirements.txt.in
index e8c27a1c1..181b75bbb 100644
--- a/tests/integration/requirements.txt.in
+++ b/tests/integration/requirements.txt.in
@@ -2,7 +2,7 @@ apipkg==1.5
 attrs==19.3.0
 backcall==0.1.0
 decorator==4.4.1
-execnet==1.7.1
+execnet==2.1.1
 importlib-metadata==1.5.0
 iniconfig==1.1.1
 ipython==7.12.0
@@ -17,16 +17,16 @@ packaging==20.1
 parso==0.6.1
 pexpect==4.8.0
 pickleshare==0.7.5
-pluggy==0.13.1
+pluggy==1.5.0
 prompt-toolkit==3.0.3
 ptyprocess==0.6.0
 py==1.11.0
 Pygments==2.5.2
 pyparsing==2.4.6
-pytest==6.2.5
+pytest==8.3.3
 pytest-dependency==0.5.1
 pytest-forked==1.1.3
-pytest-xdist==1.31.0
+pytest-xdist==3.6.1
 sh==1.14.3
 six==1.14.0
 toml==0.10.2
-- 
GitLab