From 4f7237f00d802d6de84d3a2d1cc0014c131a00f0 Mon Sep 17 00:00:00 2001 From: Nabil Ghodbane Date: Thu, 29 Feb 2024 16:22:37 +0100 Subject: [PATCH] implement a try/except for gdal-2.4.0 python wrapper --- applications/SALOME-master.pyconf | 2 +- .../patches/gdal.0003-ignore_use2to3.patch | 22 +++++++++++-------- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/applications/SALOME-master.pyconf b/applications/SALOME-master.pyconf index 9c0fe2d..f11b2ac 100644 --- a/applications/SALOME-master.pyconf +++ b/applications/SALOME-master.pyconf @@ -65,7 +65,7 @@ APPLICATION : mpc : 'native' gmp : 'native' mpfr : 'native' - gdal : {tag:'2.4.0', base: 'no', section: 'version_2_4_0' } + gdal : '2.4.0' gmsh : '4.10.3' graphviz : '2.38.0' hdf5 : '1.10.3' diff --git a/products/patches/gdal.0003-ignore_use2to3.patch b/products/patches/gdal.0003-ignore_use2to3.patch index 52045b3..170c651 100644 --- a/products/patches/gdal.0003-ignore_use2to3.patch +++ b/products/patches/gdal.0003-ignore_use2to3.patch @@ -1,16 +1,20 @@ -diff -Naur -x '*.o' -x '*.so' -x '*.git' ./gdal/gdal/swig/python/setup.py ./gdal_dev/gdal/swig/python/setup.py ---- gdal/gdal/swig/python/setup.py 2022-01-10 21:49:08.000000000 +0100 -+++ gdal_dev/gdal/swig/python/setup.py 2024-02-09 08:44:01.665009773 +0100 -@@ -129,9 +129,9 @@ +--- gdal-2.4.0-ref/gdal/swig/python/setup.py 2024-02-29 16:16:44.971469916 +0100 ++++ gdal-2.4.0-dev/gdal/swig/python/setup.py 2024-02-29 16:18:30.827527655 +0100 +@@ -128,11 +128,12 @@ + all_fixers = set(get_fixers_from_package('lib2to3.fixes')) exclude_fixers = sorted(all_fixers.difference(fixer_names)) - +- - extra['use_2to3'] = True - extra['use_2to3_fixers'] = [] - extra['use_2to3_exclude_fixers'] = exclude_fixers -+ #extra['use_2to3'] = True -+ #extra['use_2to3_fixers'] = [] -+ #extra['use_2to3_exclude_fixers'] = exclude_fixers - +- ++ try: ++ extra['use_2to3'] = True ++ extra['use_2to3_fixers'] = [] ++ extra['use_2to3_exclude_fixers'] = exclude_fixers ++ except: ++ print("WARNING: could not set extra dictionary keys values: use_2to3!") class gdal_config_error(Exception): + pass -- 2.39.2