fix: consolidate country mappings into single source of truth #220
Conversation
This file contains hidden or 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
…merica bug The codebase had three separate country mapping definitions that were inconsistent and causing "US" to be incorrectly expanded to "United States of America" instead of "United States". Changes: - Create utils/tidy_conf/countries.py as the single source of truth for all country-related mappings - Update titles.py to import from centralized module - Update interactive_merge.py to use COUNTRY_NORMALIZATION from centralized module - Update import_python_organizers.py to import get_country_alpha3 from centralized module - Add comprehensive tests in test_country_mappings.py Key mappings now consistent: - "US", "USA" -> "United States" (display name for conference titles) - "United States of America", "USA" -> "US" (normalization for places) - "US", "USA" -> "USA" (alpha-3 code for CSV output)
Per user preference: - "PyCon US" stays as "PyCon US" (not expanded) - "PyCon UK" stays as "PyCon UK" (not expanded) - "PyCon DE" becomes "PyCon Germany" (expanded) - "PyCon PL" becomes "PyCon Poland" (expanded) Updated COUNTRY_DISPLAY_NAMES to map US->US and UK->UK instead of expanding to full country names.
JesperDramsch
force-pushed
the
claude/fix-country-mapping-cO2Mq
branch
from
9f4a879 to
b3c4700
Compare
for more information, see https://pre-commit.ci
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.
Fixes the recurring bug where "US" gets incorrectly expanded to "United States of America".
Problem
The codebase had 3 separate, conflicting country mapping definitions:
titles.py:CUSTOM_COUNTRY_MAPPINGSimport_python_organizers.py:COUNTRY_NAME_ALIASESinteractive_merge.py:replacementsdictSolution
Created
utils/tidy_conf/countries.pyas the single source of truth. All other modules now import from there.Behavior
Changes
utils/tidy_conf/countries.py- centralized mappingstests/test_country_mappings.py- 28 regression teststitles.py,interactive_merge.py,import_python_organizers.py- now import from central module