From 439aff352886ea6956e09173f68a5816f3fb28b0 Mon Sep 17 00:00:00 2001 From: Grufoony Date: Fri, 20 Feb 2026 12:12:41 +0100 Subject: [PATCH 1/3] Move `cartography` to a separate folder --- src/dsf/__init__.py | 29 +++++++++---------- src/dsf/cartography/__init__.py | 7 +++++ .../{python => cartography}/cartography.py | 0 test/Test_cartography.py | 2 +- 4 files changed, 21 insertions(+), 17 deletions(-) create mode 100644 src/dsf/cartography/__init__.py rename src/dsf/{python => cartography}/cartography.py (100%) diff --git a/src/dsf/__init__.py b/src/dsf/__init__.py index 2de57dc6..0fbaad21 100644 --- a/src/dsf/__init__.py +++ b/src/dsf/__init__.py @@ -1,20 +1,17 @@ -import sys -import os - from dsf_cpp import ( - __version__, - LogLevel, - get_log_level, - set_log_level, - log_to_file, - mobility, - mdt, + __version__ as __version__, + LogLevel as LogLevel, + get_log_level as get_log_level, + set_log_level as set_log_level, + log_to_file as log_to_file, + mobility as mobility, + mdt as mdt, ) -from .python.cartography import ( - get_cartography, - graph_from_gdfs, - graph_to_gdfs, - create_manhattan_cartography, - to_folium_map, +from .cartography import ( + get_cartography as get_cartography, + graph_from_gdfs as graph_from_gdfs, + graph_to_gdfs as graph_to_gdfs, + create_manhattan_cartography as create_manhattan_cartography, + to_folium_map as to_folium_map, ) diff --git a/src/dsf/cartography/__init__.py b/src/dsf/cartography/__init__.py new file mode 100644 index 00000000..4825f245 --- /dev/null +++ b/src/dsf/cartography/__init__.py @@ -0,0 +1,7 @@ +from .cartography import ( + get_cartography as get_cartography, + graph_from_gdfs as graph_from_gdfs, + graph_to_gdfs as graph_to_gdfs, + create_manhattan_cartography as create_manhattan_cartography, + to_folium_map as to_folium_map, +) diff --git a/src/dsf/python/cartography.py b/src/dsf/cartography/cartography.py similarity index 100% rename from src/dsf/python/cartography.py rename to src/dsf/cartography/cartography.py diff --git a/test/Test_cartography.py b/test/Test_cartography.py index 0a34be96..528e0293 100644 --- a/test/Test_cartography.py +++ b/test/Test_cartography.py @@ -5,7 +5,7 @@ import pytest import networkx as nx import folium -from dsf.python.cartography import ( +from dsf.cartography import ( get_cartography, graph_to_gdfs, graph_from_gdfs, From c4fbddb657e65fc0837be04ef05b6de0d247a2e1 Mon Sep 17 00:00:00 2001 From: Grufoony Date: Fri, 20 Feb 2026 12:22:02 +0100 Subject: [PATCH 2/3] Fix Windows install --- CMakeLists.txt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index d1d575b0..f9503f75 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -85,6 +85,11 @@ else() # Default to Debug settings endif() endif() +# MSVC: make __cplusplus report the actual standard (needed by csv-parser) +if(CMAKE_CXX_COMPILER_ID MATCHES "MSVC") + add_compile_options(/Zc:__cplusplus) +endif() + file( GLOB SOURCES From 64ebc8600516cc06a1ab7c628253422b3a51893f Mon Sep 17 00:00:00 2001 From: Grufoony Date: Fri, 20 Feb 2026 12:39:13 +0100 Subject: [PATCH 3/3] Version 5.1.0 --- src/dsf/dsf.hpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/dsf/dsf.hpp b/src/dsf/dsf.hpp index 62074b7e..ff0aee02 100644 --- a/src/dsf/dsf.hpp +++ b/src/dsf/dsf.hpp @@ -8,8 +8,8 @@ #include static constexpr uint8_t DSF_VERSION_MAJOR = 5; -static constexpr uint8_t DSF_VERSION_MINOR = 0; -static constexpr uint8_t DSF_VERSION_PATCH = 3; +static constexpr uint8_t DSF_VERSION_MINOR = 1; +static constexpr uint8_t DSF_VERSION_PATCH = 0; static auto const DSF_VERSION = std::format("{}.{}.{}", DSF_VERSION_MAJOR, DSF_VERSION_MINOR, DSF_VERSION_PATCH);