From 4dd14b3c0827274963633c2134fdb576c8d5c81f Mon Sep 17 00:00:00 2001 From: Stephen Mather <1174901+smathermather@users.noreply.github.com> Date: Wed, 30 Jul 2025 21:25:12 -0400 Subject: [PATCH 1/8] Update publish-windows.yml to 2025 --- .github/workflows/publish-windows.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish-windows.yml b/.github/workflows/publish-windows.yml index 542edfeb6..809b42407 100644 --- a/.github/workflows/publish-windows.yml +++ b/.github/workflows/publish-windows.yml @@ -9,7 +9,7 @@ on: jobs: build: - runs-on: windows-2022 + runs-on: windows-2025 steps: - name: Checkout uses: actions/checkout@v2 From 816e497201a1798e9dd3c439948afbe54bd9535f Mon Sep 17 00:00:00 2001 From: Stephen Mather <1174901+smathermather@users.noreply.github.com> Date: Wed, 30 Jul 2025 22:46:22 -0400 Subject: [PATCH 2/8] Update test-build-prs.yaml to 2022 --- .github/workflows/test-build-prs.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test-build-prs.yaml b/.github/workflows/test-build-prs.yaml index ddc127620..338a667c2 100644 --- a/.github/workflows/test-build-prs.yaml +++ b/.github/workflows/test-build-prs.yaml @@ -49,7 +49,7 @@ jobs: # isClassic: 'false' windows: - runs-on: windows-2019 + runs-on: windows-2022 steps: - name: Checkout uses: actions/checkout@v2 From 111a942dace6c081f2a48393a0f142f0bf07cf4e Mon Sep 17 00:00:00 2001 From: Stephen Mather <1174901+smathermather@users.noreply.github.com> Date: Wed, 30 Jul 2025 22:46:47 -0400 Subject: [PATCH 3/8] revert to 2022 --- .github/workflows/publish-windows.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish-windows.yml b/.github/workflows/publish-windows.yml index 809b42407..542edfeb6 100644 --- a/.github/workflows/publish-windows.yml +++ b/.github/workflows/publish-windows.yml @@ -9,7 +9,7 @@ on: jobs: build: - runs-on: windows-2025 + runs-on: windows-2022 steps: - name: Checkout uses: actions/checkout@v2 From dfc969abac4b38751a2ff8d4fa831b4ff7c5eb92 Mon Sep 17 00:00:00 2001 From: Stephen Mather Date: Wed, 30 Jul 2025 23:53:54 -0400 Subject: [PATCH 4/8] switch image to 2025 --- .github/workflows/publish-windows.yml | 2 +- .github/workflows/test-build-prs.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/publish-windows.yml b/.github/workflows/publish-windows.yml index 542edfeb6..809b42407 100644 --- a/.github/workflows/publish-windows.yml +++ b/.github/workflows/publish-windows.yml @@ -9,7 +9,7 @@ on: jobs: build: - runs-on: windows-2022 + runs-on: windows-2025 steps: - name: Checkout uses: actions/checkout@v2 diff --git a/.github/workflows/test-build-prs.yaml b/.github/workflows/test-build-prs.yaml index 338a667c2..a7c9c2a80 100644 --- a/.github/workflows/test-build-prs.yaml +++ b/.github/workflows/test-build-prs.yaml @@ -49,7 +49,7 @@ jobs: # isClassic: 'false' windows: - runs-on: windows-2022 + runs-on: windows-2025 steps: - name: Checkout uses: actions/checkout@v2 From 4f912c0a147348bb4d1eab69b6523f1faa2b5609 Mon Sep 17 00:00:00 2001 From: Stephen Mather <1174901+smathermather@users.noreply.github.com> Date: Fri, 1 Aug 2025 19:24:58 -0400 Subject: [PATCH 5/8] Remove unused requirements --- requirements.txt | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/requirements.txt b/requirements.txt index 9e1bfdbf0..a2b8d40b2 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,16 +1,11 @@ appsettings==0.8 -attrs==20.3.0 beautifulsoup4==4.9.3 -cloudpickle==1.6.0 edt==2.0.2 ODMExifRead==3.0.4 Fiona==1.8.17 ; sys_platform == 'linux' Fiona==1.9.1 ; sys_platform == 'darwin' https://github.com/OpenDroneMap/windows-deps/raw/main/Fiona-1.8.19-cp38-cp38-win_amd64.whl ; sys_platform == 'win32' joblib==1.1.0 -lxml==4.6.1 -matplotlib==3.3.3 -networkx==2.5 numpy==1.23.1 Pillow==8.3.2 vmem==1.0.2 @@ -26,15 +21,10 @@ https://github.com/OpenDroneMap/windows-deps/raw/main/GDAL-3.2.3-cp38-cp38-win_a odmrawpy==0.24.1 repoze.lru==0.7 scikit-learn==1.1.1 -Pywavelets==1.3.0 -scikit-image==0.19.3 scipy==1.8.1 xmltodict==0.12.0 -fpdf2==2.4.6 Shapely==1.7.1 onnxruntime==1.12.1 pygltflib==1.16.5 codem==0.24.0 -trimesh==3.17.1 -pandas==1.5.2 piexif==1.1.3 From 3cc981841c32656c43328e36e6325cc04575a128 Mon Sep 17 00:00:00 2001 From: Stephen Mather <1174901+smathermather@users.noreply.github.com> Date: Fri, 1 Aug 2025 23:18:15 -0400 Subject: [PATCH 6/8] re-add reqs --- requirements.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/requirements.txt b/requirements.txt index a2b8d40b2..68b2300a8 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,6 @@ appsettings==0.8 beautifulsoup4==4.9.3 +python-dateutil==2.8.2 edt==2.0.2 ODMExifRead==3.0.4 Fiona==1.8.17 ; sys_platform == 'linux' @@ -21,10 +22,12 @@ https://github.com/OpenDroneMap/windows-deps/raw/main/GDAL-3.2.3-cp38-cp38-win_a odmrawpy==0.24.1 repoze.lru==0.7 scikit-learn==1.1.1 +scikit-image==0.19.3 scipy==1.8.1 xmltodict==0.12.0 Shapely==1.7.1 onnxruntime==1.12.1 pygltflib==1.16.5 codem==0.24.0 +trimesh==3.17.1 piexif==1.1.3 From dcc6dd817a92ceca294250d447433954e3739ca9 Mon Sep 17 00:00:00 2001 From: Stephen Mather <1174901+smathermather@users.noreply.github.com> Date: Fri, 1 Aug 2025 23:19:40 -0400 Subject: [PATCH 7/8] fpdf2 --- requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/requirements.txt b/requirements.txt index 68b2300a8..b772f749b 100644 --- a/requirements.txt +++ b/requirements.txt @@ -25,6 +25,7 @@ scikit-learn==1.1.1 scikit-image==0.19.3 scipy==1.8.1 xmltodict==0.12.0 +fpdf2==2.4.6 Shapely==1.7.1 onnxruntime==1.12.1 pygltflib==1.16.5 From e4d851f377705811aac1bb3882acc850c8a10332 Mon Sep 17 00:00:00 2001 From: Stephen Mather Date: Fri, 1 Aug 2025 23:22:41 -0400 Subject: [PATCH 8/8] re-add matplotlib --- requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/requirements.txt b/requirements.txt index b772f749b..31f93fa3c 100644 --- a/requirements.txt +++ b/requirements.txt @@ -7,6 +7,7 @@ Fiona==1.8.17 ; sys_platform == 'linux' Fiona==1.9.1 ; sys_platform == 'darwin' https://github.com/OpenDroneMap/windows-deps/raw/main/Fiona-1.8.19-cp38-cp38-win_amd64.whl ; sys_platform == 'win32' joblib==1.1.0 +matplotlib==3.3.3 numpy==1.23.1 Pillow==8.3.2 vmem==1.0.2