From 9341fdc10845e78b66c0d5f8051b80810559a170 Mon Sep 17 00:00:00 2001 From: Julien BERNARD Date: Wed, 3 Apr 2024 23:27:19 -0400 Subject: [PATCH] Change Unicode version for 15.1.0 --- containers/lgr-base/lgr-base.sh | 7 ++++++- containers/lgr-django/files/local.py | 10 +++++----- containers/lgr-django/files/requirements.txt | 10 +++++----- 3 files changed, 16 insertions(+), 11 deletions(-) diff --git a/containers/lgr-base/lgr-base.sh b/containers/lgr-base/lgr-base.sh index ef27a7c2..3b20aa98 100755 --- a/containers/lgr-base/lgr-base.sh +++ b/containers/lgr-base/lgr-base.sh @@ -63,7 +63,7 @@ printf "\tInstall lgr-django unicodes dependencies\n" git clone -q $unicodeURL $buildDir/icu # unicodeVersions define all unicode version use in LGR -unicodeVersion="12.0.0" +unicodeVersion="15.1.0" # Compile every icu4c version from the local LGR git repo for i in $unicodeVersion @@ -121,6 +121,11 @@ do unicodeTag=71 unicodeRelease='release-71-1' ;; + 15.1.0) + icu4cBuildPath="$buildDir/icu/icu4c/build" + unicodeTag=74 + unicodeRelease='release-74-2' + ;; *) # Should never happend as no external input is used exit 1 diff --git a/containers/lgr-django/files/local.py b/containers/lgr-django/files/local.py index 5db9c18b..ef4eebdd 100644 --- a/containers/lgr-django/files/local.py +++ b/containers/lgr-django/files/local.py @@ -93,9 +93,9 @@ ##### /e-mail settings ##### ##### LGR Toolset Project-specific settings ##### -SUPPORTED_UNICODE_VERSION = '12.0.0' +SUPPORTED_UNICODE_VERSION = '15.1.0' -DEFAULT_UNICODE_VERSION = '12.0.0' +DEFAULT_UNICODE_VERSION = '15.1.0' # UNICODE_DATABASES tells munidata how to instantiate the implementation of each Unicode version that we support. # Keys are the Unicode version, like '6.3.0' @@ -107,9 +107,9 @@ # See picu.loader.KNOWN_ICU_VERSIONS UNICODE_DATABASES = { - '12.0.0': { - 'icu_uc_lib': '/usr/local/lib/libicuuc.so.64', - 'icu_i18n_lib': '/usr/local/lib/libicui18n.so.64', + '15.1.0': { + 'icu_uc_lib': '/usr/local/lib/libicuuc.so.74', + 'icu_i18n_lib': '/usr/local/lib/libicui18n.so.74', 'version_tag': 64, } } diff --git a/containers/lgr-django/files/requirements.txt b/containers/lgr-django/files/requirements.txt index 8605dc2a..29d653aa 100644 --- a/containers/lgr-django/files/requirements.txt +++ b/containers/lgr-django/files/requirements.txt @@ -11,11 +11,11 @@ django-celery-results==2.4.0 django-celery-beat==2.2.0 # LGR/Unicode modules -picu==1.4 -munidata==2.3.1 -#picu @ git+https://github.com/icann/picu.git@master -#munidata @ git+https://github.com/icann/munidata.git@master -lgr-core @ git+https://github.com/icann/lgr-core.git@v6.1.1 +#picu==1.4 +#munidata==2.3.1 +picu @ git+https://github.com/icann/picu.git@unicode-1510 +munidata @ git+https://github.com/icann/munidata.git@unicode-1510 +lgr-core @ git+https://github.com/icann/lgr-core.git@6.1.2 # Natural sorting implementation natsort==7.1.1