From b8ce431d17131666f50418b2cea72a3413bf59f1 Mon Sep 17 00:00:00 2001 From: Guytri KASTANE Date: Tue, 20 Feb 2024 08:58:29 +0100 Subject: [PATCH] spns #40695: update python packages configuration --- applications/SALOME-master.pyconf | 64 +++++++++++-------- products/Pygments.pyconf | 1 + products/Sphinx.pyconf | 10 ++- products/charset_normalizer.pyconf | 27 ++++++++ products/compil_scripts/sip-5.5.0.sh | 1 + products/contourpy.pyconf | 26 ++++++++ products/env_scripts/charset_normalizer.py | 9 +++ products/env_scripts/contourpy.py | 9 +++ products/env_scripts/fonttools.py | 9 +++ products/env_scripts/importlib_metadata.py | 9 +++ products/env_scripts/importlib_resources.py | 9 +++ products/env_scripts/sphinxcontrib_jquery.py | 9 +++ products/env_scripts/tabulate.py | 9 +++ products/env_scripts/tomli.py | 9 +++ products/env_scripts/zipp.py | 9 +++ products/fonttools.pyconf | 26 ++++++++ products/gdal.pyconf | 9 ++- products/importlib_metadata.pyconf | 27 ++++++++ products/importlib_resources.pyconf | 27 ++++++++ products/matplotlib.pyconf | 9 ++- products/mpi4py.pyconf | 11 ++++ products/numpydoc.pyconf | 2 +- .../patches/gdal.0003-ignore_use2to3.patch | 16 +++++ products/patches/mpi4py_3_1_0_setup_py.patch | 12 ++++ products/requests.pyconf | 2 +- products/sip.pyconf | 2 +- products/sphinx_rtd_theme.pyconf | 2 +- products/sphinxcontrib_applehelp.pyconf | 1 + products/sphinxcontrib_devhelp.pyconf | 1 + products/sphinxcontrib_htmlhelp.pyconf | 1 + products/sphinxcontrib_jquery.pyconf | 27 ++++++++ products/sphinxcontrib_jsmath.pyconf | 1 + products/sphinxcontrib_qthelp.pyconf | 1 + products/sphinxcontrib_serializinghtml.pyconf | 1 + products/sphinxintl.pyconf | 4 +- products/statsmodels.pyconf | 2 +- products/tabulate.pyconf | 26 ++++++++ products/tomli.pyconf | 26 ++++++++ products/zipp.pyconf | 26 ++++++++ 39 files changed, 434 insertions(+), 38 deletions(-) create mode 100644 products/charset_normalizer.pyconf create mode 100644 products/contourpy.pyconf create mode 100644 products/env_scripts/charset_normalizer.py create mode 100644 products/env_scripts/contourpy.py create mode 100644 products/env_scripts/fonttools.py create mode 100644 products/env_scripts/importlib_metadata.py create mode 100644 products/env_scripts/importlib_resources.py create mode 100644 products/env_scripts/sphinxcontrib_jquery.py create mode 100644 products/env_scripts/tabulate.py create mode 100644 products/env_scripts/tomli.py create mode 100644 products/env_scripts/zipp.py create mode 100644 products/fonttools.pyconf create mode 100644 products/importlib_metadata.pyconf create mode 100644 products/importlib_resources.pyconf create mode 100644 products/patches/gdal.0003-ignore_use2to3.patch create mode 100644 products/patches/mpi4py_3_1_0_setup_py.patch create mode 100644 products/sphinxcontrib_jquery.pyconf create mode 100644 products/tabulate.pyconf create mode 100644 products/tomli.pyconf create mode 100644 products/zipp.pyconf diff --git a/applications/SALOME-master.pyconf b/applications/SALOME-master.pyconf index 58864d5..5abca7e 100644 --- a/applications/SALOME-master.pyconf +++ b/applications/SALOME-master.pyconf @@ -36,7 +36,7 @@ APPLICATION : { # PREREQUISITES : alabaster : '0.7.6' - Babel : '2.7.0' + Babel : '2.14.0' boost : '1.71.0' CAS : {tag : 'V7_5_3p5', section: 'version_CR753_SALOME_PATCH', base: 'no'} catalyst: '2.0' @@ -44,18 +44,21 @@ APPLICATION : certifi : '2018.8.24' cgns : '4.2.0' chardet : '3.0.4' + charset_normalizer : '3.3.2' click : '6.7' cmake : '3.25.2' cminpack: '1.3.6' + contourpy : '1.2.0' cppunit : '1.13.2' cycler : '0.10.0' Cython : '0.29.12' - dateutil : '2.6.1' - docutils : '0.12' + dateutil : '2.7.3' + docutils : '0.20.1' doxygen : '1.8.14' eigen : '3.3.4' embree : '3.12.2' FMILibrary : '2.0.3' + fonttools : '4.48.1' freeimage : '3.16.0' freetype : '2.9.1' gcc : '8.5.0' @@ -67,19 +70,21 @@ APPLICATION : graphviz : '2.38.0' hdf5 : '1.10.3' idna : '2.7' - imagesize : '1.0.0' + imagesize : '1.4.1' + importlib_metadata : '7.0.1' + importlib_resources: '6.1.1' ispc : '1.15.0' - Jinja2 : '2.7.3' + Jinja2 : '3.1.3' kiwisolver : '1.3.1' lapack : '3.8.0' libxml2 : '2.9.12' llvm : '8.0.1-clang' - markupsafe : '0.23' - matplotlib : '3.3.4' + markupsafe : '2.1.5' + matplotlib : '3.8.2' medfile : '4.1.1' mesa : '19.0.8' MeshGems : '2.15-1' - mpi4py: '3.0.3' + mpi4py: {tag: '3.1.0', base: 'no', section : 'version_3_1_0_no_pip'} #'3.1.5' metis : '5.1.0' netgen : '5.3.1_with_CAS_7.2' # comment out line above and uncomment the line below to use Netgen 6. @@ -88,7 +93,7 @@ APPLICATION : nlopt : '2.5.0' nose: '1.3.7' numpy : '1.21.1' - numpydoc : '0.9.0' + numpydoc : '1.6.0' omniORB : '4.2.5' omniORBpy : '4.2.5' opencv : '3.2.0' @@ -96,48 +101,58 @@ APPLICATION : openturns: '1.21' openVKL: '0.11.0' ospray : '2.4.0' - packaging : '17.1' + packaging : '23.2' packagespy : '74152cd' pandas : '1.1.5' - patsy : '0.5.2' + patsy : '0.5.4' ParaView : {tag:'5.11.0', base: 'no', section: 'version_5_11_0_MPI', hpc: 'yes'} PERSALYS: 'v14.1' petsc : {tag : '3.16.0', base: 'no', section: 'version_3_16_0', hpc: 'yes'} Pillow : '8.4.0' planegcs : '0.18-3cb6890' - psutil : '5.7.2' + psutil : '5.9.8' PyFMI : {tag: '2.6', base: 'no', section: 'version_2_6_no_pip'} - Pygments : '2.0.2' - pyparsing : '2.0.3' + Pygments : '2.17.2' + pyparsing : '3.1.1' PyQt : '5.15.3' pyreadline : '2.0' Python : '3.9.14' pytz : '2017.2' qt : '5.12.10' qwt : '6.1.2' - requests : '2.19.1' + requests : '2.31.0' rkCommon : '1.5.1' root: '6.22.02' salome_system : 'native' scipy : '1.6.2' scotch : {tag: '6.1.2', section: 'version_6_1_2_MPI', hpc: 'yes', base: 'no'} - setuptools : '38.4.0' + setuptools : '69.0.3' sip : '5.5.0' six : '1.10.0' - snowballstemmer : '1.2.1' - Sphinx : '1.7.6' - sphinxcontrib_websupport : '1.1.0' - sphinx_rtd_theme : '0.4.3' + snowballstemmer : '2.2.0' + Sphinx : '7.2.6' + sphinxcontrib_applehelp : '1.0.8' + sphinxcontrib_devhelp : '1.0.6' + sphinxcontrib_jsmath : '1.0.1' + sphinxcontrib_jquery : '4.1' + sphinxcontrib_qthelp : '1.0.7' + sphinxcontrib_htmlhelp : '2.0.5' + sphinxcontrib_serializinghtml : '1.1.10' + sphinxcontrib_websupport : '1.2.7' + sphinx_rtd_theme : '2.0.0' sphinxintl: '0.9.10' - statsmodels: '0.8.0' + statsmodels: '0.14.1' swig : '4.0.2' + tabulate : '0.9.0' tbb : '2019_U8' tcl : '8.6.0' tk : '8.6.0' toml: '0.10.2' + tomli : '2.0.1' TTK : 'f8dafde2d7' urllib3 : '1.23' zeromq: '4.3.1' + zipp : '3.17.0' URANIE : '4.7.0' # SALOME MODULES : @@ -223,12 +238,9 @@ __overwrite__ : { __condition__ : "VARS.dist in ['CO7']" 'APPLICATION.rm_products' : ['gcc', 'gmp', 'mpc', 'mpfr'] - 'APPLICATION.products.boost' : {tag: '1.71.0', base: 'no', section: 'version_1_71_0_CO7' } - 'APPLICATION.products.pandas' : {tag: '1.1.5', base: 'no', section: 'version_1_1_5_no_pip'} - 'APPLICATION.products.statsmodels': {tag: '0.6.1', base: 'no', section: 'version_0_6_1_no_pip' } - 'APPLICATION.products.matplotlib' : {tag: '3.3.4', base: 'no', section : 'version_3_3_5_no_pip'} - 'APPLICATION.products.mpi4py' : {tag: '3.0.3', base: 'no', section : 'version_3_0_3_no_pip'} + 'APPLICATION.products.gdal' : {tag:'2.4.0', base: 'no', section: 'version_2_4_0_CO7' } 'APPLICATION.products.openturns' : {tag: '1.21', base: 'no', section: 'version_1_21_CO7' } + #'APPLICATION.products.boost' : {tag: '1.71.0', base: 'no', section: 'version_1_71_0_CO7' } } { __condition__ : "VARS.dist in ['CO8']" diff --git a/products/Pygments.pyconf b/products/Pygments.pyconf index f3a8917..4fd2a0f 100644 --- a/products/Pygments.pyconf +++ b/products/Pygments.pyconf @@ -4,6 +4,7 @@ default : build_source : "script" compil_script : "pip_install" + $VARS.scriptExtension get_source : "archive" + archive_info : {archive_prefix : "pygments"} system_info : { rpm : ["python3-pygments"] diff --git a/products/Sphinx.pyconf b/products/Sphinx.pyconf index b6c9bbf..67f9ddc 100644 --- a/products/Sphinx.pyconf +++ b/products/Sphinx.pyconf @@ -4,6 +4,7 @@ default : build_source : "script" compil_script : 'pip_install' + $VARS.scriptExtension get_source : "archive" + archive_info : {archive_prefix : "sphinx"} system_info : { rpm : ["python3-sphinx"] @@ -15,7 +16,14 @@ default : { env_script : $name + ".py" } - depend : ["Python", "setuptools", "six", "Pygments", "Jinja2", "docutils", "sphinxcontrib_websupport", "packaging", "requests", "imagesize", "alabaster", "Babel", "snowballstemmer"] + depend : ["Python", "setuptools", "six", "Pygments", + "Jinja2", "docutils", "importlib_metadata", + "packaging", "requests", "imagesize", "alabaster", + "Babel", "snowballstemmer", "sphinxcontrib_applehelp", + "sphinxcontrib_devhelp", "sphinxcontrib_htmlhelp", + "sphinxcontrib_jsmath", "sphinxcontrib_qthelp", + "sphinxcontrib_serializinghtml" + ] source_dir : $APPLICATION.workdir + $VARS.sep + 'SOURCES' + $VARS.sep + $name build_dir : $APPLICATION.workdir + $VARS.sep + 'BUILD' + $VARS.sep + $name install_dir : 'base' diff --git a/products/charset_normalizer.pyconf b/products/charset_normalizer.pyconf new file mode 100644 index 0000000..8e9c42d --- /dev/null +++ b/products/charset_normalizer.pyconf @@ -0,0 +1,27 @@ +default : +{ + name : "charset-normalizer" + build_source : "script" + compil_script : 'pip_install' + $VARS.scriptExtension + get_source : "archive" + archive_info : {archive_prefix : "charset_normalizer"} + environ : + { + env_script : "charset_normalizer.py" + } + depend : ['Python','setuptools'] + source_dir : $APPLICATION.workdir + $VARS.sep + 'SOURCES' + $VARS.sep + "charset_normalizer" + build_dir : $APPLICATION.workdir + $VARS.sep + 'BUILD' + $VARS.sep + "charset_normalizer" + install_dir : 'base' + properties: + { + incremental : "yes" + pip : "yes" + } +} + +default_win : +{ + compil_script : 'pip_install_whl' + $VARS.scriptExtension + archive_info : {archive_name : "charset_normalizer-" + $APPLICATION.products.charset_normalizer + "_windows.tar.gz"} +} diff --git a/products/compil_scripts/sip-5.5.0.sh b/products/compil_scripts/sip-5.5.0.sh index 732b9ef..dfee489 100755 --- a/products/compil_scripts/sip-5.5.0.sh +++ b/products/compil_scripts/sip-5.5.0.sh @@ -48,6 +48,7 @@ if [ "$USE_SETUP" == "true" ]; then exit 3 fi else + echo "*** $PYTHONBIN -m pip install --cache-dir=$BUILD_DIR/cache/pip . --no-deps --prefix=$PRODUCT_INSTALL" $PYTHONBIN -m pip install --cache-dir=$BUILD_DIR/cache/pip . --no-deps --prefix=$PRODUCT_INSTALL if [ $? -ne 0 ] then diff --git a/products/contourpy.pyconf b/products/contourpy.pyconf new file mode 100644 index 0000000..308c09b --- /dev/null +++ b/products/contourpy.pyconf @@ -0,0 +1,26 @@ +default : +{ + name : "contourpy" + build_source : "script" + compil_script : 'pip_install' + $VARS.scriptExtension + get_source : "archive" + environ : + { + env_script : "contourpy.py" + } + depend : ['Python','setuptools','numpy'] + source_dir : $APPLICATION.workdir + $VARS.sep + 'SOURCES' + $VARS.sep + "contourpy" + build_dir : $APPLICATION.workdir + $VARS.sep + 'BUILD' + $VARS.sep + "contourpy" + install_dir : 'base' + properties: + { + incremental : "yes" + pip : "yes" + } +} + +default_win : +{ + compil_script : 'pip_install_whl' + $VARS.scriptExtension + archive_info : {archive_name : "contourpy-" + $APPLICATION.products.contourpy + "_windows.tar.gz"} +} diff --git a/products/env_scripts/charset_normalizer.py b/products/env_scripts/charset_normalizer.py new file mode 100644 index 0000000..1fcaa44 --- /dev/null +++ b/products/env_scripts/charset_normalizer.py @@ -0,0 +1,9 @@ +#!/usr/bin/env python +#-*- coding:utf-8 -*- + +import os + +def set_env(env, prereq_dir, version): + pass +def set_nativ_env(env): + pass diff --git a/products/env_scripts/contourpy.py b/products/env_scripts/contourpy.py new file mode 100644 index 0000000..1fcaa44 --- /dev/null +++ b/products/env_scripts/contourpy.py @@ -0,0 +1,9 @@ +#!/usr/bin/env python +#-*- coding:utf-8 -*- + +import os + +def set_env(env, prereq_dir, version): + pass +def set_nativ_env(env): + pass diff --git a/products/env_scripts/fonttools.py b/products/env_scripts/fonttools.py new file mode 100644 index 0000000..1fcaa44 --- /dev/null +++ b/products/env_scripts/fonttools.py @@ -0,0 +1,9 @@ +#!/usr/bin/env python +#-*- coding:utf-8 -*- + +import os + +def set_env(env, prereq_dir, version): + pass +def set_nativ_env(env): + pass diff --git a/products/env_scripts/importlib_metadata.py b/products/env_scripts/importlib_metadata.py new file mode 100644 index 0000000..1fcaa44 --- /dev/null +++ b/products/env_scripts/importlib_metadata.py @@ -0,0 +1,9 @@ +#!/usr/bin/env python +#-*- coding:utf-8 -*- + +import os + +def set_env(env, prereq_dir, version): + pass +def set_nativ_env(env): + pass diff --git a/products/env_scripts/importlib_resources.py b/products/env_scripts/importlib_resources.py new file mode 100644 index 0000000..1fcaa44 --- /dev/null +++ b/products/env_scripts/importlib_resources.py @@ -0,0 +1,9 @@ +#!/usr/bin/env python +#-*- coding:utf-8 -*- + +import os + +def set_env(env, prereq_dir, version): + pass +def set_nativ_env(env): + pass diff --git a/products/env_scripts/sphinxcontrib_jquery.py b/products/env_scripts/sphinxcontrib_jquery.py new file mode 100644 index 0000000..1fcaa44 --- /dev/null +++ b/products/env_scripts/sphinxcontrib_jquery.py @@ -0,0 +1,9 @@ +#!/usr/bin/env python +#-*- coding:utf-8 -*- + +import os + +def set_env(env, prereq_dir, version): + pass +def set_nativ_env(env): + pass diff --git a/products/env_scripts/tabulate.py b/products/env_scripts/tabulate.py new file mode 100644 index 0000000..1fcaa44 --- /dev/null +++ b/products/env_scripts/tabulate.py @@ -0,0 +1,9 @@ +#!/usr/bin/env python +#-*- coding:utf-8 -*- + +import os + +def set_env(env, prereq_dir, version): + pass +def set_nativ_env(env): + pass diff --git a/products/env_scripts/tomli.py b/products/env_scripts/tomli.py new file mode 100644 index 0000000..1fcaa44 --- /dev/null +++ b/products/env_scripts/tomli.py @@ -0,0 +1,9 @@ +#!/usr/bin/env python +#-*- coding:utf-8 -*- + +import os + +def set_env(env, prereq_dir, version): + pass +def set_nativ_env(env): + pass diff --git a/products/env_scripts/zipp.py b/products/env_scripts/zipp.py new file mode 100644 index 0000000..1fcaa44 --- /dev/null +++ b/products/env_scripts/zipp.py @@ -0,0 +1,9 @@ +#!/usr/bin/env python +#-*- coding:utf-8 -*- + +import os + +def set_env(env, prereq_dir, version): + pass +def set_nativ_env(env): + pass diff --git a/products/fonttools.pyconf b/products/fonttools.pyconf new file mode 100644 index 0000000..158b438 --- /dev/null +++ b/products/fonttools.pyconf @@ -0,0 +1,26 @@ +default : +{ + name : "fonttools" + build_source : "script" + compil_script : 'pip_install' + $VARS.scriptExtension + get_source : "archive" + environ : + { + env_script : "fonttools.py" + } + depend : ['Python','setuptools'] + source_dir : $APPLICATION.workdir + $VARS.sep + 'SOURCES' + $VARS.sep + "fonttools" + build_dir : $APPLICATION.workdir + $VARS.sep + 'BUILD' + $VARS.sep + "fonttools" + install_dir : 'base' + properties: + { + incremental : "yes" + pip : "yes" + } +} + +default_win : +{ + compil_script : 'pip_install_whl' + $VARS.scriptExtension + archive_info : {archive_name : "fonttools-" + $APPLICATION.products.fonttools + "_windows.tar.gz"} +} diff --git a/products/gdal.pyconf b/products/gdal.pyconf index bd324f5..6d84e6d 100644 --- a/products/gdal.pyconf +++ b/products/gdal.pyconf @@ -58,10 +58,17 @@ version_2_4_0_CO8: { compil_script : 'gdal-2.4.0.sh' patches : ["gdal.0001-r2000.patch", - "gdal.0002-GNUmakefile-tooLongLine.patch" + "gdal.0002-GNUmakefile-tooLongLine.patch", + "gdal.0003-ignore_use2to3.patch" ] } +version_2_4_0_CO7: +{ + compil_script : 'gdal-2.4.0.sh' + patches : ["gdal.0003-ignore_use2to3.patch"] +} + version_2_4_0_DB10: { compil_script : 'gdal-2.4.0.sh' diff --git a/products/importlib_metadata.pyconf b/products/importlib_metadata.pyconf new file mode 100644 index 0000000..acd2958 --- /dev/null +++ b/products/importlib_metadata.pyconf @@ -0,0 +1,27 @@ +default : +{ + name : "importlib-metadata" + build_source : "script" + compil_script : 'pip_install' + $VARS.scriptExtension + get_source : "archive" + archive_info : {archive_prefix : "importlib_metadata"} + environ : + { + env_script : "importlib_metadata.py" + } + depend : ['Python','setuptools','zipp'] + source_dir : $APPLICATION.workdir + $VARS.sep + 'SOURCES' + $VARS.sep + "importlib_metadata" + build_dir : $APPLICATION.workdir + $VARS.sep + 'BUILD' + $VARS.sep + "importlib_metadata" + install_dir : 'base' + properties: + { + incremental : "yes" + pip : "yes" + } +} + +default_win : +{ + compil_script : 'pip_install_whl' + $VARS.scriptExtension + archive_info : {archive_name : "importlib_metadata-" + $APPLICATION.products.importlib_metadata + "_windows.tar.gz"} +} diff --git a/products/importlib_resources.pyconf b/products/importlib_resources.pyconf new file mode 100644 index 0000000..310008a --- /dev/null +++ b/products/importlib_resources.pyconf @@ -0,0 +1,27 @@ +default : +{ + name : "importlib-resources" + build_source : "script" + compil_script : 'pip_install' + $VARS.scriptExtension + get_source : "archive" + archive_info : {archive_prefix : "importlib_resources"} + environ : + { + env_script : "importlib_resources.py" + } + depend : ['Python','setuptools','zipp'] + source_dir : $APPLICATION.workdir + $VARS.sep + 'SOURCES' + $VARS.sep + "importlib_resources" + build_dir : $APPLICATION.workdir + $VARS.sep + 'BUILD' + $VARS.sep + "importlib_resources" + install_dir : 'base' + properties: + { + incremental : "yes" + pip : "yes" + } +} + +default_win : +{ + compil_script : 'pip_install_whl' + $VARS.scriptExtension + archive_info : {archive_name : "importlib_resources-" + $APPLICATION.products.importlib_resources + "_windows.tar.gz"} +} diff --git a/products/matplotlib.pyconf b/products/matplotlib.pyconf index b6fc437..12b2f93 100755 --- a/products/matplotlib.pyconf +++ b/products/matplotlib.pyconf @@ -16,14 +16,17 @@ default : env_script : $name + ".py" } # OP distribute is not useful anymore - depend : ['Python', 'setuptools', 'PyQt', 'numpy', 'freetype', 'six', 'pytz', 'pyparsing', 'dateutil', 'cycler'] - opt_depend : ['kiwisolver', 'Pillow'] + depend : ['Python', 'setuptools', 'PyQt', 'contourpy', 'fonttools', + 'importlib_resources', 'kiwisolver', 'numpy', 'packaging', + 'Pillow', 'freetype', 'six', 'pytz', 'pyparsing', 'dateutil', 'cycler' + ] + #opt_depend : ['kiwisolver', 'Pillow'] source_dir : $APPLICATION.workdir + $VARS.sep + 'SOURCES' + $VARS.sep + $name build_dir : $APPLICATION.workdir + $VARS.sep + 'BUILD' + $VARS.sep + $name install_dir : 'base' properties: { - pip : "no" # whl prerequisites do not correspond! backports.functools_lru_cache-1.5 and subprocess32-3.5.4 are missing + pip : "yes" # whl prerequisites do not correspond! backports.functools_lru_cache-1.5 and subprocess32-3.5.4 are missing incremental : "yes" } } diff --git a/products/mpi4py.pyconf b/products/mpi4py.pyconf index 7be3264..adc697d 100644 --- a/products/mpi4py.pyconf +++ b/products/mpi4py.pyconf @@ -26,6 +26,17 @@ default : } } +version_3_1_0_no_pip : +{ + compil_script : "mpi4py.sh" + patches: ["mpi4py_3_1_0_setup_py.patch"] + properties: + { + incremental : "yes" + pip : "no" + } +} + version_3_0_3_no_pip : { compil_script : "mpi4py.sh" diff --git a/products/numpydoc.pyconf b/products/numpydoc.pyconf index 430a24e..7979b65 100644 --- a/products/numpydoc.pyconf +++ b/products/numpydoc.pyconf @@ -19,7 +19,7 @@ default : { env_script : $name + ".py" } - depend : ['Python', 'six', 'setuptools', 'numpy'] + depend : ['Python', 'setuptools', 'numpy', 'Jinja2', 'Sphinx', 'tabulate', 'tomli'] source_dir : $APPLICATION.workdir + $VARS.sep + 'SOURCES' + $VARS.sep + $name build_dir : $APPLICATION.workdir + $VARS.sep + 'BUILD' + $VARS.sep + $name install_dir : 'base' diff --git a/products/patches/gdal.0003-ignore_use2to3.patch b/products/patches/gdal.0003-ignore_use2to3.patch new file mode 100644 index 0000000..52045b3 --- /dev/null +++ b/products/patches/gdal.0003-ignore_use2to3.patch @@ -0,0 +1,16 @@ +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 @@ + 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 + + + class gdal_config_error(Exception): diff --git a/products/patches/mpi4py_3_1_0_setup_py.patch b/products/patches/mpi4py_3_1_0_setup_py.patch new file mode 100644 index 0000000..0cbb097 --- /dev/null +++ b/products/patches/mpi4py_3_1_0_setup_py.patch @@ -0,0 +1,12 @@ +diff -Naur -x '*.o' -x '*.so' -x '*.git' ./mpi4py/setup.py ./mpi4py_dev/setup.py +--- mpi4py/setup.py 2021-08-12 09:23:36.000000000 +0200 ++++ mpi4py_dev/setup.py 2024-02-12 11:01:39.249765537 +0100 +@@ -470,7 +470,7 @@ + setup_args['zip_safe'] = False + setup_args['setup_requires'] = [] + setup_args['python_requires'] = """ +- >=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*' ++ >=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.* + """.strip() + if setuptools and pyver < (3, 0): + setup_args['setup_requires'] += ['3to2'] diff --git a/products/requests.pyconf b/products/requests.pyconf index 3ef8074..03e2616 100755 --- a/products/requests.pyconf +++ b/products/requests.pyconf @@ -15,7 +15,7 @@ default : { env_script : $name + ".py" } - depend : ['Python', 'setuptools', 'certifi', 'urllib3', 'idna', 'chardet'] + depend : ['Python', 'setuptools', 'certifi', 'urllib3', 'idna', 'charset_normalizer'] source_dir : $APPLICATION.workdir + $VARS.sep + 'SOURCES' + $VARS.sep + $name build_dir : $APPLICATION.workdir + $VARS.sep + 'BUILD' + $VARS.sep + $name install_dir : 'base' diff --git a/products/sip.pyconf b/products/sip.pyconf index d5dfda9..54c731d 100644 --- a/products/sip.pyconf +++ b/products/sip.pyconf @@ -16,7 +16,7 @@ default : { env_script : $name + ".py" } - depend : ['Python', 'qt'] + depend : ['Python', 'qt', 'packaging', 'toml'] source_dir : $APPLICATION.workdir + $VARS.sep + 'SOURCES' + $VARS.sep + $name build_dir : $APPLICATION.workdir + $VARS.sep + 'BUILD' + $VARS.sep + $name install_dir : 'base' diff --git a/products/sphinx_rtd_theme.pyconf b/products/sphinx_rtd_theme.pyconf index f46ec83..1dc3a91 100644 --- a/products/sphinx_rtd_theme.pyconf +++ b/products/sphinx_rtd_theme.pyconf @@ -15,7 +15,7 @@ default : { env_script : $name + ".py" } - depend : ['Python', 'Sphinx'] + depend : ['Python', 'docutils', 'Sphinx', 'sphinxcontrib_jquery'] patches : [] source_dir : $APPLICATION.workdir + $VARS.sep + 'SOURCES' + $VARS.sep + $name build_dir : $APPLICATION.workdir + $VARS.sep + 'BUILD' + $VARS.sep + $name diff --git a/products/sphinxcontrib_applehelp.pyconf b/products/sphinxcontrib_applehelp.pyconf index f42048b..07fa19e 100644 --- a/products/sphinxcontrib_applehelp.pyconf +++ b/products/sphinxcontrib_applehelp.pyconf @@ -4,6 +4,7 @@ default : build_source : "script" compil_script : 'pip_install' + $VARS.scriptExtension get_source : "archive" + archive_info : {archive_prefix : "sphinxcontrib_applehelp"} environ : { env_script : "sphinxcontrib_applehelp.py" diff --git a/products/sphinxcontrib_devhelp.pyconf b/products/sphinxcontrib_devhelp.pyconf index b7d6d87..04728ed 100644 --- a/products/sphinxcontrib_devhelp.pyconf +++ b/products/sphinxcontrib_devhelp.pyconf @@ -4,6 +4,7 @@ default : build_source : "script" compil_script : 'pip_install' + $VARS.scriptExtension get_source : "archive" + archive_info : {archive_prefix : "sphinxcontrib_devhelp"} environ : { env_script : "sphinxcontrib_devhelp.py" diff --git a/products/sphinxcontrib_htmlhelp.pyconf b/products/sphinxcontrib_htmlhelp.pyconf index fe20a34..cf70c1e 100644 --- a/products/sphinxcontrib_htmlhelp.pyconf +++ b/products/sphinxcontrib_htmlhelp.pyconf @@ -4,6 +4,7 @@ default : build_source : "script" compil_script : 'pip_install' + $VARS.scriptExtension get_source : "archive" + archive_info : {archive_prefix : "sphinxcontrib_htmlhelp"} environ : { env_script : "sphinxcontrib_htmlhelp.py" diff --git a/products/sphinxcontrib_jquery.pyconf b/products/sphinxcontrib_jquery.pyconf new file mode 100644 index 0000000..5360ec0 --- /dev/null +++ b/products/sphinxcontrib_jquery.pyconf @@ -0,0 +1,27 @@ +default : +{ + name : "sphinxcontrib-jquery" + build_source : "script" + compil_script : 'pip_install' + $VARS.scriptExtension + get_source : "archive" + archive_info : {archive_prefix : "sphinxcontrib_jquery"} + environ : + { + env_script : "sphinxcontrib_jquery.py" + } + depend : ['Python','setuptools','Sphinx'] + source_dir : $APPLICATION.workdir + $VARS.sep + 'SOURCES' + $VARS.sep + "sphinxcontrib_jquery" + build_dir : $APPLICATION.workdir + $VARS.sep + 'BUILD' + $VARS.sep + "sphinxcontrib_jquery" + install_dir : 'base' + properties: + { + incremental : "yes" + pip : "yes" + } +} + +default_win : +{ + compil_script : 'pip_install_whl' + $VARS.scriptExtension + archive_info : {archive_name : "sphinxcontrib_jquery-" + $APPLICATION.products.sphinxcontrib_jquery + "_windows.tar.gz"} +} diff --git a/products/sphinxcontrib_jsmath.pyconf b/products/sphinxcontrib_jsmath.pyconf index caac1c9..3e92131 100644 --- a/products/sphinxcontrib_jsmath.pyconf +++ b/products/sphinxcontrib_jsmath.pyconf @@ -4,6 +4,7 @@ default : build_source : "script" compil_script : 'pip_install' + $VARS.scriptExtension get_source : "archive" + archive_info : {archive_prefix : "sphinxcontrib_jsmath"} environ : { env_script : "sphinxcontrib_jsmath.py" diff --git a/products/sphinxcontrib_qthelp.pyconf b/products/sphinxcontrib_qthelp.pyconf index c782b10..5a1d27a 100644 --- a/products/sphinxcontrib_qthelp.pyconf +++ b/products/sphinxcontrib_qthelp.pyconf @@ -4,6 +4,7 @@ default : build_source : "script" compil_script : 'pip_install' + $VARS.scriptExtension get_source : "archive" + archive_info : {archive_prefix : "sphinxcontrib_qthelp"} environ : { env_script : "sphinxcontrib_qthelp.py" diff --git a/products/sphinxcontrib_serializinghtml.pyconf b/products/sphinxcontrib_serializinghtml.pyconf index eecbb99..31e0517 100644 --- a/products/sphinxcontrib_serializinghtml.pyconf +++ b/products/sphinxcontrib_serializinghtml.pyconf @@ -4,6 +4,7 @@ default : build_source : "script" compil_script : 'pip_install' + $VARS.scriptExtension get_source : "archive" + archive_info : {archive_prefix : "sphinxcontrib_serializinghtml"} environ : { env_script : "sphinxcontrib_serializinghtml.py" diff --git a/products/sphinxintl.pyconf b/products/sphinxintl.pyconf index db66f48..11bc153 100644 --- a/products/sphinxintl.pyconf +++ b/products/sphinxintl.pyconf @@ -15,7 +15,7 @@ default : { env_script : "sphinxintl.py" } - depend : ['Python', 'setuptools', 'click', 'Sphinx','Babel','six','pytz'] + depend : ['Python', 'setuptools', 'click', 'Sphinx','Babel','six'] source_dir : $APPLICATION.workdir + $VARS.sep + 'SOURCES' + $VARS.sep + $name build_dir : $APPLICATION.workdir + $VARS.sep + 'BUILD' + $VARS.sep + $name install_dir : 'base' @@ -63,4 +63,4 @@ version_0_9_10_no_pip : incremental : "yes" pip : "no" } -} \ No newline at end of file +} diff --git a/products/statsmodels.pyconf b/products/statsmodels.pyconf index 9068556..2eeb83b 100644 --- a/products/statsmodels.pyconf +++ b/products/statsmodels.pyconf @@ -15,7 +15,7 @@ default : { } - depend : ["Python", "setuptools","PyFMI", "numpy", "scipy", "matplotlib"] + depend : ["Python", "setuptools", "numpy", "packaging", "pandas", "patsy", "scipy"] opt_depend : ['pandas', 'patsy', 'Pillow'] source_dir : $APPLICATION.workdir + $VARS.sep + 'SOURCES' + $VARS.sep + $name build_dir : $APPLICATION.workdir + $VARS.sep + 'BUILD' + $VARS.sep + $name diff --git a/products/tabulate.pyconf b/products/tabulate.pyconf new file mode 100644 index 0000000..20b9f9b --- /dev/null +++ b/products/tabulate.pyconf @@ -0,0 +1,26 @@ +default : +{ + name : "tabulate" + build_source : "script" + compil_script : 'pip_install' + $VARS.scriptExtension + get_source : "archive" + environ : + { + env_script : "tabulate.py" + } + depend : ['Python','setuptools'] + source_dir : $APPLICATION.workdir + $VARS.sep + 'SOURCES' + $VARS.sep + "tabulate" + build_dir : $APPLICATION.workdir + $VARS.sep + 'BUILD' + $VARS.sep + "tabulate" + install_dir : 'base' + properties: + { + incremental : "yes" + pip : "yes" + } +} + +default_win : +{ + compil_script : 'pip_install_whl' + $VARS.scriptExtension + archive_info : {archive_name : "tabulate-" + $APPLICATION.products.tabulate + "_windows.tar.gz"} +} diff --git a/products/tomli.pyconf b/products/tomli.pyconf new file mode 100644 index 0000000..34fb81a --- /dev/null +++ b/products/tomli.pyconf @@ -0,0 +1,26 @@ +default : +{ + name : "tomli" + build_source : "script" + compil_script : 'pip_install' + $VARS.scriptExtension + get_source : "archive" + environ : + { + env_script : "tomli.py" + } + depend : ['Python','setuptools'] + source_dir : $APPLICATION.workdir + $VARS.sep + 'SOURCES' + $VARS.sep + "tomli" + build_dir : $APPLICATION.workdir + $VARS.sep + 'BUILD' + $VARS.sep + "tomli" + install_dir : 'base' + properties: + { + incremental : "yes" + pip : "yes" + } +} + +default_win : +{ + compil_script : 'pip_install_whl' + $VARS.scriptExtension + archive_info : {archive_name : "tomli-" + $APPLICATION.products.tomli + "_windows.tar.gz"} +} diff --git a/products/zipp.pyconf b/products/zipp.pyconf new file mode 100644 index 0000000..8981740 --- /dev/null +++ b/products/zipp.pyconf @@ -0,0 +1,26 @@ +default : +{ + name : "zipp" + build_source : "script" + compil_script : 'pip_install' + $VARS.scriptExtension + get_source : "archive" + environ : + { + env_script : "zipp.py" + } + depend : ['Python','setuptools'] + source_dir : $APPLICATION.workdir + $VARS.sep + 'SOURCES' + $VARS.sep + "zipp" + build_dir : $APPLICATION.workdir + $VARS.sep + 'BUILD' + $VARS.sep + "zipp" + install_dir : 'base' + properties: + { + incremental : "yes" + pip : "yes" + } +} + +default_win : +{ + compil_script : 'pip_install_whl' + $VARS.scriptExtension + archive_info : {archive_name : "zipp-" + $APPLICATION.products.zipp + "_windows.tar.gz"} +} -- 2.39.2