scgraph 3.3.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.3.0 → scgraph-3.4.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: scgraph
-Version: 3.3.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
@@ -10,10 +10,20 @@ Classifier: Operating System :: OS Independent
 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.10
-Requires-Dist: geokdtree==1.2.3
-Requires-Dist: bmsspy<3.0.0,>=2.2.0
+Requires-Python: >=3.11
+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
+Requires-Dist: pytest>=9.0.3; extra == "dev"
+Requires-Dist: pamda>=2.10.0; extra == "dev"
+Requires-Dist: autoflake>=2.3.1; extra == "dev"
+Requires-Dist: black>=25.1.0; extra == "dev"
+Requires-Dist: build>=1.2.2; extra == "dev"
+Requires-Dist: nox>=2026.4.10; extra == "dev"
+Requires-Dist: nox-uv>=0.8.0; extra == "dev"
+Requires-Dist: pdoc>=15.0.1; extra == "dev"
+Requires-Dist: twine>=6.1.0; extra == "dev"
 Description-Content-Type: text/markdown
 
 # SCGraph
@@ -733,17 +743,22 @@ dist_mi = distance_converter(dist_km, input_units='km', output_units='mi')
 
 # Development
 
-Make sure Docker is installed and running on a Unix system (Linux, macOS, WSL2).
+Dev dependencies are declared in `[project.optional-dependencies] dev` in `pyproject.toml`. Install them with:
+
+```bash
+uv sync --extra dev
+```
 
 | Command | Description |
 |---|---|
-| `./run.sh` | Create a Docker container and drop into a shell |
-| `./run.sh test` | Run all tests |
-| `./run.sh test test/01_graph_basic_test.py` | Run a specific test file |
-| `./run.sh prettify` | Prettify the code |
-| `./run.sh docs` | Update the docs |
-
-You can modify the `Dockerfile` to test against different Python versions.
+| `uv run pytest` | Run all tests |
+| `uv run pytest test/NN_*.py` | Run a specific test file |
+| `uv run nox` | Run tests (C++ then no-C++) across Python 3.11–3.14 |
+| `uv run nox -s tests-3.14` | Run both build variants on a single Python version |
+| `uv run utils/benchmark.py` | Run all benchmarks, output `benchmark_results.json` |
+| `uv run utils/prettify.py` | Format with autoflake + black |
+
+For full developer documentation see [DEVELOPMENT.md](DEVELOPMENT.md).
 
 ---
 

{scgraph-3.3.0 → scgraph-3.4.1}/README.md

@@ -715,17 +715,22 @@ dist_mi = distance_converter(dist_km, input_units='km', output_units='mi')
 
 # Development
 
-Make sure Docker is installed and running on a Unix system (Linux, macOS, WSL2).
+Dev dependencies are declared in `[project.optional-dependencies] dev` in `pyproject.toml`. Install them with:
+
+```bash
+uv sync --extra dev
+```
 
 | Command | Description |
 |---|---|
-| `./run.sh` | Create a Docker container and drop into a shell |
-| `./run.sh test` | Run all tests |
-| `./run.sh test test/01_graph_basic_test.py` | Run a specific test file |
-| `./run.sh prettify` | Prettify the code |
-| `./run.sh docs` | Update the docs |
-
-You can modify the `Dockerfile` to test against different Python versions.
+| `uv run pytest` | Run all tests |
+| `uv run pytest test/NN_*.py` | Run a specific test file |
+| `uv run nox` | Run tests (C++ then no-C++) across Python 3.11–3.14 |
+| `uv run nox -s tests-3.14` | Run both build variants on a single Python version |
+| `uv run utils/benchmark.py` | Run all benchmarks, output `benchmark_results.json` |
+| `uv run utils/prettify.py` | Format with autoflake + black |
+
+For full developer documentation see [DEVELOPMENT.md](DEVELOPMENT.md).
 
 ---
 

{scgraph-3.3.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,20 +30,44 @@ include = [
 
 [project]
 name = "scgraph"
-version = "3.3.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"}
 ]
 readme = "README.md"
-requires-python = ">=3.10"
+requires-python = ">=3.11"
 license="MIT"
 classifiers = [
     "Programming Language :: Python :: 3",
     "Programming Language :: C++",
     "Operating System :: OS Independent",
 ]
-dependencies = ["geokdtree==1.2.3","bmsspy>=2.2.0,<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 = [
+    "pytest>=9.0.3",
+    "pamda>=2.10.0",
+    "autoflake>=2.3.1",
+    "black>=25.1.0",
+    "build>=1.2.2",
+    "nox>=2026.4.10",
+    "nox-uv>=0.8.0",
+    "pdoc>=15.0.1",
+    "twine>=6.1.0",
+]
+
+[tool.pytest.ini_options]
+testpaths = ["test"]
+pythonpath = ["test"]
+
+[tool.uv]
+no-build-isolation-package = []
 
 [project.urls]
 "Homepage" = "https://github.com/connor-makowski/scgraph"

{scgraph-3.3.0 → scgraph-3.4.1}/scgraph/__init__.py

@@ -716,23 +716,29 @@ dist_mi = distance_converter(dist_km, input_units='km', output_units='mi')
 
 # Development
 
-Make sure Docker is installed and running on a Unix system (Linux, macOS, WSL2).
+Dev dependencies are declared in `[project.optional-dependencies] dev` in `pyproject.toml`. Install them with:
+
+```bash
+uv sync --extra dev
+```
 
 | Command | Description |
 |---|---|
-| `./run.sh` | Create a Docker container and drop into a shell |
-| `./run.sh test` | Run all tests |
-| `./run.sh test test/01_graph_basic_test.py` | Run a specific test file |
-| `./run.sh prettify` | Prettify the code |
-| `./run.sh docs` | Update the docs |
+| `uv run pytest` | Run all tests |
+| `uv run pytest test/NN_*.py` | Run a specific test file |
+| `uv run nox` | Run tests (C++ then no-C++) across Python 3.11–3.14 |
+| `uv run nox -s tests-3.14` | Run both build variants on a single Python version |
+| `uv run utils/benchmark.py` | Run all benchmarks, output `benchmark_results.json` |
+| `uv run utils/prettify.py` | Format with autoflake + black |
 
-You can modify the `Dockerfile` to test against different Python versions.
+For full developer documentation see [DEVELOPMENT.md](DEVELOPMENT.md).
 
 ---
 
 ## Attributions and Thanks
 
 Originally inspired by [searoute](https://github.com/genthalili/searoute-py), including the use of one of their [datasets](https://github.com/genthalili/searoute-py/blob/main/searoute/data/marnet_densified_v2_old.geojson) that has been modified to work with this package.
+
 """
 
 try:
@@ -740,5 +746,7 @@ try:
 except ImportError:
     from scgraph.graph import Graph
     from scgraph.contraction_hierarchies import CHGraph
+    
 from scgraph.geograph import GeoGraph
 from scgraph.grid import GridGraph
+

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

@@ -344,10 +344,21 @@ def time_test(name, function, args=None, kwargs=None):
     print(f"{name}: {round((time.time()-start)*1000, 4)}ms")
 
 
+def has_cpp():
+    try:
+        from scgraph.cpp import Graph  # noqa: F401
+
+        return True
+    except ImportError:
+        return False
+
+
 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.3.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()

scgraph-3.3.0/build/cp314-cp314-linux_x86_64/CMakeFiles/CheckCXX/CMakeLists.txt

@@ -1,6 +0,0 @@
-cmake_minimum_required(VERSION 4.3.2)
-set(CMAKE_MODULE_PATH "")
-
-project(CheckCXX LANGUAGES CXX)
-file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/result.cmake" "set(CMAKE_CXX_COMPILER \"${CMAKE_CXX_COMPILER}\")
-")