Skip to content

Conversation

@akx
Copy link
Member

@akx akx commented Jul 8, 2025

Refs #1218, should fix it.

There's an iana="..." attribute in (at least recent) timezone XML files, but we historically never read that and instead just trusted the first alias to be the canonical tzid.

@codecov
Copy link

codecov bot commented Jul 8, 2025

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 92.07%. Comparing base (e91c346) to head (c5364f0).
⚠️ Report is 1 commits behind head on master.

Additional details and impacted files
@@           Coverage Diff           @@
##           master    #1220   +/-   ##
=======================================
  Coverage   92.07%   92.07%           
=======================================
  Files          27       27           
  Lines        4692     4692           
=======================================
  Hits         4320     4320           
  Misses        372      372           
Flag Coverage Δ
macos-14-3.10 91.11% <ø> (ø)
macos-14-3.11 91.04% <ø> (ø)
macos-14-3.12 91.26% <ø> (ø)
macos-14-3.13 91.26% <ø> (ø)
macos-14-3.14 91.24% <ø> (ø)
macos-14-3.8 90.97% <ø> (ø)
macos-14-3.9 91.04% <ø> (ø)
macos-14-pypy3.10 91.11% <ø> (ø)
ubuntu-24.04-3.10 91.13% <ø> (ø)
ubuntu-24.04-3.11 91.06% <ø> (ø)
ubuntu-24.04-3.12 91.28% <ø> (ø)
ubuntu-24.04-3.13 91.28% <ø> (ø)
ubuntu-24.04-3.14 91.26% <ø> (ø)
ubuntu-24.04-3.8 91.00% <ø> (ø)
ubuntu-24.04-3.9 91.06% <ø> (ø)
ubuntu-24.04-pypy3.10 91.13% <ø> (ø)
windows-2022-3.10 91.12% <ø> (ø)
windows-2022-3.11 91.06% <ø> (ø)
windows-2022-3.12 91.27% <ø> (ø)
windows-2022-3.13 91.27% <ø> (ø)
windows-2022-3.14 91.25% <ø> (ø)
windows-2022-3.8 91.09% <ø> (ø)
windows-2022-3.9 91.05% <ø> (ø)
windows-2022-pypy3.10 91.12% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
  • 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

@akx
Copy link
Member Author

akx commented Jul 8, 2025

@anentropic Please review if you have time :)

@akx akx marked this pull request as ready for review July 8, 2025 10:11
@akx akx requested review from Copilot and tomasr8 July 8, 2025 10:11
Copy link

Copilot AI left a comment

Choose a reason for hiding this comment

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

Pull Request Overview

Updates how timezone data is imported and tested so that the canonical IANA IDs are used for zone_territories while preserving aliases.

  • Combined and extended the legacy test_get_global into test_zone_aliases_and_territories to verify both alias and canonical lookups.
  • Modified parse_global in import_cldr.py to prefer the iana attribute for tzid, skip deprecated entries, and more robustly derive territory mappings.
  • Adjusted territory resolution to fall back through aliases rather than relying solely on the primary alias.

Reviewed Changes

Copilot reviewed 2 out of 2 changed files in this pull request and generated 3 comments.

File Description
tests/test_core.py Replaced test_get_global with a broader test covering aliases and canonical zones.
scripts/import_cldr.py Updated parse_global to use iana attribute, skip deprecated, and refine territory lookup.

@anentropic
Copy link

the results in test_core look good to me 👍

@akx akx added this to the Babel 2.18 milestone Dec 29, 2025
@akx akx force-pushed the improve-zone-map branch from e7f6feb to c5364f0 Compare December 29, 2025 11:41
@akx akx merged commit 7110e62 into master Dec 29, 2025
37 of 38 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants