Merge remote-tracking branch 'origin/integration' into experimental_p…

…ython313

.github/workflows/integration_tests.sh

@@ -7,4 +7,5 @@ cd /src
 
 
     yum -y localinstall ./rpms/metwork-mfext*.rpm
+    yum -y install diffutils
     if test -d "integration_tests"; then cd integration_tests; /opt/metwork-mfext/bin/mfext_wrapper ./run_integration_tests.sh; cd ..; fi

.metwork-framework/components.md

@@ -77,7 +77,7 @@
 | [freezegun](https://github.com/spulec/freezegun) | 1.5.1 | python3_devtools |
 | [frozenlist](https://github.com/aio-libs/frozenlist) | 1.5.0 | python3 |
 | [fsspec](https://github.com/fsspec/filesystem_spec) | 2023.9.2 | python3 |
-| [gdal](http://www.gdal.org) | 3.8.3 | scientific_core |
+| [gdal](http://www.gdal.org) | 3.9.3 | scientific_core |
 | [geojson](https://github.com/jazzband/geojson) | 3.1.0 | python3 |
 | [geos](http://trac.osgeo.org/geos/) | 3.12.0 | scientific_core |
 | [ghp-import](https://github.com/c-w/ghp-import) | 2.1.0 | python3_devtools |
@@ -119,6 +119,7 @@
 | [libevent](https://libevent.org/) | 2.1.12 | core |
 | [libgeotiff](https://github.com/OSGeo/libgeotiff) | 1.7.1 | scientific_core |
 | [libspatialite](https://www.gaia-gis.it/fossil/libspatialite) | 5.1.0 | scientific_core |
+| [libtiff](http://www.libtiff.org) | 4.7.0 | scientific_core |
 | [libtirpc](https://sourceforge.net/projects/libtirpc/) | 1.3.3 | core |
 | [libtree](https://github.com/haampie/libtree) | 3.1.1 | devtools |
 | [liquidprompt](https://github.com/nojhan/liquidprompt) | 2.1.2 | core |
@@ -191,7 +192,7 @@
 | [postgresql](http://postgresql.org/) | 16.1 | scientific_core |
 | [poyo](https://github.com/hackebrot/poyo) | 0.5.0 | python3 |
 | [pre_commit](https://github.com/pre-commit/pre-commit) | 4.0.1 | python3_devtools |
-| [proj](http://trac.osgeo.org/proj/) | 9.5.0 | scientific_core |
+| [proj](http://trac.osgeo.org/proj/) | 9.5.1 | scientific_core |
 | [prompt_toolkit](https://github.com/prompt-toolkit/python-prompt-toolkit) | 3.0.36 | python3 |
 | [protobuf-c](https://github.com/protobuf-c) | 1.4.1 | scientific_core |
 | [protobuf](https://developers.google.com/protocol-buffers) | 3.20.3 | scientific_core |
@@ -305,4 +306,4 @@
 | [zeromq](https://zeromq.org/) | 4.3.4 | core |
 | [zipp](https://github.com/jaraco/zipp) | 3.19.2 | python3_core |
 
-*(304 components)*
+*(305 components)*

CHANGELOG.md

@@ -88,6 +88,11 @@
 - upgrade trove-classifiers to 2024.10.16 (for Pillow 11.0.0) (#1992)
 - bump aiohttp to 3.10.11 (CVE-2024-52304) and yarl to 1.12.1 (#1994)
 - bump tornado from 6.4.1 to 6.4.2 (fix CVE-2024-52804) (#1997)
+- upgrade jinja2-shell-extension to last release 2.1.0 (#1998)
+- patch to fix ag build with gcc >=10 (#1999)
+- build with gcc 11 with patch for the_silver_searcher (#2000)
+- bump Python 3.12 from 3.12.7 to 3.12.8 (#2002)
+- upgrade packaging from 23.1 to 24.2 (for recent xarray release) (#2006)
 
 ### Bug Fixes
 
@@ -100,5 +105,6 @@
 - remove pip conflicts warnings when using override (#1840)
 - upgrade xattrfile to fix mfdata issue 486 (#1935)
 - bump to paramiko 3.4.1 to prevent warning messages with cryptography (#1949)
+- add patches for next 9.5.1 release (#2007)
 
 

integration_tests/0003_check_proj_MF/.layerapi2_dependencies

@@ -0,0 +1 @@
+scientific_core@mfext

integration_tests/0003_check_proj_MF/list-crs-MF-ref

@@ -0,0 +1,16 @@
+EPSG:900914 "Stéréo Nord 0"
+EPSG:900917 "Stéréo Nord -155"
+EPSG:900918 "Stéréo Sud -141.7"
+EPSG:900919 "Stéréo Nord -103"
+EPSG:900920 "Stéréo Nord -45"
+EPSG:900921 "Stéréo Nord -20"
+EPSG:900922 "Stéréo Nord 11.1"
+EPSG:900923 "Stéréo Nord 65"
+EPSG:900924 "Stéréo Sud 96.7"
+EPSG:900925 "Stéréo Nord -65"
+EPSG:900926 "Stéréo Nord -50"
+EPSG:900927 "Stéréo Nord -35"
+EPSG:900928 "Stéréo Nord -30"
+EPSG:900929 "Stéréo Nord -25"
+EPSG:900930 "Stéréo Nord 5"
+MF:30 "MF Stéréo"

integration_tests/0003_check_proj_MF/test_proj_MF_ok.sh

@@ -0,0 +1,10 @@
+#!/bin/bash
+
+projinfo --list-crs | grep "Stéréo" > list-crs-MF
+diff list-crs-MF list-crs-MF-ref
+if [ $? != 0 ]; then
+    echo "error in list crs MF"
+    rm -f list-crs-MF
+    exit 1
+fi
+rm -f list-crs-MF

integration_tests/0096_system_extra_dependencies/list.txt

@@ -16,6 +16,7 @@ libcom_err.so.2
 libcroco-0.6.so.3
 libcrypt.so.1
 libcrypt.so.2
+libcrypto.so.1.1
 libcrypto.so.3
 libdatrie.so.1
 libdl.so.2

integration_tests/0096_system_extra_dependencies/list_ok_not_found.txt

@@ -1 +1,2 @@
 libcuda.so.1
+liblttng-ust.so.0

layers/layer1_scientific_core/0001_scientific_system_libraries/libraries.txt

@@ -10,5 +10,3 @@
 /usr/lib64/libopenjp2.so.2.4.0
 /usr/lib64/libsz.so.2
 /usr/lib64/libsz.so.2.0.1
-/usr/lib64/libtiff.so.5
-/usr/lib64/libtiff.so.5.3.0

layers/layer1_scientific_core/0004_libtiff/Makefile

@@ -0,0 +1,2 @@
+include ../../../adm/root.mk
+include ../../layer_wrapper.mk

layers/layer1_scientific_core/0004_libtiff/Makefile.mk

@@ -0,0 +1,17 @@
+include ../../../adm/root.mk
+include ../../package.mk
+
+export NAME=libtiff
+export VERSION=4.7.0
+export EXTENSION=tar.gz
+export CHECKTYPE=MD5
+export CHECKSUM=3a0fa4a270a4a192b08913f88d0cfbdd
+DESCRIPTION=\
+LIBTIFF provides support for the Tag Image File Format (TIFF), a widely used format for storing image data
+WEBSITE=http://www.libtiff.org
+LICENSE=https://spdx.org/licenses/libtiff.html
+EXPLICIT_NAME=tiff-$(VERSION)
+
+all:: $(PREFIX)/lib/libtiff.so.6
+$(PREFIX)/lib/libtiff.so.6:
+	$(MAKE) --file=../../Makefile.standard PREFIX=$(PREFIX) EXPLICIT_NAME=$(EXPLICIT_NAME) download uncompress configure_cmake build_cmake install_cmake

layers/layer1_scientific_core/0004_libtiff/sources

@@ -0,0 +1 @@
+https://download.osgeo.org/libtiff/tiff-4.7.0.tar.gz

layers/layer1_scientific_core/0015_proj/Makefile.mk

@@ -2,10 +2,10 @@ include ../../../adm/root.mk
 include ../../package.mk
 
 export NAME=proj
-export VERSION=9.5.0
+export VERSION=9.5.1
 export EXTENSION=tar.gz
 export CHECKTYPE=MD5
-export CHECKSUM=ac46b4e31562890d012ea6b31e579cf6
+export CHECKSUM=07c44ca4a65a0664ce823c8448707c78
 DESCRIPTION=\
 PROJ4 is a generic coordinate transformation software that transforms geospatial coordinates \
 from one coordinate reference system (CRS) to another.

layers/layer1_scientific_core/0015_proj/no_expected_md5.patch

@@ -0,0 +1,12 @@
+diff -up proj-9.5.1/data/generate_proj_db.cmake.orig proj-9.5.1/data/generate_proj_db.cmake
+--- proj-9.5.1/data/generate_proj_db.cmake.orig	2024-12-12 16:29:48.790536754 +0000
++++ proj-9.5.1/data/generate_proj_db.cmake	2024-12-12 16:30:45.544514251 +0000
+@@ -41,8 +41,6 @@ if (NOT "${PROJ_DB_SQL_MD5}" STREQUAL "$
+                     RESULT_VARIABLE STATUS)
+     if(STATUS AND NOT STATUS EQUAL 0)
+       message(FATAL_ERROR "Build of proj.db from ${ALL_SQL_IN_EXTRA_VALIDATION} failed")
+-    else()
+-      message(FATAL_ERROR "Update 'set(PROJ_DB_SQL_EXPECTED_MD5 ...)' line in data/CMakeLists.txt with ${PROJ_DB_SQL_MD5} value")
+     endif()
+ endif()
+

layers/layer1_scientific_core/0015_proj/patches

@@ -1 +1,2 @@
-proj-9.5.0+mf+1.patch
+proj-9.5.1+mf+1.patch
+no_expected_md5.patch