scgraph 3.4.0__tar.gz → 3.4.1__tar.gz

scgraph-3.4.1/CMakeLists.txt

@@ -0,0 +1,91 @@
+cmake_minimum_required(VERSION 3.15)
+
+# -----------------------------
+# Define The Project
+# -----------------------------
+project(scgraph LANGUAGES NONE)
+
+# -----------------------------
+# Build Options
+# -----------------------------
+option(SKIP_CPP_BUILD "Skip C++ extension module building" OFF)
+
+# -----------------------------
+# C++ detection
+# -----------------------------
+if(NOT SKIP_CPP_BUILD)
+    include(CheckLanguage)
+    check_language(CXX)
+
+    if(CMAKE_CXX_COMPILER)
+        enable_language(CXX OPTIONAL)
+    endif()
+endif()
+
+
+if(SKIP_CPP_BUILD)
+
+    message(STATUS 
+        "C++ build skipped. Using pure python version. Performance will be reduced."
+    )
+
+elseif(NOT CMAKE_CXX_COMPILER_LOADED)
+
+    message(WARNING
+        "No usable C++ compiler detected. Using pure python version. Performance will be reduced."
+    )
+
+else()
+
+    # -----------------------------
+    # Find Packages
+    # -----------------------------
+    find_package(Python 3.10 COMPONENTS Interpreter Development.Module QUIET)
+    find_package(nanobind CONFIG QUIET)
+
+    if(Python_FOUND AND nanobind_FOUND)
+        message(STATUS 
+            "C++ compiler detected: Building compiled extension."
+        )
+
+        # -----------------------------
+        # Set C++ standard
+        # -----------------------------
+        set(CMAKE_CXX_STANDARD 20)
+        set(CMAKE_CXX_STANDARD_REQUIRED ON)
+
+        # -----------------------------
+        # OPTIMIZATION FLAGS
+        # -----------------------------
+        set(CMAKE_BUILD_TYPE Release)
+        if(MSVC)
+            set(CMAKE_CXX_FLAGS_RELEASE "/O2 /DNDEBUG")
+        else()
+            set(CMAKE_CXX_FLAGS_RELEASE "-O3 -march=native -DNDEBUG")
+        endif()
+
+        # -----------------------------
+        # Graph module
+        # -----------------------------
+        nanobind_add_module(cpp
+            STABLE_ABI
+            scgraph/cpp/bindings/graph_bindings.cpp
+            scgraph/cpp/src/graph.cpp
+            scgraph/cpp/src/graph_utils.cpp
+            scgraph/cpp/src/contraction_hierarchies.cpp
+            scgraph/cpp/src/transit_node_routing.cpp
+        )
+
+        install(TARGETS cpp DESTINATION scgraph)
+    else()
+        message(WARNING
+            "Python development headers or nanobind not found. Using pure python version. Performance will be reduced."
+        )
+    endif()
+
+endif()
+
+# -----------------------------
+# Install Python package files
+# -----------------------------
+install(DIRECTORY scgraph DESTINATION . FILES_MATCHING PATTERN "*.py")

{scgraph-3.4.0 → scgraph-3.4.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: scgraph
-Version: 3.4.0
+Version: 3.4.1
 Summary: Determine an approximate distance and route between two points on earth.
 Author-Email: Connor Makowski <conmak@mit.edu>
 License-Expression: MIT
@@ -11,7 +11,7 @@ Project-URL: Homepage, https://github.com/connor-makowski/scgraph
 Project-URL: Bug Tracker, https://github.com/connor-makowski/scgraph/issues
 Project-URL: Documentation, https://connor-makowski.github.io/scgraph/scgraph.html
 Requires-Python: >=3.11
-Requires-Dist: geokdtree==1.2.3
+Requires-Dist: geokdtree==1.2.4
 Requires-Dist: bmsspy<3.0.0,>=2.2.1
 Requires-Dist: requests<3.0.0,>=2.32.0
 Provides-Extra: dev

{scgraph-3.4.0 → scgraph-3.4.1}/pyproject.toml

@@ -11,6 +11,10 @@ build-backend = "scikit_build_core.build"
 build.verbose = false
 build-dir = "build/{wheel_tag}"
 
+[[tool.scikit-build.overrides]]
+if.failed = true
+wheel.cmake = false
+
 [tool.scikit-build.sdist]
 exclude = ["*"]
 include = [
@@ -26,7 +30,7 @@ include = [
 
 [project]
 name = "scgraph"
-version = "3.4.0"
+version = "3.4.1"
 description = "Determine an approximate distance and route between two points on earth."
 authors = [
     {name="Connor Makowski", email="conmak@mit.edu"}
@@ -39,7 +43,11 @@ classifiers = [
     "Programming Language :: C++",
     "Operating System :: OS Independent",
 ]
-dependencies = ["geokdtree==1.2.3","bmsspy>=2.2.1,<3.0.0","requests>=2.32.0,<3.0.0"]
+dependencies = [
+    "geokdtree==1.2.4",
+    "bmsspy>=2.2.1,<3.0.0",
+    "requests>=2.32.0,<3.0.0"
+]
 
 [project.optional-dependencies]
 dev = [

{scgraph-3.4.0 → scgraph-3.4.1}/scgraph/utils.py

@@ -346,6 +346,8 @@ def time_test(name, function, args=None, kwargs=None):
 
 def has_cpp():
     try:
+        from scgraph.cpp import Graph  # noqa: F401
+
         return True
     except ImportError:
         return False
@@ -353,8 +355,10 @@ def has_cpp():
 
 def cpp_check():
     try:
+        from scgraph.cpp import Graph  # noqa: F401
+
         print("Using C++ & Python implementation of SCGraph.")
-    except:
+    except ImportError:
         print("Using Pure Python implementation of SCGraph.")
 
 

scgraph-3.4.0/CMakeLists.txt

@@ -1,83 +0,0 @@
-cmake_minimum_required(VERSION 3.15)
-
-# -----------------------------
-# Define The Project
-# -----------------------------
-project(scgraph LANGUAGES NONE)
-
-# -----------------------------
-# Build Options
-# -----------------------------
-option(SKIP_CPP_BUILD "Skip C++ extension module building" OFF)
-
-# -----------------------------
-# C++ detection
-# -----------------------------
-include(CheckLanguage)
-check_language(CXX)
-
-if(CMAKE_CXX_COMPILER)
-    enable_language(CXX)
-endif()
-
-
-if(SKIP_CPP_BUILD)
-
-        message(STATUS 
-            "C++ build skipped. Using pure python version. Performance will be reduced."
-        )
-
-elseif(NOT CMAKE_CXX_COMPILER_LOADED)
-
-    message(WARNING
-        "No usable C++ compiler detected. Using pure python version. Performance will be reduced."
-    )
-
-else()
-
-    message(STATUS 
-        "C++ compiler detected: Building compiled extension."
-    )
-
-    # -----------------------------
-    # Set C++ standard
-    # -----------------------------
-    set(CMAKE_CXX_STANDARD 20)
-    set(CMAKE_CXX_STANDARD_REQUIRED ON)
-
-    # -----------------------------
-    # OPTIMIZATION FLAGS
-    # -----------------------------
-    set(CMAKE_BUILD_TYPE Release)
-    if(MSVC)
-        set(CMAKE_CXX_FLAGS_RELEASE "/O2 /DNDEBUG")
-    else()
-        set(CMAKE_CXX_FLAGS_RELEASE "-O3 -march=native -DNDEBUG")
-    endif()
-
-    # -----------------------------
-    # Find Packages
-    # -----------------------------
-    find_package(Python 3.10 COMPONENTS Interpreter Development REQUIRED)
-
-    # -----------------------------
-    # Add nanobind
-    # -----------------------------
-    find_package(nanobind CONFIG REQUIRED)
-
-    # -----------------------------
-    # Graph module
-    # -----------------------------
-    nanobind_add_module(cpp
-        STABLE_ABI
-        scgraph/cpp/bindings/graph_bindings.cpp
-        scgraph/cpp/src/graph.cpp
-        scgraph/cpp/src/graph_utils.cpp
-        scgraph/cpp/src/contraction_hierarchies.cpp
-        scgraph/cpp/src/transit_node_routing.cpp
-    )
-
-
-    install(TARGETS cpp DESTINATION scgraph)
-
-endif()