Merge pull request #925 from PowerGridModel/fix/macos-bump

Try to fix macOS version bump

Author: TonyXiang8787

.readthedocs.yaml

@@ -9,7 +9,7 @@ sphinx:
   configuration: docs/conf.py
 
 build:
-  os: "ubuntu-22.04"
+  os: "ubuntu-24.04"
   tools:
     python: "3.11"
   apt_packages:

docs/advanced_documentation/build-guide.md

@@ -41,11 +41,11 @@ You need a C++ compiler with C++20 support. Below is a list of tested compilers:
 
 **Linux**
 
-* gcc >= 11.0
-  * Version 12.x tested using the version in the `manylinux_2_28` container.
-  * Version 12.x tested using the musllinux build with custom compiler
+* gcc >= 13.0
+  * Version 14.x tested using the version in the `manylinux_2_28` container.
+  * Version 14.x tested using the musllinux build with custom compiler
   * Version 13.x tested in CI
-* Clang >= 15.0
+* Clang >= 17.0
   * Version 18.x tested in CI
   * Version 18.x tested in CI with code quality checks
 
@@ -55,12 +55,12 @@ You can define the environment variable `CXX` to for example `clang++` to specif
 
 * MSVC >= 17.5
   * Latest release tested in CI (e.g. Visual Studio 2022, IDE or build tools)
-* Clang CL >= 15.0
+* Clang CL >= 17.0
   * Latest release tested in CI (e.g. Visual Studio 2022, IDE or build tools)
 
 **macOS**
 
-* Clang >= 14.0.3
+* Clang >= 15.0
   * Latest release tested in CI
 
 ### Build System for CMake Project

power_grid_model_c/power_grid_model/include/power_grid_model/common/exception.hpp

@@ -8,6 +8,7 @@
 #include "enum.hpp"
 
 #include <exception>
+#include <format>
 #include <sstream>
 #include <string>
 
@@ -23,7 +24,7 @@ inline auto to_string(std::integral auto x) { return std::to_string(x); }
 
 class PowerGridError : public std::exception {
   public:
-    void append_msg(std::string_view msg) { msg_ += msg; }
+    void append_msg(std::string_view msg) { msg_ = std::format("{}{}", msg_, msg); }
     char const* what() const noexcept final { return msg_.c_str(); }
 
   private:

pyproject.toml

@@ -127,7 +127,7 @@ musllinux-x86_64-image = "musllinux_1_2"
 
 [tool.cibuildwheel.macos]
 archs = ["x86_64", "arm64"]
-environment = { CC = "clang", CXX = "clang++" }
+environment = { CC = "clang", CXX = "clang++", MACOSX_DEPLOYMENT_TARGET = "13.3" }
 
 [tool.cibuildwheel.windows]
 archs = ["AMD64"]

setup.py

@@ -18,6 +18,8 @@
     if_win = True
 elif platform.system() in ["Linux", "Darwin"]:
     if_win = False
+    if platform.system() == "Darwin":
+        os.environ["MACOSX_DEPLOYMENT_TARGET"] = "13.3"
 else:
     raise SystemError("Only Windows, Linux, or MacOS is supported!")
 
@@ -185,10 +187,6 @@ def generate_build_ext(pkg_dir: Path, pkg_name: str):
         # flags for Linux and Mac
         cflags += ["-std=c++20", "-O3", "-fvisibility=hidden"]
         lflags += ["-lpthread", "-O3"]
-        # extra flag for Mac
-        if platform.system() == "Darwin":
-            # compiler flag to set version
-            cflags.append("-mmacosx-version-min=13.3")
 
     # list of extensions
     exts = [

src/power_grid_model/validation/_rules.py

@@ -68,13 +68,7 @@
     TwoValuesZeroError,
     ValidationError,
 )
-from power_grid_model.validation.utils import (
-    _eval_expression,
-    _get_mask,
-    _get_valid_ids,
-    _nan_type,
-    _set_default_value,
-)
+from power_grid_model.validation.utils import _eval_expression, _get_mask, _get_valid_ids, _nan_type, _set_default_value
 
 Error = TypeVar("Error", bound=ValidationError)
 CompError = TypeVar("CompError", bound=ComparisonError)