refactor: Initial Python 3.13 rework

* Remove Router in favor of nanoroute

* Update all Python.h includes

* Update py-build-cmake

* Update CI to use pre-installed vcpkg on ubuntu

Author: nickelpro

.github/workflows/test.yaml

@@ -5,38 +5,53 @@ on:
   push:
   pull_request:
 
-
 jobs:
   build_windows:
     name: Build and Test on Windows
     runs-on: windows-latest
 
     steps:
+      - name: Export GitHub Actions cache environment variables
+        uses: actions/github-script@v7
+        with:
+          script: |
+            core.exportVariable('ACTIONS_CACHE_URL', process.env.ACTIONS_CACHE_URL || '');
+            core.exportVariable('ACTIONS_RUNTIME_TOKEN', process.env.ACTIONS_RUNTIME_TOKEN || '');
+
       - name: Checkout
         uses: actions/checkout@v4
 
       - name: Setup Python
         uses: actions/setup-python@v5
         with:
-          python-version: '3.12'
+          python-version: "3.13"
 
       - name: Build
+        env:
+          VCPKG_BINARY_SOURCES: "clear;x-gha,readwrite"
         run: |
           python -m venv .venv
           .venv\Scripts\Activate.ps1
-          pip install .
+          python -m pip install --upgrade pip
+          pip install '.[test]' -C override=cmake.args+=["--toolchain=$env:VCPKG_INSTALLATION_ROOT/scripts/buildsystems/vcpkg.cmake"]
 
       - name: Test
         run: |
           .venv\Scripts\Activate.ps1
-          pip install pytest
           pytest test
 
   build_macos:
     name: Build and Test on MacOS
     runs-on: macos-latest
 
     steps:
+      - name: Export GitHub Actions cache environment variables
+        uses: actions/github-script@v7
+        with:
+          script: |
+            core.exportVariable('ACTIONS_CACHE_URL', process.env.ACTIONS_CACHE_URL || '');
+            core.exportVariable('ACTIONS_RUNTIME_TOKEN', process.env.ACTIONS_RUNTIME_TOKEN || '');
+
       - name: Checkout
         uses: actions/checkout@v4
 
@@ -45,35 +60,55 @@ jobs:
         with:
           xcode-version: latest
 
+      - name: Setup Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: "3.13"
+
       - name: Build
+        env:
+          VCPKG_BINARY_SOURCES: "clear;x-gha,readwrite"
         run: |
           python -m venv .venv
           . .venv/bin/activate
           pip install --upgrade pip
-          pip install .
+          pip install '.[test]' -C override=cmake.options.VELOCEM_BOOTSTRAP_VCPKG="ON"
 
       - name: Test
         run: |
           . .venv/bin/activate
-          pip install pytest
           pytest test
 
   build_linux:
     name: Build and Test on Linux
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-latest
+
     steps:
+      - name: Export GitHub Actions cache environment variables
+        uses: actions/github-script@v7
+        with:
+          script: |
+            core.exportVariable('ACTIONS_CACHE_URL', process.env.ACTIONS_CACHE_URL || '');
+            core.exportVariable('ACTIONS_RUNTIME_TOKEN', process.env.ACTIONS_RUNTIME_TOKEN || '');
+
       - name: Checkout
         uses: actions/checkout@v4
 
+      - name: Setup Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: "3.13"
+
       - name: Build
+        env:
+          VCPKG_BINARY_SOURCES: "clear;x-gha,readwrite"
         run: |
           python -m venv .venv
           . .venv/bin/activate
           pip install --upgrade pip
-          pip install .
+          pip install '.[test]' -C override=cmake.args+=\["--toolchain=${VCPKG_INSTALLATION_ROOT}/scripts/buildsystems/vcpkg.cmake"\]
 
       - name: Test
         run: |
           . .venv/bin/activate
-          pip install pytest
           pytest test

CMakeLists.txt

@@ -2,21 +2,19 @@ cmake_minimum_required(VERSION 3.25)
 
 include(vcpkg/BootstrapVcpkg.cmake)
 
-project(velocem LANGUAGES C CXX VERSION 0.0.12)
+project(velocem LANGUAGES C CXX VERSION 0.0.13)
 
 option(VELOCEM_USE_IO_URING "Use io_uring on Linux" ON)
 option(VELOCEM_USE_IPO "Use interprocedural optimization if supported" ON)
 option(VELOCEM_STRIP "Run system strip on compiled module" ON)
 set(VELOCEM_WIN_SDK_VER 0x0A00 CACHE STRING "Windows SDK macro version")
 
-find_package(absl CONFIG REQUIRED)
 find_package(asio CONFIG REQUIRED)
 find_package(llhttp CONFIG REQUIRED)
 find_package(Python3 3.12 REQUIRED COMPONENTS Development.Module)
 
 Python3_add_library(velocem MODULE)
 target_link_libraries(velocem PRIVATE
-  absl::flat_hash_map
   asio::asio
   llhttp::llhttp_static
   Python3::Module
@@ -82,7 +80,13 @@ endif()
 
 add_subdirectory(src)
 
+if(DEFINED PY_BUILD_CMAKE_VERSION)
+  set(VELOCEM_PLATLIB ${PY_BUILD_CMAKE_PROJECT_NAME}-${PY_BUILD_CMAKE_PROJECT_VERSION}.data/platlib)
+else()
+  set(VELOCEM_PLATLIB platlib)
+endif()
+
 install(
   TARGETS velocem
-  LIBRARY DESTINATION ${PY_BUILD_CMAKE_PACKAGE_NAME}-${PY_BUILD_CMAKE_PACKAGE_VERSION}.data/platlib
+  LIBRARY DESTINATION ${VELOCEM_PLATLIB}
 )

ReadMe.md

@@ -65,9 +65,9 @@ more performant techniques as well.
   Flask app is 5x slower than the raw WSGI equivalent. A fast router is
   essential to a fast, low latency application.
 
-  Velocem has a _very basic_ router, but it should still be faster than most
-  other implementations. There's a lot of work to do, but it's on the order of
-  1000x faster than Flask.
+  Velocem currently recommends/uses [`nanoroute`](https://nanoroute.dev/) as
+  a fast router for WSGI servers. It does not yet provide a faster native
+  router.
 
 * **Tests**: There are a couple of tests. The current testing strategy is "when
   she segfaults, write a test so the same segfault doesn't happen again".

pyproject.toml

@@ -1,26 +1,29 @@
 [project]
 name = "velocem"
-version = "0.0.12"
+version = "0.0.13"
 description = "Hyperspeed Python Web Framework"
 readme = "ReadMe.md"
-requires-python = ">=3.12"
+requires-python = ">=3.13"
 license = { "file" = "UsageLicense" }
 authors = [{ "name" = "Vito Gamberini", "email" = "[email protected]" }]
 keywords = ["WSGI"]
 classifiers = [
   "Development Status :: 2 - Pre-Alpha",
   "License :: OSI Approved :: MIT No Attribution License (MIT-0)",
   "Programming Language :: Python :: 3",
-  "Programming Language :: Python :: 3.12",
+  "Programming Language :: Python :: 3.13",
   "Operating System :: POSIX :: Linux",
   "Operating System :: Microsoft :: Windows",
   "Operating System :: MacOS",
 ]
 urls = { "Documentation" = "https://github.com/nickelpro/velocem" }
 dependencies = []
 
+[project.optional-dependencies]
+test = ["pytest", "nanoroute"]
+
 [build-system]
-requires = ["py-build-cmake~=0.2.0a14"]
+requires = ["py-build-cmake~=0.3.4"]
 build-backend = "py_build_cmake.build"
 
 [tool.py-build-cmake.module]
@@ -30,7 +33,7 @@ generated = "module"
 include = ["CMakeLists.txt", "vcpkg.json", "src", "vcpkg"]
 
 [tool.py-build-cmake.cmake]
-minimum_version = "3.17"
+minimum_version = "3.25"
 config = "Release"
 build_type = "Release"
 build_args = ["-j"]

src/CMakeLists.txt

@@ -6,18 +6,17 @@ target_sources(velocem PRIVATE
   BASE_DIRS ${CMAKE_CURRENT_LIST_DIR}
 
   FILES
-  HTTPParser.hpp
-  Router.hpp
+    HTTPParser.hpp
 
-  plat/plat.hpp
+    plat/plat.hpp
 
-  util/Constants.hpp
-  util/Util.hpp
+    util/Constants.hpp
+    util/Util.hpp
 
-  wsgi/App.hpp
-  wsgi/Input.hpp
-  wsgi/Request.hpp
-  wsgi/Server.hpp
+    wsgi/App.hpp
+    wsgi/Input.hpp
+    wsgi/Request.hpp
+    wsgi/Server.hpp
 )
 
 add_subdirectory(plat)

src/ModVelocem.cpp

@@ -1,7 +1,5 @@
-#define PY_SSIZE_T_CLEAN
 #include <Python.h>
 
-#include "Router.hpp"
 #include "util/Constants.hpp"
 #include "wsgi/Server.hpp"
 
@@ -27,7 +25,7 @@ PyMODINIT_FUNC PyInit_velocem(void) {
   auto mod {PyModule_Create(&VelocemModule)};
   if(!mod)
     return nullptr;
-  if(PyModule_AddStringConstant(mod, "__version__", "0.0.12") == -1)
+  if(PyModule_AddStringConstant(mod, "__version__", "0.0.13") == -1)
     return nullptr;
   velocem::init_globals(mod);
   return mod;