From 85c7a33d3746a64fc0b3c280a512a6454b3eeead Mon Sep 17 00:00:00 2001 From: Adam Jacobs Date: Mon, 15 Sep 2025 22:06:18 +0100 Subject: [PATCH 01/10] Update meta.yaml --- packages/libproj/meta.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/libproj/meta.yaml b/packages/libproj/meta.yaml index 42f4d059..03536195 100644 --- a/packages/libproj/meta.yaml +++ b/packages/libproj/meta.yaml @@ -1,13 +1,13 @@ package: name: libproj - version: 9.3.1 + version: 9.6.2 tag: - library - - static_library + - shared_library - cmake source: - sha256: b0f919cb9e1f42f803a3e616c2b63a78e4d81ecfaed80978d570d3a5e29d10bc - url: https://download.osgeo.org/proj/proj-9.3.1.tar.gz + sha256: 53d0cafaee3bb2390264a38668ed31d90787de05e71378ad7a8f35bb34c575d1 + url: https://download.osgeo.org/proj/proj-9.6.2.tar.gz patches: - patches/0001-stod-empty-zero.patch @@ -18,7 +18,7 @@ requirements: - sqlite3 build: - type: static_library + type: shared_library script: | mkdir -p build @@ -31,7 +31,7 @@ build: -DCMAKE_BUILD_TYPE=Release \ -DENABLE_CURL=OFF \ -DBUILD_APPS=OFF \ - -DBUILD_SHARED_LIBS=OFF \ + -DBUILD_SHARED_LIBS=ON \ -DBUILD_TESTING=OFF \ -DTIFF_INCLUDE_DIR=$WASM_LIBRARY_DIR/include \ -DTIFF_LIBRARY=$WASM_LIBRARY_DIR/lib/libtiff.a \ From ae022174d9431b29581f183aea6067943d69ccd7 Mon Sep 17 00:00:00 2001 From: Adam Jacobs Date: Mon, 15 Sep 2025 22:09:47 +0100 Subject: [PATCH 02/10] Update meta.yaml --- packages/pyproj/meta.yaml | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/packages/pyproj/meta.yaml b/packages/pyproj/meta.yaml index eadf42dd..9626ed9e 100644 --- a/packages/pyproj/meta.yaml +++ b/packages/pyproj/meta.yaml @@ -1,14 +1,11 @@ package: name: pyproj - version: 3.6.1 - # 3.7 has function signature mismatch - _disabled: true - pinned: true + version: 3.7.2 top-level: - pyproj source: - url: https://files.pythonhosted.org/packages/7d/84/2b39bbf888c753ea48b40d47511548c77aa03445465c35cc4c4e9649b643/pyproj-3.6.1.tar.gz - sha256: 44aa7c704c2b7d8fb3d483bbf75af6cb2350d30a63b144279a09b75fead501bf + url: https://files.pythonhosted.org/packages/04/90/67bd7260b4ea9b8b20b4f58afef6c223ecb3abf368eb4ec5bc2cdef81b49/pyproj-3.7.2.tar.gz + sha256: 39a0cf1ecc7e282d1d30f36594ebd55c9fae1fda8a2622cee5d100430628f88c requirements: host: @@ -21,18 +18,14 @@ build: script: | embuilder build sqlite3 --pic - export PROJ_VERSION=9.3.1 + export PROJ_VERSION=9.6.2 export PROJ_DIR=${WASM_LIBRARY_DIR} export PROJ_INCDIR=${WASM_LIBRARY_DIR}/include export PROJ_LIBDIR=${WASM_LIBRARY_DIR}/lib export PROJ_WHEEL=1 mkdir -p pyproj/proj_dir/share cp -r ${WASM_LIBRARY_DIR}/share/proj pyproj/proj_dir/share - cflags: | - -sUSE_SQLITE3 - ldflags: | - -sUSE_SQLITE3 - -lsqlite3 + vendor-sharedlib: true test: imports: - pyproj From 4a612d324b389a94723d59eb28da6a1103b8a591 Mon Sep 17 00:00:00 2001 From: Adam Jacobs Date: Mon, 15 Sep 2025 22:40:03 +0100 Subject: [PATCH 03/10] Update meta.yaml --- packages/Cartopy/meta.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/Cartopy/meta.yaml b/packages/Cartopy/meta.yaml index ac7dd036..ca955ae0 100644 --- a/packages/Cartopy/meta.yaml +++ b/packages/Cartopy/meta.yaml @@ -1,11 +1,11 @@ package: name: Cartopy - version: 0.24.1 + version: 0.25.0 top-level: - cartopy source: - url: https://files.pythonhosted.org/packages/e0/75/94aff4fef338887641aa780d13795609861e6e9f9593bd66d4917ab7954b/cartopy-0.24.1.tar.gz - sha256: 01c910d5634c69a7efdec46e0a17d473d2328767f001d4dc0b5c4b48e585c8bd + url: https://files.pythonhosted.org/packages/3c/3f/ec3dee34237b696a486d566a6d3ae6550ae821836e0412bafdcbbec2cfd2/cartopy-0.25.0.tar.gz + sha256: 55f1a390e5f3f075b221c7d91fb10258ad978db786c7930eba06eb45d28753fe test: imports: - cartopy From 9f811ee8bf55777c1c741cdba86fe8f99b7687f7 Mon Sep 17 00:00:00 2001 From: Adam Jacobs Date: Mon, 15 Sep 2025 22:41:02 +0100 Subject: [PATCH 04/10] Update meta.yaml --- packages/geopandas/meta.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/geopandas/meta.yaml b/packages/geopandas/meta.yaml index 6d1c9f91..2de8773c 100644 --- a/packages/geopandas/meta.yaml +++ b/packages/geopandas/meta.yaml @@ -1,11 +1,11 @@ package: name: geopandas - version: 1.0.1 + version: 1.1.1 top-level: - geopandas source: - url: https://files.pythonhosted.org/packages/c4/64/7d344cfcef5efddf9cf32f59af7f855828e9d74b5f862eddf5bfd9f25323/geopandas-1.0.1-py3-none-any.whl - sha256: 01e147d9420cc374d26f51fc23716ac307f32b49406e4bd8462c07e82ed1d3d6 + url: https://files.pythonhosted.org/packages/8c/76/e1960ba846f153ab109575242abf89dc98f8e057faa32f3decf4cce9247a/geopandas-1.1.1.tar.gz + sha256: 1745713f64d095c43e72e08e753dbd271678254b24f2e01db8cdb8debe1d293d requirements: run: - shapely From 83fbecf2cf31cb2eb2dc060a26458b0c7857455a Mon Sep 17 00:00:00 2001 From: Adam Jacobs Date: Mon, 15 Sep 2025 23:54:05 +0100 Subject: [PATCH 05/10] Put geopandas back to compiled, hopefully keeps working --- packages/geopandas/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/geopandas/meta.yaml b/packages/geopandas/meta.yaml index 2de8773c..6f08573a 100644 --- a/packages/geopandas/meta.yaml +++ b/packages/geopandas/meta.yaml @@ -4,8 +4,8 @@ package: top-level: - geopandas source: - url: https://files.pythonhosted.org/packages/8c/76/e1960ba846f153ab109575242abf89dc98f8e057faa32f3decf4cce9247a/geopandas-1.1.1.tar.gz - sha256: 1745713f64d095c43e72e08e753dbd271678254b24f2e01db8cdb8debe1d293d + url: https://files.pythonhosted.org/packages/0b/70/d5cd0696eff08e62fdbdebe5b46527facb4e7220eabe0ac6225efab50168/geopandas-1.1.1-py3-none-any.whl + sha256: 589e61aaf39b19828843df16cb90234e72897e2579be236f10eee0d052ad98e8 requirements: run: - shapely From d293060811dbdbc5778f29163980ca0936815c25 Mon Sep 17 00:00:00 2001 From: Adam Jacobs Date: Tue, 16 Sep 2025 11:25:11 +0100 Subject: [PATCH 06/10] Tentatively remove the other sqlite mentions as well Pretty sure we don't need to build the port, less sure we don't need the python package for some reason --- packages/pyproj/meta.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/packages/pyproj/meta.yaml b/packages/pyproj/meta.yaml index 9626ed9e..598ffaff 100644 --- a/packages/pyproj/meta.yaml +++ b/packages/pyproj/meta.yaml @@ -12,12 +12,9 @@ requirements: - libproj run: - certifi - - sqlite3 build: script: | - embuilder build sqlite3 --pic - export PROJ_VERSION=9.6.2 export PROJ_DIR=${WASM_LIBRARY_DIR} export PROJ_INCDIR=${WASM_LIBRARY_DIR}/include From c381b6eb824b9409f53b5d0a6ccf37101e17575e Mon Sep 17 00:00:00 2001 From: Adam Jacobs Date: Tue, 16 Sep 2025 15:21:32 +0100 Subject: [PATCH 07/10] Try with libproj static but sqlite removed from pyproj --- packages/libproj/meta.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/libproj/meta.yaml b/packages/libproj/meta.yaml index 03536195..5621d734 100644 --- a/packages/libproj/meta.yaml +++ b/packages/libproj/meta.yaml @@ -3,7 +3,7 @@ package: version: 9.6.2 tag: - library - - shared_library + - static_library - cmake source: sha256: 53d0cafaee3bb2390264a38668ed31d90787de05e71378ad7a8f35bb34c575d1 @@ -18,7 +18,7 @@ requirements: - sqlite3 build: - type: shared_library + type: static_library script: | mkdir -p build @@ -31,7 +31,7 @@ build: -DCMAKE_BUILD_TYPE=Release \ -DENABLE_CURL=OFF \ -DBUILD_APPS=OFF \ - -DBUILD_SHARED_LIBS=ON \ + -DBUILD_SHARED_LIBS=OFF \ -DBUILD_TESTING=OFF \ -DTIFF_INCLUDE_DIR=$WASM_LIBRARY_DIR/include \ -DTIFF_LIBRARY=$WASM_LIBRARY_DIR/lib/libtiff.a \ From 24ee21169e33fcf54b1bb6053bbdf9504b7e5d60 Mon Sep 17 00:00:00 2001 From: Adam Jacobs Date: Tue, 16 Sep 2025 15:26:27 +0100 Subject: [PATCH 08/10] Remove the vendor-sharedlib as well --- packages/pyproj/meta.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/pyproj/meta.yaml b/packages/pyproj/meta.yaml index 598ffaff..5f5ff479 100644 --- a/packages/pyproj/meta.yaml +++ b/packages/pyproj/meta.yaml @@ -22,7 +22,6 @@ build: export PROJ_WHEEL=1 mkdir -p pyproj/proj_dir/share cp -r ${WASM_LIBRARY_DIR}/share/proj pyproj/proj_dir/share - vendor-sharedlib: true test: imports: - pyproj From 45c7eb751f38cd5c8805748f23c459ee8fae529d Mon Sep 17 00:00:00 2001 From: Adam Jacobs Date: Tue, 16 Sep 2025 18:58:32 +0100 Subject: [PATCH 09/10] Revert --- packages/libproj/meta.yaml | 6 +++--- packages/pyproj/meta.yaml | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/packages/libproj/meta.yaml b/packages/libproj/meta.yaml index 5621d734..03536195 100644 --- a/packages/libproj/meta.yaml +++ b/packages/libproj/meta.yaml @@ -3,7 +3,7 @@ package: version: 9.6.2 tag: - library - - static_library + - shared_library - cmake source: sha256: 53d0cafaee3bb2390264a38668ed31d90787de05e71378ad7a8f35bb34c575d1 @@ -18,7 +18,7 @@ requirements: - sqlite3 build: - type: static_library + type: shared_library script: | mkdir -p build @@ -31,7 +31,7 @@ build: -DCMAKE_BUILD_TYPE=Release \ -DENABLE_CURL=OFF \ -DBUILD_APPS=OFF \ - -DBUILD_SHARED_LIBS=OFF \ + -DBUILD_SHARED_LIBS=ON \ -DBUILD_TESTING=OFF \ -DTIFF_INCLUDE_DIR=$WASM_LIBRARY_DIR/include \ -DTIFF_LIBRARY=$WASM_LIBRARY_DIR/lib/libtiff.a \ diff --git a/packages/pyproj/meta.yaml b/packages/pyproj/meta.yaml index 5f5ff479..598ffaff 100644 --- a/packages/pyproj/meta.yaml +++ b/packages/pyproj/meta.yaml @@ -22,6 +22,7 @@ build: export PROJ_WHEEL=1 mkdir -p pyproj/proj_dir/share cp -r ${WASM_LIBRARY_DIR}/share/proj pyproj/proj_dir/share + vendor-sharedlib: true test: imports: - pyproj From c5ca27a84991a9b8aa6d0dbf6f5d0a6d704cfc41 Mon Sep 17 00:00:00 2001 From: Adam Jacobs Date: Sat, 20 Sep 2025 13:18:43 +0100 Subject: [PATCH 10/10] Bring proj in as libgdal run dependency Can't reproduce the issue locally so a bit suspicious of this --- packages/libgdal/meta.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/libgdal/meta.yaml b/packages/libgdal/meta.yaml index d7f1200e..fd53e1fb 100644 --- a/packages/libgdal/meta.yaml +++ b/packages/libgdal/meta.yaml @@ -14,6 +14,7 @@ requirements: - libiconv - libgeos run: + - libproj - libgeos build: @@ -42,7 +43,7 @@ build: -DGDAL_USE_INTERNAL_LIBS=OFF \ \ -DPROJ_INCLUDE_DIR=$WASM_LIBRARY_DIR/include \ - -DPROJ_LIBRARY=$WASM_LIBRARY_DIR/lib/libproj.a \ + -DPROJ_LIBRARY=$WASM_LIBRARY_DIR/lib/libproj.so \ \ -DGDAL_USE_ICONV=ON \ -DIconv_INCLUDE_DIR=$WASM_LIBRARY_DIR/include \