Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CLDR-17492 Update CLDR to not use utilities-for-cldr anymore #3692

Merged
merged 1 commit into from
May 10, 2024
Merged

CLDR-17492 Update CLDR to not use utilities-for-cldr anymore #3692

merged 1 commit into from
May 10, 2024

Conversation

mihnita
Copy link
Contributor

@mihnita mihnita commented May 7, 2024

CLDR-17492

WARNING: all the code changes are OK, but I need some help / opinions.


  1. According to the plan, UOption and ElapsedTimer are not used by ICU anymore, and are moved to CLDR.

I've put them in tools/cldr-code/src/main/java/com/ibm/icu/dev/util/
If that does not seem like the right place, let me know and I will move them.


  1. UOption is used many times in tools/cldr-code, but also used once in tools/cldr-apps

More precisely by tools/cldr-apps/src/test/java/org/unicode/cldr/unittest/web/perf/PerfTest.java

That was a fork of the same class in ICU, in icu4j/perf-tests/src/main/java/com/ibm/icu/dev/test/perf/PerfTest.java

But it looks like it was forked, and never used, except by tools/cldr-apps/src/test/java/org/unicode/cldr/unittest/web/perf/NullPerf.java, which looked like a placeholder, doing nothing.

One option was to put UOption in some common place, where it can be used by both tools/cldr-apps and tools/cldr-code

The other option was to remove that unused code from tools/cldr-apps

I went with the deletion.


  1. The tests fail because of new (Unicode 16) scripts

Between the previous ICU 76.0.1 snapshot and now the ICU repo was updated with some Unicode 16 data, which also adds a few scripts.

See com.ibm.icu.lang.UScript here

I added (temporarily) the missing entries to common/supplemental/likelySubtags.xml (in this PR),
between special comments:

<!-- START: Added by Unicode 16, temporary -->
...
 <!-- END: Added by Unicode 16, temporary -->

I don't know what the right process is to add such scripts, I only did it that the code changes are fine and the PR doesn't fail.
Let me know if you have a better way to do this, and I'll do it.

It just looked like a chicken-and-egg problem.
Without this PR CLDR can't start using the new ICU (and stop using utilities-for-cldr), but this CL can't go in with the old ICU (because UnicodeMap is now in ICU proper)
So that was my way to break the impasse, temporarily add them.


ALLOW_MANY_COMMITS=true

common/supplemental/likelySubtags.xml Show resolved Hide resolved
tools/cldr-apps/pom.xml Show resolved Hide resolved
@srl295 srl295 self-requested a review May 7, 2024 17:29
Copy link
Member

@srl295 srl295 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@mihnita something really critical is - does unicodetools still build with this? It needs to build or needs to build soon.

@srl295 srl295 self-requested a review May 7, 2024 17:32
@srl295
Copy link
Member

srl295 commented May 7, 2024

@mihnita all of your choices LGTM as implemented. like to ensure unicodetools is going to build before merging.

@mihnita
Copy link
Contributor Author

mihnita commented May 7, 2024

like to ensure unicodetools is going to build before merging

I have a similar PR for unicodetools:
unicode-org/unicodetools#810

Has one failure, and it does not look like it is from this refactoring.
Unicodetools used ICU 72.0.1-SNAPSHOT-cldr-2022-08-17, and I am trying to jump directly to 76.0.1-SNAPSHOT

Working with Markus to see why it fails.

Feel free to add yourself to that PR, if you want.
I don't have rights to add people there.

Thanks,
M.

srl295
srl295 previously approved these changes May 7, 2024
@srl295
Copy link
Member

srl295 commented May 7, 2024

@mihnita do you have perms to merge this (if so go ahead) otherwise I will if it's ready

@mihnita
Copy link
Contributor Author

mihnita commented May 7, 2024

@mihnita do you have perms to merge this (if so go ahead) otherwise I will if it's ready

I don't, I just wanted to send a message.

Thank you.

@markusicu markusicu requested review from macchiati and markusicu May 7, 2024 21:50
@srl295
Copy link
Member

srl295 commented May 8, 2024

@mihnita sub-PR https://github.com/mihnita/cldr/pull/1 - rewrite ElapsedTimer

@mihnita mihnita dismissed stale reviews from markusicu and srl295 via 95c0625 May 8, 2024 02:18
@mihnita
Copy link
Contributor Author

mihnita commented May 8, 2024

Should I revert the new ElapsedTimer, land this PR, and refactor it later?
Or is there a license problem?

@jira-pull-request-webhook
Copy link

Hooray! The files in the branch are the same across the force-push. 😃

~ Your Friendly Jira-GitHub PR Checker Bot

@srl295
Copy link
Member

srl295 commented May 8, 2024

Should I revert the new ElapsedTimer, land this PR, and refactor it later? Or is there a license problem?

Yes I'm trying to avoid a license problem.

@srl295
Copy link
Member

srl295 commented May 8, 2024

Should I revert the new ElapsedTimer, land this PR, and refactor it later? Or is there a license problem?

Yes I'm trying to avoid a license problem.

try again https://github.com/mihnita/cldr/pull/2

@mihnita
Copy link
Contributor Author

mihnita commented May 8, 2024

All tests pass with the new one, thanks.

Do you want me to get this to local, squash, and push -f?
(to eliminate the Bad commit message: “Merge pull request #2 from ...)

Or you can do it from GitHub (I don't have the rights to do it)

From my side it is ready to merge.

Thank you,
M.

@markusicu markusicu requested review from markusicu and srl295 May 8, 2024 21:10
Also with a brand new ElapsedTimer.java
@jira-pull-request-webhook
Copy link

Hooray! The files in the branch are the same across the force-push. 😃

~ Your Friendly Jira-GitHub PR Checker Bot

@srl295
Copy link
Member

srl295 commented May 8, 2024

@mihnita LGTM. Let's wait until after shakedown (starting tomorrow) to merge.

@macchiati macchiati marked this pull request as draft May 9, 2024 00:47
@macchiati
Copy link
Member

We are launching Shakedown tomorrow morning. So we should not merge this, just in case it could cause instabilities. Friday should be fine. I'm converting to draft just so someone doesn't inadvertently merge.

@srl295 srl295 marked this pull request as ready for review May 9, 2024 21:15
@srl295 srl295 marked this pull request as draft May 9, 2024 21:15
@markusicu markusicu marked this pull request as ready for review May 10, 2024 15:37
@markusicu markusicu merged commit 82dca18 into unicode-org:main May 10, 2024
10 checks passed
@mihnita
Copy link
Contributor Author

mihnita commented May 10, 2024

Thank you everybody!
Mihai

@mihnita mihnita deleted the mihai_stop_utilities_for_cldr branch May 10, 2024 16:16
srl295 added a commit to srl295/cldr that referenced this pull request May 30, 2024
fix userlist to not be in milliseconds. Unexpected side effect of unicode-org#3692
srl295 added a commit to srl295/cldr that referenced this pull request May 30, 2024
fix userlist to not be in milliseconds. Unexpected side effect of unicode-org#3692
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants