Skip to content

Commit

Permalink
Change Unicode version for 15.1.0
Browse files Browse the repository at this point in the history
  • Loading branch information
j-bernard committed Apr 5, 2024
1 parent 337b0db commit 9341fdc
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 11 deletions.
7 changes: 6 additions & 1 deletion containers/lgr-base/lgr-base.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
10 changes: 5 additions & 5 deletions containers/lgr-django/files/local.py
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand All @@ -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,
}
}
Expand Down
10 changes: 5 additions & 5 deletions containers/lgr-django/files/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 9341fdc

Please sign in to comment.