Skip to content

Commit 47427d4

Browse files
authored
Node JS 24 with ICU 77 (#453)
* Node JS 24 with ICU 77 * Removing old code that was giving warnings
1 parent 88eba25 commit 47427d4

File tree

6 files changed

+36
-14
lines changed

6 files changed

+36
-14
lines changed

run_config.json

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -156,6 +156,28 @@
156156
"per_execution": 10000
157157
}
158158
},
159+
{
160+
"prereq": {
161+
"name": "nvm 24.0.0, icu77.1",
162+
"version": "24.0.0",
163+
"command": "nvm install 24.0.0;nvm use 24.0.0 --silent"
164+
},
165+
"run": {
166+
"icu_version": "icu77",
167+
"exec": "node",
168+
"test_type": [
169+
"collation",
170+
"datetime_fmt",
171+
"list_fmt",
172+
"number_fmt",
173+
"lang_names",
174+
"likely_subtags",
175+
"rdt_fmt",
176+
"plural_rules"
177+
],
178+
"per_execution": 10000
179+
}
180+
},
159181
{
160182
"prereq": {
161183
"name": "nvm 23.3.0, icu76.1",

testdriver/datasets.py

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -221,6 +221,7 @@ class ParallelMode(Enum):
221221
ParallelByLang = 2
222222

223223
class NodeVersion(Enum):
224+
Node24 = "24.0.0"
224225
Node23 = "23.3.0"
225226
Node22 = "22.9.0"
226227
Node21 = "21.6.0"
@@ -252,8 +253,8 @@ class ICU4XVersion(Enum):
252253
# TODO: combine the version info
253254
IcuVersionToExecutorMap = {
254255
'node': {
255-
'77': ["23.10.0"], # NOT YET AVAILABLE
256-
'76': ["23.3.0"],
256+
'77': ["24.0.0"],
257+
'76': ["23.11.0"],
257258
'75': ["22.9.0"],
258259
'74': ["21.6.0"],
259260
'73': ["20.1.0"],
@@ -278,8 +279,8 @@ class ICU4XVersion(Enum):
278279
# What versions of NodeJS use specific ICU versions
279280
# https://nodejs.org/en/download/releases/
280281
NodeICUVersionMap = {
281-
'23.10.0': '77.1', # NOT YET!!
282-
'23.3.0': '76.1',
282+
'24.0.0': '77.1',
283+
'23.11.0': '76.1',
283284
'22.9.0': '75.1',
284285
'21.6.0': '74.1',
285286
'20.1.0': '73.1',
@@ -358,6 +359,10 @@ def has(self, exec):
358359
allExecutors = ExecutorInfo()
359360

360361
system = ExecutorLang.NODE.value
362+
allExecutors.addSystem(system, NodeVersion.Node24,
363+
'node ../executors/node/executor.js',
364+
CLDRVersion.CLDR47, versionICU=ICUVersion.ICU77)
365+
361366
allExecutors.addSystem(system, NodeVersion.Node21,
362367
'node ../executors/node/executor.js',
363368
CLDRVersion.CLDR43, versionICU=ICUVersion.ICU73)

testgen/generators/datetime_fmt.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
import subprocess
1010
from generators.base import DataGenerator
1111

12-
reblankline = re.compile("^\s*$")
1312

1413
class DateTimeFmtGenerator(DataGenerator):
1514
json_test = {"test_type": "datetime_fmt"}
@@ -140,7 +139,8 @@ def generate_datetime_data_from_cldr(self, dt_json_path, run_limit=-1):
140139
def process_test_data(self):
141140
# Use NOde JS to create the .json files
142141
icu_nvm_versions = {
143-
'icu76': '23.3.0',
142+
'icu77': '24.0.0',
143+
'icu76': '23.11.0',
144144
'icu75': '22.9.0',
145145
'icu74': '21.6.0',
146146
'icu73': '20.1.0',

testgen/generators/list_fmt.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,15 @@
66
import subprocess
77
from generators.base import DataGenerator
88

9-
reblankline = re.compile("^\s*$")
10-
119
class ListFmtGenerator(DataGenerator):
1210
json_test = {"test_type": "list_fmt"}
1311
json_verify = {"test_type": "list_fmt"}
1412

1513
def process_test_data(self):
1614
# Use Node JS to create the .json files
1715
icu_nvm_versions = {
18-
'icu77': '23.10.0', # Does not include ICU77 yet!
19-
'icu76': '23.3.0',
16+
'icu77': '24.0.0',
17+
'icu76': '23.11.0',
2018
'icu75': '22.9.0',
2119
'icu74': '21.6.0',
2220
'icu73': '20.1.0',

testgen/generators/relativedatetime_fmt.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
import subprocess
77
from generators.base import DataGenerator
88

9-
reblankline = re.compile("^\s*$")
109

1110
class RelativeDateTimeFmtGenerator(DataGenerator):
1211
json_test = {"test_type": "rdt_fmt"}
@@ -15,7 +14,7 @@ class RelativeDateTimeFmtGenerator(DataGenerator):
1514
def process_test_data(self):
1615
# Use NOde JS to create the .json files
1716
icu_nvm_versions = {
18-
'icu77': '23.10.0', # NOT YET AVAILABLE
17+
'icu77': '24.0.0',
1918
'icu76': '23.3.0',
2019
'icu75': '22.9.0',
2120
'icu74': '21.6.0',

testgen/testdata_gen.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@
1717
from generators.plurals import PluralGenerator
1818
from generators.relativedatetime_fmt import RelativeDateTimeFmtGenerator
1919

20-
reblankline = re.compile("^\s*$")
21-
2220

2321
def setupArgs():
2422
parser = argparse.ArgumentParser(prog="testdata_gen")

0 commit comments

Comments
 (0)