Skip to content

Commit 0cfe870

Browse files
Merge pull request #4 from sylveon/python-3.12.13
2 parents 0f70a5e + 6a84891 commit 0cfe870

File tree

2 files changed

+19
-16
lines changed

2 files changed

+19
-16
lines changed

get_deps.py

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,12 @@
33
import shutil
44
import urllib.request
55
from zipfile import ZipFile
6-
from wheel.cli.unpack import unpack
7-
from wheel.cli.pack import pack
6+
from wheel.wheelfile import WheelFile
87

98
gdal_wheel_url = "https://github.com/cgohlke/geospatial-wheels/releases/download/v2025.7.4/gdal-3.11.1-cp312-cp312-win_amd64.whl"
109
fiona_wheel_url = "https://github.com/cgohlke/geospatial-wheels/releases/download/v2025.7.4/fiona-1.10.1-cp312-cp312-win_amd64.whl"
1110
rasterio_wheel_url = "https://github.com/cgohlke/geospatial-wheels/releases/download/v2025.7.4/rasterio-1.4.3-cp312-cp312-win_amd64.whl"
12-
python_zip = "https://www.python.org/ftp/python/3.12.10/python-3.12.10-embed-amd64.zip"
11+
python_zip = "https://www.python.org/ftp/python/3.12.9/python-3.12.9-embed-amd64.zip"
1312

1413
def main():
1514
# Fiona and rasterio are easy, just download the wheels
@@ -27,7 +26,8 @@ def main():
2726

2827
# Unpack the wheel into a directory
2928
gdal_wheel_dir = f"gdal-{gdal_version}"
30-
unpack(gdal_wheel)
29+
with ZipFile(gdal_wheel, 'r') as zip:
30+
zip.extractall(gdal_wheel_dir)
3131
os.remove(gdal_wheel)
3232

3333
# Read the names of include files we need to add to the whl
@@ -53,7 +53,7 @@ def main():
5353
os.rename(filename, os.path.join(include_dir, filename.split("/")[-1]))
5454

5555
# Special handling for gdal_version.h
56-
filename = os.path.join(gdal_wheel_dir, "gcore", "gdal_version.h.in")
56+
filename = f"{gdal_wheel_dir}/gcore/gdal_version.h.in"
5757
zip.extract(filename, ".")
5858
os.rename(filename, os.path.join(include_dir, "gdal_version.h"))
5959

@@ -63,7 +63,8 @@ def main():
6363
os.remove(gdal_src_zip)
6464

6565
# Repackage the wheel
66-
pack(gdal_wheel_dir, dest_dir=".", build_number=None)
66+
with WheelFile(gdal_wheel, 'w') as wf:
67+
wf.write_files(gdal_wheel_dir)
6768
shutil.rmtree(gdal_wheel_dir)
6869

6970

vcpkg.json

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,10 @@
2525
"cgal",
2626
"yasm-tool",
2727
"metis",
28+
"python3",
2829
"pybind11"
2930
],
30-
"builtin-baseline": "6ecbbbdf31cba47aafa7cf6189b1e73e10ac61f8",
31+
"builtin-baseline": "6b68ff33240209010db42256d3f5c3a3c58273fb",
3132
"overrides": [
3233
{ "name": "eigen3", "version": "3.4.0#5" },
3334
{ "name": "suitesparse", "version": "5.8.0" },
@@ -41,19 +42,20 @@
4142
{ "name": "libjpeg-turbo", "version": "3.1.1" },
4243
{ "name": "tiff", "version": "4.7.0" },
4344
{ "name": "flann", "version": "2022-10-28" },
44-
{ "name": "boost-filesystem", "version": "1.88.0" },
45-
{ "name": "boost-date-time", "version": "1.88.0" },
46-
{ "name": "boost-iostreams", "version": "1.88.0" },
47-
{ "name": "boost-foreach", "version": "1.88.0" },
48-
{ "name": "boost-signals2", "version": "1.88.0" },
49-
{ "name": "boost-interprocess", "version": "1.88.0" },
50-
{ "name": "boost-graph", "version": "1.88.0" },
51-
{ "name": "boost-asio", "version": "1.88.0" },
52-
{ "name": "boost-program-options", "version": "1.88.0" },
45+
{ "name": "boost-filesystem", "version": "1.90.0" },
46+
{ "name": "boost-date-time", "version": "1.90.0" },
47+
{ "name": "boost-iostreams", "version": "1.90.0" },
48+
{ "name": "boost-foreach", "version": "1.90.0" },
49+
{ "name": "boost-signals2", "version": "1.90.0" },
50+
{ "name": "boost-interprocess", "version": "1.90.0" },
51+
{ "name": "boost-graph", "version": "1.90.0" },
52+
{ "name": "boost-asio", "version": "1.90.0" },
53+
{ "name": "boost-program-options", "version": "1.90.0" },
5354
{ "name": "libgeotiff", "version": "1.7.4" },
5455
{ "name": "cgal", "version": "6.0.1" },
5556
{ "name": "yasm-tool", "version": "2021-12-14" },
5657
{ "name": "metis", "version": "2025-07-04" },
58+
{ "name": "python3", "version": "3.12.9#9" },
5759
{ "name": "pybind11", "version": "3.0.0#1" }
5860
]
5961
}

0 commit comments

Comments
 (0)