tools: allow icutrim.py to run on python2 #46263
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Refs: nodejs/build#2998 Small icu seems broken from 14.x since it uses python2. Although main no longer supports python2 landing and backporting this change to the 14.x line would allow us to simplify future backports as currently the files are the same across lines. Signed-off-by: Michael Dawson <mdawson@devrus.com>
nodejs-github-bot
added
i18n-api
anonrig
approved these changes
Jan 19, 2023
targos
requested changes
Jan 19, 2023
bnoordhuis
reviewed
Jan 19, 2023
tools/icu/icutrim.py
Outdated
Comment on lines
319
to
322
| pat = re.compile(bytes(r"^Item ([^ ]+) depends on missing item ([^ ]+).*", 'utf-8')) | ||
| if (sys.version_info.major < 3): | ||
| pat = re.compile(bytes(r"^Item ([^ ]+) depends on missing item ([^ ]+).*").encode('utf-8')) | ||
| else: | ||
| pat = re.compile(bytes(r"^Item ([^ ]+) depends on missing item ([^ ]+).*", 'utf-8')) |
There was a problem hiding this comment.
python[23]-agnostic, which probably also addresses @targos's objection:
pat = re.compile(br"^Item ([^ ]+) depends on missing item ([^ ]+).*")
|
Richard came up with a suggestion that we just set the test job to build with python 3, given that as an option to get the small-icu testing going on14.x. Given that 14.x goes EOL in a few months and we've not had complaints about the issue I'm happy to just close this or to submit a PR against 14.x. I'll close unless I hear suggestions we should fix in the 14.x stream. |
|
FWIW the problem this would fix was reported in #40209. |
|
The change I suggested should fix the issue and makes it more pythonic to boot. I don't see any downsides to landing it. |
mhdawson
commented
Jan 20, 2023
|
Ok @targos pulled in Ben's suggested changing. Just validating locally with a small icu build that all is ok on main. |
targos
approved these changes
Jan 20, 2023
|
Passed on my local run. |
github-actions
bot
removed
the
request-ci
14 tasks
lpinca
approved these changes
Jan 21, 2023
jasnell
approved these changes
Jan 21, 2023
lpinca
added
commit-queue
nodejs-github-bot
removed
the
commit-queue
|
Landed in 7ea2fc8 |
This was referenced Jan 22, 2023
This was referenced Jan 24, 2023
ruyadorno
pushed a commit
that referenced
this pull request
Feb 1, 2023
Refs: nodejs/build#2998 Small icu seems broken from 14.x since it uses python2. Although main no longer supports python2 landing and backporting this change to the 14.x line would allow us to simplify future backports as currently the files are the same across lines. Signed-off-by: Michael Dawson <mdawson@devrus.com> PR-URL: #46263 Reviewed-By: Yagiz Nizipli <yagiz@nizipli.com> Reviewed-By: Michaël Zasso <targos@protonmail.com> Reviewed-By: Luigi Pinca <luigipinca@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com>
Merged
juanarbol
pushed a commit
that referenced
this pull request
Mar 3, 2023
Refs: nodejs/build#2998 Small icu seems broken from 14.x since it uses python2. Although main no longer supports python2 landing and backporting this change to the 14.x line would allow us to simplify future backports as currently the files are the same across lines. Signed-off-by: Michael Dawson <mdawson@devrus.com> PR-URL: #46263 Reviewed-By: Yagiz Nizipli <yagiz@nizipli.com> Reviewed-By: Michaël Zasso <targos@protonmail.com> Reviewed-By: Luigi Pinca <luigipinca@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com>
Merged
juanarbol
pushed a commit
that referenced
this pull request
Mar 5, 2023
Refs: nodejs/build#2998 Small icu seems broken from 14.x since it uses python2. Although main no longer supports python2 landing and backporting this change to the 14.x line would allow us to simplify future backports as currently the files are the same across lines. Signed-off-by: Michael Dawson <mdawson@devrus.com> PR-URL: #46263 Reviewed-By: Yagiz Nizipli <yagiz@nizipli.com> Reviewed-By: Michaël Zasso <targos@protonmail.com> Reviewed-By: Luigi Pinca <luigipinca@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Refs: nodejs/build#2998
Small icu seems broken from 14.x since it uses
python2. Although main no longer supports python2
landing and backporting this change to the 14.x line would allow us to simplify future backports as currently the files are the same across lines.
Signed-off-by: Michael Dawson mdawson@devrus.com