diff --git a/.github/workflows/linux_test.yml b/.github/workflows/linux_test.yml
index 7ddf0707..265c667f 100644
--- a/.github/workflows/linux_test.yml
+++ b/.github/workflows/linux_test.yml
@@ -22,7 +22,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-24.04]
-        python-version: ["3.11", "3.12"]
+        python-version: ["3.11", "3.12", "3.13"]
     steps:
       - uses: actions/checkout@v4
       - name: Set up Python  ${{ matrix.python-version }}
@@ -64,13 +64,13 @@ jobs:
     - name: Install sphinx and themes
       run: |
         python -m pip install --upgrade pip
-        pip install sphinx
-        pip install recommonmark
-        pip install sphinx_rtd_theme
-        pip install nbsphinx
+        pip install sphinx recommonmark sphinx_rtd_theme nbsphinx
+        # Install package so autodoc can import modules (openseespy mocked in conf.py)
+        pip install numpy scipy pandas matplotlib
+        pip install -e .
     - name: Make html pages
       run: |
-        cd docsrc ; sphinx-apidoc -o contents/ ../openquake ; make html
+        cd docsrc && make html
         touch _build/html/.nojekyll
 
     - name: Deploy to GitHub Pages
diff --git a/.github/workflows/windows_test.yml b/.github/workflows/windows_test.yml
index 901766cf..465bea67 100644
--- a/.github/workflows/windows_test.yml
+++ b/.github/workflows/windows_test.yml
@@ -7,11 +7,6 @@ on:
         description: Git Ref
         default: master
         required: true
-      debug_enabled:
-        type: boolean
-        description: 'tmate debug enabled'
-        required: false
-        default: false
   schedule:
     - cron: "0 2 * * 0"
 
@@ -22,7 +17,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [windows-2025]
-        python-version: ["3.11", "3.12"]
+        python-version: ["3.11", "3.12", "3.13"]
     steps:
       - uses: actions/checkout@v4
       - name: Set up Python  ${{ matrix.python-version }}
diff --git a/requirements-py311-linux.txt b/requirements-py311-linux.txt
index d529e89c..370d1a7b 100644
--- a/requirements-py311-linux.txt
+++ b/requirements-py311-linux.txt
@@ -1,18 +1,18 @@
 # vmtk requirements
 # From OQ wheels
 #
-
-https://wheelhouse.openquake.org/v3/linux/py311/gdal-3.10.3-cp311-cp311-manylinux2014_x86_64.manylinux_2_17_x86_64.whl
-https://wheelhouse.openquake.org/v3/linux/py311/pyproj-3.7.2-cp311-cp311-manylinux2014_x86_64.manylinux_2_17_x86_64.whl
 https://wheelhouse.openquake.org/v3/linux/py311/fiona-1.10.1-cp311-cp311-manylinux2014_x86_64.manylinux_2_17_x86_64.whl
-https://wheelhouse.openquake.org/v3/linux/py311/pandas-2.2.3-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl
+https://wheelhouse.openquake.org/v3/linux/py311/gdal-3.10.3-cp311-cp311-manylinux2014_x86_64.manylinux_2_17_x86_64.whl
 https://wheelhouse.openquake.org/v3/linux/py311/h5py-3.13.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl
-https://wheelhouse.openquake.org/v3/linux/py311/scipy-1.15.3-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl
 https://wheelhouse.openquake.org/v3/linux/py311/llvmlite-0.44.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl
-https://wheelhouse.openquake.org/v3/linux/py311/shapely-2.1.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl
+https://wheelhouse.openquake.org/v3/linux/py311/matplotlib-3.10.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl
+https://wheelhouse.openquake.org/v3/linux/py311/numba-0.61.2-cp311-cp311-manylinux2014_x86_64.manylinux_2_17_x86_64.whl
 https://wheelhouse.openquake.org/v3/linux/py311/numpy-2.2.6-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl
+https://wheelhouse.openquake.org/v3/linux/py311/pandas-2.2.3-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl
+https://wheelhouse.openquake.org/v3/linux/py311/pyproj-3.7.2-cp311-cp311-manylinux2014_x86_64.manylinux_2_17_x86_64.whl
+https://wheelhouse.openquake.org/v3/linux/py311/scipy-1.15.3-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl
+https://wheelhouse.openquake.org/v3/linux/py311/shapely-2.1.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl
 https://wheelhouse.openquake.org/v3/linux/py311/statsmodels-0.14.4-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl
-https://wheelhouse.openquake.org/v3/linux/py311/matplotlib-3.10.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl
 #
 #
 openseespy==3.7.0.4
diff --git a/requirements-py311-win64.txt b/requirements-py311-win64.txt
index c1e16537..077cbd94 100644
--- a/requirements-py311-win64.txt
+++ b/requirements-py311-win64.txt
@@ -1,17 +1,18 @@
 # vmtk requirements
 # From OQ wheels
-#
-https://wheelhouse.openquake.org/v3/windows/py311/pyproj-3.7.2-cp311-cp311-win_amd64.whl
-https://wheelhouse.openquake.org/v3/windows/py311/gdal-3.10.2-cp311-cp311-win_amd64.whl
+
 https://wheelhouse.openquake.org/v3/windows/py311/fiona-1.10.1-cp311-cp311-win_amd64.whl
+https://wheelhouse.openquake.org/v3/windows/py311/gdal-3.10.2-cp311-cp311-win_amd64.whl
+https://wheelhouse.openquake.org/v3/windows/py311/h5py-3.13.0-cp311-cp311-win_amd64.whl
+https://wheelhouse.openquake.org/v3/windows/py311/llvmlite-0.44.0-cp311-cp311-win_amd64.whl
 https://wheelhouse.openquake.org/v3/windows/py311/matplotlib-3.10.1-cp311-cp311-win_amd64.whl
 https://wheelhouse.openquake.org/v3/windows/py311/numba-0.61.2-cp311-cp311-win_amd64.whl
 https://wheelhouse.openquake.org/v3/windows/py311/numpy-2.2.6-cp311-cp311-win_amd64.whl
-https://wheelhouse.openquake.org/v3/windows/py311/shapely-2.1.0-cp311-cp311-win_amd64.whl
-https://wheelhouse.openquake.org/v3/windows/py311/llvmlite-0.44.0-cp311-cp311-win_amd64.whl
-https://wheelhouse.openquake.org/v3/windows/py311/scipy-1.15.3-cp311-cp311-win_amd64.whl
-https://wheelhouse.openquake.org/v3/windows/py311/h5py-3.13.0-cp311-cp311-win_amd64.whl
 https://wheelhouse.openquake.org/v3/windows/py311/pandas-2.2.3-cp311-cp311-win_amd64.whl
+https://wheelhouse.openquake.org/v3/windows/py311/pyproj-3.7.2-cp311-cp311-win_amd64.whl
+https://wheelhouse.openquake.org/v3/windows/py311/scipy-1.15.3-cp311-cp311-win_amd64.whl
+https://wheelhouse.openquake.org/v3/windows/py311/shapely-2.1.0-cp311-cp311-win_amd64.whl
+#
 #
 #
 openseespy==3.6.0.3
diff --git a/requirements-py312-linux.txt b/requirements-py312-linux.txt
index 12f9f0ff..16ed138f 100644
--- a/requirements-py312-linux.txt
+++ b/requirements-py312-linux.txt
@@ -1,18 +1,18 @@
 # vmtk requirements
 # From OQ wheels
 #
-https://wheelhouse.openquake.org/v3/linux/py312/statsmodels-0.14.4-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl
-https://wheelhouse.openquake.org/v3/linux/py312/pyproj-3.7.2-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.whl
-https://wheelhouse.openquake.org/v3/linux/py312/gdal-3.10.3-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.whl
 https://wheelhouse.openquake.org/v3/linux/py312/fiona-1.10.1-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.whl
+https://wheelhouse.openquake.org/v3/linux/py312/gdal-3.10.3-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.whl
+https://wheelhouse.openquake.org/v3/linux/py312/h5py-3.13.0-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl
+https://wheelhouse.openquake.org/v3/linux/py312/llvmlite-0.44.0-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl
 https://wheelhouse.openquake.org/v3/linux/py312/matplotlib-3.10.1-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl
 https://wheelhouse.openquake.org/v3/linux/py312/numba-0.61.2-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.whl
 https://wheelhouse.openquake.org/v3/linux/py312/numpy-2.2.6-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl
-https://wheelhouse.openquake.org/v3/linux/py312/shapely-2.1.0-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl
-https://wheelhouse.openquake.org/v3/linux/py312/llvmlite-0.44.0-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl
-https://wheelhouse.openquake.org/v3/linux/py312/scipy-1.15.3-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl
-https://wheelhouse.openquake.org/v3/linux/py312/h5py-3.13.0-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl
 https://wheelhouse.openquake.org/v3/linux/py312/pandas-2.2.3-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl
+https://wheelhouse.openquake.org/v3/linux/py312/pyproj-3.7.2-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.whl
+https://wheelhouse.openquake.org/v3/linux/py312/scipy-1.15.3-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl
+https://wheelhouse.openquake.org/v3/linux/py312/shapely-2.1.0-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl
+https://wheelhouse.openquake.org/v3/linux/py312/statsmodels-0.14.4-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl
 #
 #
 openseespy==3.7.0.4
diff --git a/requirements-py312-win64.txt b/requirements-py312-win64.txt
index aaacc6fc..4ca3e690 100644
--- a/requirements-py312-win64.txt
+++ b/requirements-py312-win64.txt
@@ -1,19 +1,18 @@
 # vmtk requirements
 # From OQ wheels
 #
-https://wheelhouse.openquake.org/v3/windows/py312/statsmodels-0.14.4-cp312-cp312-win_amd64.whl
-https://wheelhouse.openquake.org/v3/windows/py312/gdal-3.10.2-cp312-cp312-win_amd64.whl
 https://wheelhouse.openquake.org/v3/windows/py312/fiona-1.10.1-cp312-cp312-win_amd64.whl
-https://wheelhouse.openquake.org/v3/windows/py312/pyproj-3.7.2-cp312-cp312-win_amd64.whl
+https://wheelhouse.openquake.org/v3/windows/py312/gdal-3.10.2-cp312-cp312-win_amd64.whl
+https://wheelhouse.openquake.org/v3/windows/py312/h5py-3.13.0-cp312-cp312-win_amd64.whl
+https://wheelhouse.openquake.org/v3/windows/py312/llvmlite-0.44.0-cp312-cp312-win_amd64.whl
 https://wheelhouse.openquake.org/v3/windows/py312/matplotlib-3.10.1-cp312-cp312-win_amd64.whl
 https://wheelhouse.openquake.org/v3/windows/py312/numba-0.61.2-cp312-cp312-win_amd64.whl
 https://wheelhouse.openquake.org/v3/windows/py312/numpy-2.2.6-cp312-cp312-win_amd64.whl
-https://wheelhouse.openquake.org/v3/windows/py312/shapely-2.1.0-cp312-cp312-win_amd64.whl
-https://wheelhouse.openquake.org/v3/windows/py312/llvmlite-0.44.0-cp312-cp312-win_amd64.whl
-https://wheelhouse.openquake.org/v3/windows/py312/contourpy-1.3.2-cp312-cp312-win_amd64.whl
-https://wheelhouse.openquake.org/v3/windows/py312/scipy-1.15.3-cp312-cp312-win_amd64.whl
-https://wheelhouse.openquake.org/v3/windows/py312/h5py-3.13.0-cp312-cp312-win_amd64.whl
 https://wheelhouse.openquake.org/v3/windows/py312/pandas-2.2.3-cp312-cp312-win_amd64.whl
+https://wheelhouse.openquake.org/v3/windows/py312/pyproj-3.7.2-cp312-cp312-win_amd64.whl
+https://wheelhouse.openquake.org/v3/windows/py312/scipy-1.15.3-cp312-cp312-win_amd64.whl
+https://wheelhouse.openquake.org/v3/windows/py312/shapely-2.1.0-cp312-cp312-win_amd64.whl
+https://wheelhouse.openquake.org/v3/windows/py312/statsmodels-0.14.4-cp312-cp312-win_amd64.whl
 #pp
 #
 openseespy==3.7.0.6