Skip to content

Use canonical IANA zone names in zone_territories #1220

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from

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.

Copy link

codecov bot commented Jul 8, 2025

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 91.97%. Comparing base (69c5db8) to head (e7f6feb).

Additional details and impacted files
@@           Coverage Diff           @@
##           master    #1220   +/-   ##
=======================================
  Coverage   91.97%   91.97%           
=======================================
  Files          27       27           
  Lines        4688     4688           
=======================================
  Hits         4312     4312           
  Misses        376      376           
Flag Coverage Δ
macos-14-3.10 91.01% <ø> (ø)
macos-14-3.11 90.95% <ø> (ø)
macos-14-3.12 91.16% <ø> (ø)
macos-14-3.13 91.16% <ø> (ø)
macos-14-3.8 90.88% <ø> (ø)
macos-14-3.9 90.94% <ø> (ø)
macos-14-pypy3.10 91.01% <ø> (ø)
ubuntu-24.04-3.10 91.04% <ø> (ø)
ubuntu-24.04-3.11 90.97% <ø> (ø)
ubuntu-24.04-3.12 91.19% <ø> (ø)
ubuntu-24.04-3.13 91.19% <ø> (ø)
ubuntu-24.04-3.8 90.90% <ø> (ø)
ubuntu-24.04-3.9 90.97% <ø> (ø)
ubuntu-24.04-pypy3.10 91.04% <ø> (ø)
windows-2022-3.10 91.03% <ø> (ø)
windows-2022-3.11 90.96% <ø> (ø)
windows-2022-3.12 91.18% <ø> (ø)
windows-2022-3.13 91.18% <ø> (ø)
windows-2022-3.8 91.00% <ø> (ø)
windows-2022-3.9 90.96% <ø> (ø)
windows-2022-pypy3.10 91.03% <ø> (ø)

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 tomasr8 and Copilot July 8, 2025 10:11
Copy link

@Copilot 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 👍

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.

2 participants