hdx-python-country 3.9.2__tar.gz → 3.9.4__tar.gz

{hdx_python_country-3.9.2 → hdx_python_country-3.9.4}/.github/workflows/publish.yaml

@@ -10,7 +10,7 @@ jobs:
 
     environment:
       name: pypi
-      url: https://pypi.org/p/hdx-python-utilities
+      url: https://pypi.org/p/hdx-python-country
 
     permissions:
       id-token: write  # IMPORTANT: mandatory for trusted publishing

{hdx_python_country-3.9.2 → hdx_python_country-3.9.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hdx-python-country
-Version: 3.9.2
+Version: 3.9.4
 Summary: HDX Python country code and exchange rate (fx) utilities
 Project-URL: Homepage, https://github.com/OCHA-DAP/hdx-python-country
 Author: Michael Rans
@@ -25,7 +25,7 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Requires-Python: >=3.8
-Requires-Dist: hdx-python-utilities>=3.8.5
+Requires-Dist: hdx-python-utilities>=3.8.7
 Requires-Dist: libhxl>=5.2.2
 Requires-Dist: tenacity
 Provides-Extra: dev
@@ -69,3 +69,91 @@ For more information, please read the [documentation](https://hdx-python-country
 This library is part of the [Humanitarian Data Exchange](https://data.humdata.org/)
 (HDX) project. If you have humanitarian related data, please upload your datasets to
 HDX.
+
+## Development
+
+### Environment
+
+Development is currently done using Python 3.12. We recommend using a virtual
+environment such as ``venv``:
+
+```shell
+    python -m venv venv
+    source venv/bin/activate
+```
+
+In your virtual environment, install all packages for development by running:
+
+```shell
+    pip install -r requirements.txt
+```
+
+### Pre-commit
+
+Be sure to install `pre-commit`, which is run every time you make a git commit:
+
+```shell
+    pip install pre-commit
+    pre-commit install
+```
+
+With pre-commit, all code is formatted according to
+[ruff](https://docs.astral.sh/ruff/) guidelines.
+
+To check if your changes pass pre-commit without committing, run:
+
+```shell
+    pre-commit run --all-files
+```
+
+### Testing
+
+Ensure you have the required packages to run the tests:
+
+```shell
+    pip install -r requirements.txt
+```
+
+To run the tests and view coverage, execute:
+
+```shell
+    pytest -c --cov hdx
+```
+
+## Packages
+
+[uv](https://github.com/astral-sh/uv) is used for package management.  If
+you’ve introduced a new package to the source code (i.e. anywhere in `src/`),
+please add it to the `project.dependencies` section of `pyproject.toml` with
+any known version constraints.
+
+To add packages required only for testing, add them to the `test` section under
+`[project.optional-dependencies]`.
+
+Any changes to the dependencies will be automatically reflected in
+`requirements.txt` with `pre-commit`, but you can re-generate the file without
+committing by executing:
+
+```shell
+    pre-commit run pip-compile --all-files
+```
+
+## Project
+
+[Hatch](https://hatch.pypa.io/) is used for project management. The project can be built using:
+
+```shell
+    hatch build
+```
+
+Linting and syntax checking can be run with:
+
+```shell
+    hatch fmt --check
+```
+
+Tests can be executed using:
+
+```shell
+    hatch test
+```

{hdx_python_country-3.9.2 → hdx_python_country-3.9.4}/README.md

@@ -30,3 +30,91 @@ For more information, please read the [documentation](https://hdx-python-country
 This library is part of the [Humanitarian Data Exchange](https://data.humdata.org/)
 (HDX) project. If you have humanitarian related data, please upload your datasets to
 HDX.
+
+## Development
+
+### Environment
+
+Development is currently done using Python 3.12. We recommend using a virtual
+environment such as ``venv``:
+
+```shell
+    python -m venv venv
+    source venv/bin/activate
+```
+
+In your virtual environment, install all packages for development by running:
+
+```shell
+    pip install -r requirements.txt
+```
+
+### Pre-commit
+
+Be sure to install `pre-commit`, which is run every time you make a git commit:
+
+```shell
+    pip install pre-commit
+    pre-commit install
+```
+
+With pre-commit, all code is formatted according to
+[ruff](https://docs.astral.sh/ruff/) guidelines.
+
+To check if your changes pass pre-commit without committing, run:
+
+```shell
+    pre-commit run --all-files
+```
+
+### Testing
+
+Ensure you have the required packages to run the tests:
+
+```shell
+    pip install -r requirements.txt
+```
+
+To run the tests and view coverage, execute:
+
+```shell
+    pytest -c --cov hdx
+```
+
+## Packages
+
+[uv](https://github.com/astral-sh/uv) is used for package management.  If
+you’ve introduced a new package to the source code (i.e. anywhere in `src/`),
+please add it to the `project.dependencies` section of `pyproject.toml` with
+any known version constraints.
+
+To add packages required only for testing, add them to the `test` section under
+`[project.optional-dependencies]`.
+
+Any changes to the dependencies will be automatically reflected in
+`requirements.txt` with `pre-commit`, but you can re-generate the file without
+committing by executing:
+
+```shell
+    pre-commit run pip-compile --all-files
+```
+
+## Project
+
+[Hatch](https://hatch.pypa.io/) is used for project management. The project can be built using:
+
+```shell
+    hatch build
+```
+
+Linting and syntax checking can be run with:
+
+```shell
+    hatch fmt --check
+```
+
+Tests can be executed using:
+
+```shell
+    hatch test
+```

{hdx_python_country-3.9.2 → hdx_python_country-3.9.4}/documentation/index.md

@@ -70,9 +70,10 @@ The usage of the country mappings functionality is best illustrated by some exam
 
     from hdx.location.country import Country
 
-    Country.countriesdata(use_live=False, country_name_overrides={"PSE": "oPt"})
-    # Set up using non live data from repo rather and override default country name
-    # (Leaving out this step will use live data and no overrides)
+    Country.countriesdata(include_unofficial=True, use_live=False, country_name_overrides={"PSE": "oPt"})
+    # Set up including unofficial alpha2 (eg. AN) and alpha3 codes (eg. XKX)
+    # Use non live data from repo and override default country name
+    # (Leaving out this step will exclude unofficial alpha codes, use live data and no overrides)
     Country.get_country_name_from_iso3("jpn", use_live=False)  # returns "Japan"
     Country.get_country_name_from_iso3("vEn", formal=True)  # returns "the Bolivarian Republic of Venezuela"
     # uselive=False forces the use of internal files instead of accessing the live feeds.

{hdx_python_country-3.9.2 → hdx_python_country-3.9.4}/pyproject.toml

@@ -34,7 +34,7 @@ classifiers = [
 requires-python = ">=3.8"
 
 dependencies = [
-    "hdx-python-utilities>=3.8.5",
+    "hdx-python-utilities>=3.8.7",
     "libhxl>=5.2.2",
     "tenacity",
 ]

{hdx_python_country-3.9.2 → hdx_python_country-3.9.4}/requirements.txt

@@ -2,7 +2,7 @@
 #    uv pip compile pyproject.toml --resolver=backtracking --all-extras -o requirements.txt
 annotated-types==0.7.0
     # via pydantic
-astdoc==1.1.5
+astdoc==1.2.1
     # via mkapi
 attrs==25.3.0
     # via
@@ -14,13 +14,13 @@ babel==2.17.0
     # via mkdocs-material
 backrefs==5.8
     # via mkdocs-material
-certifi==2025.1.31
+certifi==2025.4.26
     # via requests
 cfgv==3.4.0
     # via pre-commit
 chardet==5.2.0
     # via frictionless
-charset-normalizer==3.4.1
+charset-normalizer==3.4.2
     # via requests
 click==8.1.8
     # via
@@ -28,7 +28,7 @@ click==8.1.8
     #   typer
 colorama==0.4.6
     # via mkdocs-material
-coverage==7.7.1
+coverage==7.8.0
     # via pytest-cov
 distlib==0.3.9
     # via virtualenv
@@ -36,19 +36,19 @@ et-xmlfile==2.0.0
     # via openpyxl
 filelock==3.18.0
     # via virtualenv
-frictionless==5.18.0
+frictionless==5.18.1
     # via hdx-python-utilities
 ghp-import==2.1.0
     # via mkdocs
-hdx-python-utilities==3.8.5
+hdx-python-utilities==3.8.7
     # via hdx-python-country (pyproject.toml)
-humanize==4.12.2
+humanize==4.12.3
     # via frictionless
-identify==2.6.9
+identify==2.6.10
     # via pre-commit
 idna==3.10
     # via requests
-ijson==3.3.0
+ijson==3.4.0
     # via hdx-python-utilities
 iniconfig==2.1.0
     # via pytest
@@ -68,21 +68,20 @@ jsonschema==4.23.0
     # via
     #   frictionless
     #   tableschema-to-template
-jsonschema-specifications==2024.10.1
+jsonschema-specifications==2025.4.1
     # via jsonschema
 libhxl==5.2.2
     # via hdx-python-country (pyproject.toml)
 loguru==0.7.3
     # via hdx-python-utilities
-markdown==3.7
+markdown==3.8
     # via
-    #   astdoc
     #   mkdocs
     #   mkdocs-material
     #   pymdown-extensions
 markdown-it-py==3.0.0
     # via rich
-marko==2.1.2
+marko==2.1.3
     # via frictionless
 markupsafe==3.0.2
     # via
@@ -94,7 +93,7 @@ mergedeep==1.3.4
     # via
     #   mkdocs
     #   mkdocs-get-deps
-mkapi==4.1.3
+mkapi==4.4.0
     # via hdx-python-country (pyproject.toml)
 mkdocs==1.6.1
     # via
@@ -102,7 +101,7 @@ mkdocs==1.6.1
     #   mkdocs-material
 mkdocs-get-deps==0.2.0
     # via mkdocs
-mkdocs-material==9.6.9
+mkdocs-material==9.6.14
     # via mkapi
 mkdocs-material-extensions==1.3.1
     # via mkdocs-material
@@ -110,7 +109,7 @@ nodeenv==1.9.1
     # via pre-commit
 openpyxl==3.1.5
     # via hdx-python-utilities
-packaging==24.2
+packaging==25.0
     # via
     #   mkdocs
     #   pytest
@@ -118,13 +117,13 @@ paginate==0.5.7
     # via mkdocs-material
 pathspec==0.12.1
     # via mkdocs
-petl==1.7.15
+petl==1.7.16
     # via frictionless
-platformdirs==4.3.7
+platformdirs==4.3.8
     # via
     #   mkdocs-get-deps
     #   virtualenv
-pluggy==1.5.0
+pluggy==1.6.0
     # via pytest
 ply==3.11
     # via
@@ -132,15 +131,15 @@ ply==3.11
     #   libhxl
 pre-commit==4.2.0
     # via hdx-python-country (pyproject.toml)
-pydantic==2.10.6
+pydantic==2.11.4
     # via frictionless
-pydantic-core==2.27.2
+pydantic-core==2.33.2
     # via pydantic
 pygments==2.19.1
     # via
     #   mkdocs-material
     #   rich
-pymdown-extensions==10.14.3
+pymdown-extensions==10.15
     # via mkdocs-material
 pyphonetics==0.5.3
     # via hdx-python-utilities
@@ -148,7 +147,7 @@ pytest==8.3.5
     # via
     #   hdx-python-country (pyproject.toml)
     #   pytest-cov
-pytest-cov==6.0.0
+pytest-cov==6.1.1
     # via hdx-python-country (pyproject.toml)
 python-dateutil==2.9.0.post0
     # via
@@ -169,7 +168,7 @@ pyyaml==6.0.2
     #   pymdown-extensions
     #   pyyaml-env-tag
     #   tableschema-to-template
-pyyaml-env-tag==0.1
+pyyaml-env-tag==1.1
     # via mkdocs
 ratelimit==2.2.1
     # via hdx-python-utilities
@@ -187,11 +186,9 @@ requests-file==2.1.0
     # via hdx-python-utilities
 rfc3986==2.0.0
     # via frictionless
-rich==13.9.4
-    # via
-    #   mkapi
-    #   typer
-rpds-py==0.23.1
+rich==14.0.0
+    # via typer
+rpds-py==0.25.0
     # via
     #   jsonschema
     #   referencing
@@ -205,38 +202,39 @@ simpleeval==1.0.3
     # via frictionless
 six==1.17.0
     # via python-dateutil
-stringcase==1.2.0
-    # via frictionless
-structlog==25.2.0
+structlog==25.3.0
     # via libhxl
 tableschema-to-template==0.0.13
     # via hdx-python-utilities
 tabulate==0.9.0
     # via frictionless
-tenacity==9.0.0
+tenacity==9.1.2
     # via hdx-python-country (pyproject.toml)
 text-unidecode==1.3
     # via python-slugify
-typer==0.15.2
+typer==0.15.4
     # via frictionless
-typing-extensions==4.12.2
+typing-extensions==4.13.2
     # via
     #   frictionless
     #   pydantic
     #   pydantic-core
     #   referencing
     #   typer
-unidecode==1.3.8
+    #   typing-inspection
+typing-inspection==0.4.0
+    # via pydantic
+unidecode==1.4.0
     # via
     #   libhxl
     #   pyphonetics
-urllib3==2.3.0
+urllib3==2.4.0
     # via
     #   libhxl
     #   requests
-validators==0.34.0
+validators==0.35.0
     # via frictionless
-virtualenv==20.29.3
+virtualenv==20.31.2
     # via pre-commit
 watchdog==6.0.0
     # via mkdocs
@@ -248,7 +246,7 @@ xlrd3==1.1.0
     # via libhxl
 xlsx2csv==0.8.4
     # via hdx-python-utilities
-xlsxwriter==3.2.2
+xlsxwriter==3.2.3
     # via tableschema-to-template
 xlwt==1.3.0
     # via hdx-python-utilities

{hdx_python_country-3.9.2 → hdx_python_country-3.9.4}/src/hdx/location/Countries & Territories Taxonomy MVP - C&T Taxonomy with HXL Tags.csv

@@ -1,5 +1,5 @@
 ID,RW ID,m49 numerical code,FTS API ID,Appears in UNTERM list,Appears in DGACM list,Independent,Deprecated,Has HRP,In GHO,ISO 3166-1 Alpha 2-Codes,ISO 3166-1 Alpha 3-Codes,x Alpha2 codes,x Alpha3 codes,Preferred Term,ISO Alt Term,DGACM Alt Term,FTS Alt Term,RW Short Name,RW API Alt Term,English Short,French Short,Spanish Short,Russian Short,Chinese Short,Arabic Short,English Formal,M49 English,M49 French,M49 Spanish,M49 Russian,M49 Chinese,M49 Arabic,Admin Level,Latitude,Longitude,Region Code,Region Name,Sub-region Code,Sub-region Name,Intermediate Region Code,Intermediate Region Name,Regex,World Bank Income Level,Currency,Reference Period Start,Concatenation
-#meta +id,#country +code +v_reliefweb,#country +code +num +v_m49,#country +code +v_fts,,,#meta+independent+bool,#meta+deprecated+bool,#indicator+hrp+bool,#indicator+gho+bool,#country +code +v_iso2,#country +code +v_iso3,,,#country +name +preferred,#country +name +alt +v_iso,#country +name +alt +v_dgacm,#country +name +alt +v_fts,#country +name +short +v_reliefweb,#country +name +alt +v_reliefweb,#country +name +i_en +alt +v_unterm,#country +name +i_fr +alt +v_unterm,#country +name +i_es +alt +v_unterm,#country +name +i_ru +alt +v_unterm,#country +name +i_zh +alt +v_unterm,#country +name +i_ar +alt +v_unterm,#country +name +i_en +formal +v_unterm,#country +name +i_en +alt +v_m49,#country +name +i_fr +alt +v_m49,#country +name +i_es +alt +v_m49,#country +name +i_ru +alt +v_m49,#country +name +i_zh +alt +v_m49,#country +name +i_ar +alt +v_m49,#geo +admin_level,#geo +lat,#geo +lon,#region +main +code,#region +main +name +preferred,#region +sub +code,#region +sub +name +preferred,#region +intermediate +code,#region +intermediate +name +preferred,#country +regex,#indicator+incomelevel,#currency +code,#date+start,
+#meta +id,#country +code +v_reliefweb,#country +code +num +v_m49,#country +code +v_fts,,,#meta+independent+bool,#meta+deprecated+bool,#indicator+hrp+bool,#indicator+gho+bool,#country +code +v_iso2,#country +code +v_iso3,#country +code +alpha2,#country +code +alpha3,#country +name +preferred,#country +name +alt +v_iso,#country +name +alt +v_dgacm,#country +name +alt +v_fts,#country +name +short +v_reliefweb,#country +name +alt +v_reliefweb,#country +name +i_en +alt +v_unterm,#country +name +i_fr +alt +v_unterm,#country +name +i_es +alt +v_unterm,#country +name +i_ru +alt +v_unterm,#country +name +i_zh +alt +v_unterm,#country +name +i_ar +alt +v_unterm,#country +name +i_en +formal +v_unterm,#country +name +i_en +alt +v_m49,#country +name +i_fr +alt +v_m49,#country +name +i_es +alt +v_m49,#country +name +i_ru +alt +v_m49,#country +name +i_zh +alt +v_m49,#country +name +i_ar +alt +v_m49,#geo +admin_level,#geo +lat,#geo +lon,#region +main +code,#region +main +name +preferred,#region +sub +code,#region +sub +name +preferred,#region +intermediate +code,#region +intermediate +name +preferred,#country +regex,#indicator+incomelevel,#currency +code,#date+start,
 1,13,4,1,Y,Y,Y,N,Y,Y,AF,AFG,,,Afghanistan,,,,,,Afghanistan,Afghanistan,Afganistán,Афганистан,阿富汗,أفغانستان,the Islamic Republic of Afghanistan,Afghanistan,Afghanistan,Afganistán,Афганистан,阿富汗,أفغانستان,0,33.83147477,66.02621828,142,Asia,34,Southern Asia,,,afghan,Low,AFN,2004-01-26,1 - Afghanistan
 2,14,248,2,,,N,N,,,AX,ALA,,,Åland Islands,,,,,Aland Islands (Finland),Åland Islands,,,,,,,Åland Islands,Îles d’Åland,Islas Åland,Аландских островов,奥兰群岛,جزر ألاند,0,60.18121338,19.89649072,150,Europe,154,Northern Europe,,,^[å|a]land,,EUR,2004-02-13,2 - Åland Islands
 3,15,8,3,Y,Y,Y,N,,,AL,ALB,,,Albania,,,,,,Albania,Albanie,Albania,Албания,阿尔巴尼亚,ألبانيا,the Republic of Albania,Albania,Albanie,Albania,Албания,阿尔巴尼亚,ألبانيا,0,41.13180899,20.06882519,150,Europe,39,Southern Europe,,,albania,Upper middle,ALL,1974-01-01,3 - Albania
@@ -105,7 +105,7 @@ ID,RW ID,m49 numerical code,FTS API ID,Appears in UNTERM list,Appears in DGACM l
 103,119,356,103,Y,Y,Y,N,,,IN,IND,,,India,,,,,,India,Inde,India,Индия,印度,الهند,the Republic of India,India,Inde,India,Индия,印度,الهند,0,22.37137039,79.32792202,142,Asia,34,Southern Asia,,,^(?!\D*(?:bassas))\D*india(?!.*ocea)(?!na),Lower middle,INR,1975-01-01,103 - India
 104,120,360,104,Y,Y,Y,N,,,ID,IDN,,,Indonesia,,,,,,Indonesia,Indonésie,Indonesia,Индонезия,印度尼西亚,إندونيسيا,the Republic of Indonesia,Indonesia,Indonésie,Indonesia,Индонезия,印度尼西亚,إندونيسيا,0,-2.21433486,117.2844335,142,Asia,35,South-eastern Asia,,,indonesia,Upper middle,IDR,1974-01-01,104 - Indonesia
 105,121,364,105,Y,Y,Y,N,,Y,IR,IRN,,,Iran (Islamic Republic of),,,"Iran, Islamic Republic of",Iran,,Iran (Islamic Republic of),Iran (République islamique d'),Irán (República Islámica del),Иран (Исламская Республика),伊朗伊斯兰共和国,إيران (جمهورية - الإسلامية),the Islamic Republic of Iran,Iran (Islamic Republic of),Iran (République islamique d’),Irán (República Islámica del),Иран (Исламская Республика),伊朗伊斯兰共和国,إيران (جمهورية - الإسلامية),0,32.57533772,54.2973284,142,Asia,34,Southern Asia,,,\biran|persia,Lower middle,IRR,1974-01-01,105 - Iran (Islamic Republic of)
-106,122,368,106,Y,Y,Y,N,,Y,IQ,IRQ,,,Iraq,,,,,,Iraq,Iraq,Iraq,Ирак,伊拉克,العراق,the Republic of Iraq,Iraq,Iraq,Iraq,Ирак,伊拉克,العراق,0,33.04497404,43.77207391,142,Asia,145,Western Asia,,,\biraq|mesopotamia,Upper middle,IQD,1974-01-01,106 - Iraq
+106,122,368,106,Y,Y,Y,N,,,IQ,IRQ,,,Iraq,,,,,,Iraq,Iraq,Iraq,Ирак,伊拉克,العراق,the Republic of Iraq,Iraq,Iraq,Iraq,Ирак,伊拉克,العراق,0,33.04497404,43.77207391,142,Asia,145,Western Asia,,,\biraq|mesopotamia,Upper middle,IQD,1974-01-01,106 - Iraq
 107,123,372,107,Y,Y,Y,N,,,IE,IRL,,,Ireland,,,,,,Ireland,Irlande,Irlanda,Ирландия,爱尔兰,أيرلندا,Ireland,Ireland,Irlande,Irlanda,Ирландия,爱尔兰,آيرلندا,0,53.16969376,-8.154213185,150,Europe,154,Northern Europe,,,^(?!.*north).*\bireland,High,EUR,1974-01-01,107 - Ireland
 108,124,833,108,,,N,N,,,IM,IMN,,,Isle of Man,,,,,Isle of Man (The United Kingdom of Great Britain and Northern Ireland),Isle of Man,,,,,,,Isle of Man,Île de Man,Isla de Man,Остров Мэн,马恩岛,جزيرة مان,0,54.23948288,-4.51817639,150,Europe,154,Northern Europe,,,^(?=.*isle).*\bman,High,GBP,2006-03-29,108 - Isle of Man
 109,125,376,109,Y,Y,Y,N,,,IL,ISR,,,Israel,,,,,,Israel,Israël,Israel,Израиль,以色列,إسرائيل,the State of Israel,Israel,Israël,Israel,Израиль,以色列,إسرائيل,0,31.33857325,34.96023155,142,Asia,145,Western Asia,,,israel,High,ILS,1974-01-01,109 - Israel
@@ -132,8 +132,8 @@ ID,RW ID,m49 numerical code,FTS API ID,Appears in UNTERM list,Appears in DGACM l
 130,143,442,130,Y,Y,Y,N,,,LU,LUX,,,Luxembourg,,,,,,Luxembourg,Luxembourg,Luxemburgo,Люксембург,卢森堡,لكسمبرغ,the Grand Duchy of Luxembourg,Luxembourg,Luxembourg,Luxemburgo,Люксембург,卢森堡,لكسمبرغ,0,49.77027091,6.08637699,150,Europe,155,Western Europe,,,^(?!.*belg).*luxem,High,EUR,1974-01-01,130 - Luxembourg
 131,60,446,131,,,N,N,,,MO,MAC,,,"China, Macao Special Administrative Region",Macao,,Macao,,China - Macau (Special Administrative Region),Macao,,,,,,,"China, Macao Special Administrative Region","Chine, région administrative spéciale de Macao","China, región administrativa especial de Macao","Китай, Специальный административный район Макао",中国澳门特别行政区,الصين، منطقة ماكاو الإدارية الخاصة,0,22.1985265,113.5450075,142,Asia,30,Eastern Asia,,,maca(o|u),High,MOP,1974-01-01,"131 - China, Macao Special Administrative Region"
 132,229,807,132,Y,Y,Y,N,,,MK,MKD,,,North Macedonia,,,"North Macedonia, Republic of",,the Republic of North Macedonia,North Macedonia,Macédoine du Nord,Macedonia del Norte,Северная Македония,北马其顿,مقدونيا الشمالية,the Republic of North Macedonia,North Macedonia,Macédoine du Nord,Macedonia del Norte,Северная Македония,北马其顿,مقدونيا الشمالية,0,41.59654823,21.69480535,150,Europe,39,Southern Europe,,,macedonia|^f\.?y\.?r\.?o\.?m\.?$,Upper middle,MKD,2019-02-14,132 - North Macedonia
-133,144,450,133,Y,Y,Y,N,,Y,MG,MDG,,,Madagascar,,,,,,Madagascar,Madagascar,Madagascar,Мадагаскар,马达加斯加,مدغشقر,the Republic of Madagascar,Madagascar,Madagascar,Madagascar,Мадагаскар,马达加斯加,مدغشقر,0,-19.37969027,46.70406219,2,Africa,202,Sub-Saharan Africa,14,Eastern Africa,madagascar|malagasy,Low,MGA,1993-07-12,133 - Madagascar
-134,146,454,134,Y,Y,Y,N,,,MW,MWI,,,Malawi,,,,,,Malawi,Malawi,Malawi,Малави,马拉维,ملاوي,the Republic of Malawi,Malawi,Malawi,Malawi,Малави,马拉维,ملاوي,0,-13.21991287,34.31171876,2,Africa,202,Sub-Saharan Africa,14,Eastern Africa,malawi|nyasa,Low,MWK,1974-01-01,134 - Malawi
+133,144,450,133,Y,Y,Y,N,,,MG,MDG,,,Madagascar,,,,,,Madagascar,Madagascar,Madagascar,Мадагаскар,马达加斯加,مدغشقر,the Republic of Madagascar,Madagascar,Madagascar,Madagascar,Мадагаскар,马达加斯加,مدغشقر,0,-19.37969027,46.70406219,2,Africa,202,Sub-Saharan Africa,14,Eastern Africa,madagascar|malagasy,Low,MGA,1993-07-12,133 - Madagascar
+134,146,454,134,Y,Y,Y,N,,Y,MW,MWI,,,Malawi,,,,,,Malawi,Malawi,Malawi,Малави,马拉维,ملاوي,the Republic of Malawi,Malawi,Malawi,Malawi,Малави,马拉维,ملاوي,0,-13.21991287,34.31171876,2,Africa,202,Sub-Saharan Africa,14,Eastern Africa,malawi|nyasa,Low,MWK,1974-01-01,134 - Malawi
 135,147,458,135,Y,Y,Y,N,,,MY,MYS,,,Malaysia,,,,,,Malaysia,Malaisie,Malasia,Малайзия,马来西亚,ماليزيا,Malaysia,Malaysia,Malaisie,Malasia,Малайзия,马来西亚,ماليزيا,0,2.745185714,140.4915783,142,Asia,35,South-eastern Asia,,,malaysia,Upper middle,MYR,1974-01-01,135 - Malaysia
 136,148,462,136,Y,Y,Y,N,,,MV,MDV,,,Maldives,,,,,,Maldives,Maldives,Maldivas,Мальдивские Острова,马尔代夫,ملديف,the Republic of Maldives,Maldives,Maldives,Maldivas,Мальдивские Острова,马尔代夫,ملديف,0,5.068606213,73.32614511,142,Asia,34,Southern Asia,,,maldive,Upper middle,MVR,1974-01-01,136 - Maldives
 137,149,466,137,Y,Y,Y,N,Y,Y,ML,MLI,,,Mali,,,,,,Mali,Mali,Malí,Мали,马里,مالي,the Republic of Mali,Mali,Mali,Malí,Мали,马里,مالي,0,17.34640627,-3.525051581,2,Africa,202,Sub-Saharan Africa,11,Western Africa,\bmali\b,Low,XOF,1974-01-01,137 - Mali
@@ -174,7 +174,7 @@ ID,RW ID,m49 numerical code,FTS API ID,Appears in UNTERM list,Appears in DGACM l
 172,185,598,173,Y,Y,Y,N,,,PG,PNG,,,Papua New Guinea,,,,PNG,,Papua New Guinea,Papouasie-Nouvelle-Guinée,Papua Nueva Guinea,Папуа — Новая Гвинея,巴布亚新几内亚,بابوا غينيا الجديدة,the Independent State of Papua New Guinea,Papua New Guinea,Papouasie-Nouvelle-Guinée,Papua Nueva Guinea,Папуа-Новая Гвинея,巴布亚新几内亚,بابوا غينيا الجديدة,0,-6.834760878,143.0464597,9,Oceania,54,Melanesia,,,papua|new.?guinea,Lower middle,PGK,1974-01-01,172 - Papua New Guinea
 173,186,600,174,Y,Y,Y,N,,Y,PY,PRY,,,Paraguay,,,,,,Paraguay,Paraguay,Paraguay,Парагвай,巴拉圭,باراغواي,the Republic of Paraguay,Paraguay,Paraguay,Paraguay,Парагвай,巴拉圭,باراغواي,0,-23.23840821,-58.39126243,19,Americas,419,Latin America and the Caribbean,5,South America,paraguay,Upper middle,PYG,1974-01-01,173 - Paraguay
 174,187,604,175,Y,Y,Y,N,,Y,PE,PER,,,Peru,,,,,,Peru,Pérou,Perú,Перу,秘鲁,بيرو,the Republic of Peru,Peru,Pérou,Perú,Перу,秘鲁,بيرو,0,-9.167216491,-74.37537796,19,Americas,419,Latin America and the Caribbean,5,South America,peru,Upper middle,PEN,1974-01-01,174 - Peru
-175,188,608,176,Y,Y,Y,N,,,PH,PHL,,,Philippines,Philippines (the),,,,,Philippines,Philippines,Filipinas,Филиппины,菲律宾,الفلبين,the Republic of the Philippines,Philippines,Philippines,Filipinas,Филиппины,菲律宾,الفلبين,0,-0.736653675,127.2358509,142,Asia,35,South-eastern Asia,,,philippines,Lower middle,PHP,1976-01-01,175 - Philippines
+175,188,608,176,Y,Y,Y,N,,Y,PH,PHL,,,Philippines,Philippines (the),,,,,Philippines,Philippines,Filipinas,Филиппины,菲律宾,الفلبين,the Republic of the Philippines,Philippines,Philippines,Filipinas,Филиппины,菲律宾,الفلبين,0,-0.736653675,127.2358509,142,Asia,35,South-eastern Asia,,,philippines,Lower middle,PHP,1976-01-01,175 - Philippines
 176,189,612,177,,,N,N,,,PN,PCN,,,Pitcairn,,,,,Pitcairn Islands,Pitcairn,,,,,,,Pitcairn,Pitcairn,Pitcairn,Питкэрн,皮特凯恩,بيتكرن,0,-24.2051566,-127.9093208,9,Oceania,61,Polynesia,,,pitcairn,,NZD,1974-01-01,176 - Pitcairn
 177,190,616,178,Y,Y,Y,N,,Y,PL,POL,,,Poland,,,,,,Poland,Pologne,Polonia,Польша,波兰,بولندا,the Republic of Poland,Poland,Pologne,Polonia,Польша,波兰,بولندا,0,52.12847492,19.40086,150,Europe,151,Eastern Europe,,,poland,High,PLN,1974-01-01,177 - Poland
 178,191,620,179,Y,Y,Y,N,,,PT,PRT,,,Portugal,,,,,,Portugal,Portugal,Portugal,Португалия,葡萄牙,البرتغال,the Portuguese Republic,Portugal,Portugal,Portugal,Португалия,葡萄牙,البرتغال,0,39.23901506,-30.21832194,150,Europe,39,Southern Europe,,,portugal,High,EUR,1974-01-01,178 - Portugal
@@ -241,7 +241,7 @@ ID,RW ID,m49 numerical code,FTS API ID,Appears in UNTERM list,Appears in DGACM l
 239,248,860,240,Y,Y,Y,N,,,UZ,UZB,,,Uzbekistan,,,,,,Uzbekistan,Ouzbékistan,Uzbekistán,Узбекистан,乌兹别克斯坦,أوزبكستان,the Republic of Uzbekistan,Uzbekistan,Ouzbékistan,Uzbekistán,Узбекистан,乌兹别克斯坦,أوزبكستان,0,41.74950759,63.17455249,142,Asia,143,Central Asia,,,uzbek,Lower middle,UZS,1992-06-15,239 - Uzbekistan
 240,249,548,241,Y,Y,Y,N,,,VU,VUT,,,Vanuatu,,,,,,Vanuatu,Vanuatu,Vanuatu,Вануату,瓦努阿图,فانواتو,the Republic of Vanuatu,Vanuatu,Vanuatu,Vanuatu,Вануату,瓦努阿图,فانواتو,0,-21.04390394,171.2797047,9,Oceania,54,Melanesia,,,vanuatu|new.?hebrides,Lower middle,VUV,1980-01-01,240 - Vanuatu
 241,250,862,242,Y,Y,Y,N,Y,Y,VE,VEN,,,Venezuela (Bolivarian Republic of),,,"Venezuela, Bolivarian Republic of",Venezuela,,Venezuela (Bolivarian Republic of),Venezuela (République bolivarienne du),Venezuela (República Bolivariana de),Венесуэла (Боливарианская Республика),委内瑞拉玻利瓦尔共和国,فنزويلا (جمهورية - البوليفارية),the Bolivarian Republic of Venezuela,Venezuela (Bolivarian Republic of),Venezuela (République bolivarienne du),Venezuela (República Bolivariana de),Венесуэла (Боливарианская Республика),委内瑞拉玻利瓦尔共和国,فنزويلا (جمهورية - البوليفارية),0,7.115201972,-66.18367077,19,Americas,419,Latin America and the Caribbean,5,South America,venezuela,,VEF,2009-03-03,241 - Venezuela (Bolivarian Republic of)
-242,251,704,243,Y,Y,Y,N,,,VN,VNM,,,Viet Nam,,,,,,Viet Nam,Viet Nam,Viet Nam,Вьетнам,越南,فييت نام,the Socialist Republic of Viet Nam,Viet Nam,Viet Nam,Viet Nam,Вьетнам,越南,فييت نام,0,16.64893259,106.3103686,142,Asia,35,South-eastern Asia,,,^(?!south)(?!republic).*viet.?nam(?!.*south)|democratic.republic.of.vietnam|socialist.republic.of.viet.?nam|north.viet.?nam|viet.?nam.north,Lower middle,VND,1977-01-01,242 - Viet Nam
+242,251,704,243,Y,Y,Y,N,,Y,VN,VNM,,,Viet Nam,,,,,,Viet Nam,Viet Nam,Viet Nam,Вьетнам,越南,فييت نام,the Socialist Republic of Viet Nam,Viet Nam,Viet Nam,Viet Nam,Вьетнам,越南,فييت نام,0,16.64893259,106.3103686,142,Asia,35,South-eastern Asia,,,^(?!south)(?!republic).*viet.?nam(?!.*south)|democratic.republic.of.vietnam|socialist.republic.of.viet.?nam|north.viet.?nam|viet.?nam.north,Lower middle,VND,1977-01-01,242 - Viet Nam
 243,43,92,244,,,N,N,,,VG,VGB,,,British Virgin Islands,Virgin Islands (British),,"Virgin Islands, British",,,British Virgin Islands,,,,,,,British Virgin Islands,Îles Vierges britanniques,Islas Vírgenes Británicas,Британские Виргинские острова,英属维尔京群岛,جزر فرجن البريطانية,0,18.30332154,-65.11493198,19,Americas,419,Latin America and the Caribbean,29,Caribbean,^(?=.*\bu\.?\s?k).*virgin|^(?=.*brit).*virgin|^(?=.*kingdom).*virgin,High,USD,1974-01-01,243 - British Virgin Islands
 244,252,876,246,,,N,N,,,WF,WLF,,,Wallis and Futuna Islands,Wallis and Futuna,,Wallis and Futuna,,Wallis and Futuna (France),Wallis and Futuna Islands,,,,,,,Wallis and Futuna Islands,Îles Wallis-et-Futuna,Islas Wallis y Futuna,Острова Уоллис и Футуна,瓦利斯群岛和富图纳群岛,جزر واليس وفوتونا,0,-14.36099529,-178.0421057,9,Oceania,61,Polynesia,,,futuna|wallis,,XPF,1974-01-01,244 - Wallis and Futuna Islands
 245,253,732,247,,,N,N,,,EH,ESH,,,Western Sahara,,,"Western Sahara, non-self-governing territory",,,Western Sahara,,,,,,,Western Sahara,Sahara occidental,Sáhara Occidental,Западная Сахара,西撒哈拉,الصحراء الغربية,0,24.66295331,-13.13425705,2,Africa,15,Northern Africa,,,western.sahara,,MAD,1985-01-01,245 - Western Sahara

{hdx_python_country-3.9.2 → hdx_python_country-3.9.4}/src/hdx/location/_version.py

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '3.9.2'
-__version_tuple__ = version_tuple = (3, 9, 2)
+__version__ = version = '3.9.4'
+__version_tuple__ = version_tuple = (3, 9, 4)

{hdx_python_country-3.9.2 → hdx_python_country-3.9.4}/src/hdx/location/country.py

@@ -8,7 +8,7 @@ from string import punctuation
 from typing import Dict, List, Optional, Tuple, Union
 
 import hxl
-from hxl import InputOptions
+from hxl import Dataset, InputOptions
 
 from hdx.utilities.path import script_dir_plus_file
 from hdx.utilities.text import get_words_in_sentence
@@ -69,6 +69,8 @@ class Country:
         "KINGDOM",
         "PROTECTORATE",
     ]
+    _include_unofficial_default = False
+    _include_unofficial = _include_unofficial_default
     _use_live_default = True
     _use_live = _use_live_default
     _countriesdata = None
@@ -102,6 +104,8 @@ class Country:
         if countryname is not None:
             country["#country+name+override"] = countryname
         iso2 = hxlcountry.get("#country+code+v_iso2")
+        if not iso2 and cls._include_unofficial:
+            iso2 = hxlcountry.get("#country+code+alpha2")
         if iso2:
             cls._countriesdata["iso2iso3"][iso2] = iso3
             # different types so keys won't clash
@@ -159,12 +163,12 @@ class Country:
         return country
 
     @classmethod
-    def set_countriesdata(cls, countries: str) -> None:
+    def set_countriesdata(cls, countries: Dataset) -> None:
         """
-        Set up countries data from data in form provided by UNStats and World Bank
+        Set up countries data from OCHA countries and territories dataset
 
         Args:
-            countries (str): Countries data in HTML format provided by UNStats
+            countries (Dataset): Countries data from countries and territories dataset
 
         Returns:
             None
@@ -186,7 +190,12 @@ class Country:
         for country in countries:
             iso3 = country.get("#country+code+v_iso3")
             if not iso3:
-                continue
+                if cls._include_unofficial:
+                    iso3 = country.get("#country+code+alpha3")
+                    if not iso3:
+                        continue
+                else:
+                    continue
             iso3 = iso3.upper()
             countrydict = cls._add_countriesdata(iso3, country)
             cls._countriesdata["countries"][iso3] = countrydict
@@ -202,30 +211,37 @@ class Country:
     @classmethod
     def countriesdata(
         cls,
-        use_live: bool = None,
-        country_name_overrides: Dict = None,
-        country_name_mappings: Dict = None,
+        include_unofficial: Optional[bool] = None,
+        use_live: Optional[bool] = None,
+        country_name_overrides: Optional[Dict] = None,
+        country_name_mappings: Optional[Dict] = None,
     ) -> List[Dict[str, Dict]]:
         """
-        Read countries data from OCHA countries feed (falling back to file)
+        Read countries data from OCHA countries feed (falling back to file).
+        include_unofficial, use_live, country_name_overrides and country_name_mappings
+        are taken from internal defaults if they are None, otherwise the internal
+        defaults are overridden.
 
         Args:
-            use_live (bool): Try to get use latest data from web rather than file in package. Defaults to True.
-            country_name_overrides (Dict): Dictionary of mappings from iso3 to country name
-            country_name_mappings (Dict): Dictionary of mappings from country name to iso3
+            include_unofficial (Optional[bool]): Include unofficial country alpha codes. Defaults to False.
+            use_live (Optional[bool]): Try to get latest data from web rather than file in package. Defaults to True.
+            country_name_overrides (Optional[Dict]): Dictionary of mappings from iso3 to country name
+            country_name_mappings (Optional[Dict]): Dictionary of mappings from country name to iso3
 
         Returns:
             List[Dict[str,Dict]]: Countries dictionaries
         """
-        if use_live is None:
-            use_live = cls._use_live
+        if include_unofficial is not None:
+            cls._include_unofficial = include_unofficial
+        if use_live is not None:
+            cls._use_live = use_live
         if cls._countriesdata is None:
             countries = None
             if country_name_overrides is not None:
                 cls.set_country_name_overrides(country_name_overrides)
             if country_name_mappings is not None:
                 cls.set_country_name_mappings(country_name_mappings)
-            if use_live:
+            if cls._use_live:
                 try:
                     countries = hxl.data(cls._ochaurl, InputOptions(encoding="utf-8"))
                 except OSError:
@@ -240,6 +256,24 @@ class Country:
             cls.set_countriesdata(countries)
         return cls._countriesdata
 
+    @classmethod
+    def set_include_unofficial_default(
+        cls, include_unofficial: Optional[bool] = None
+    ) -> None:
+        """
+        Set the default for include_unofficial which defines if unofficial alpha2 and
+        alpha3 codes such as AN and XKX will be included.
+
+        Args:
+            include_unofficial (bool): Default value to use for include_unofficial. Defaults to internal value (False).
+
+        Returns:
+            None
+        """
+        if include_unofficial is None:
+            include_unofficial = cls._include_unofficial
+        cls._include_unofficial = include_unofficial
+
     @classmethod
     def set_use_live_default(cls, use_live: Optional[bool] = None) -> None:
         """
@@ -709,7 +743,7 @@ class Country:
             for simplification2 in simplifications:
                 remove.append(simplification2)
         remove = "|".join(remove)
-        regex = re.compile(r"\b(" + remove + r")\b", flags=re.IGNORECASE)
+        regex = re.compile(r"[^\w\s]|\b(" + remove + r")\b", flags=re.IGNORECASE)
         countryupper = regex.sub("", countryupper)
         countryupper = countryupper.strip()
         countryupper_words = get_words_in_sentence(countryupper)

{hdx_python_country-3.9.2 → hdx_python_country-3.9.4}/tests/hdx/location/Countries_UZB_Deleted.csv

@@ -1,5 +1,5 @@
 ID,RW ID,m49 numerical code,FTS API ID,Appears in UNTERM list,Appears in DGACM list,Independent,Deprecated,Has HRP,In GHO,ISO 3166-1 Alpha 2-Codes,ISO 3166-1 Alpha 3-Codes,x Alpha2 codes,x Alpha3 codes,Preferred Term,ISO Alt Term,DGACM Alt Term,FTS Alt Term,RW Short Name,RW API Alt Term,English Short,French Short,Spanish Short,Russian Short,Chinese Short,Arabic Short,English Formal,M49 English,M49 French,M49 Spanish,M49 Russian,M49 Chinese,M49 Arabic,Admin Level,Latitude,Longitude,Region Code,Region Name,Sub-region Code,Sub-region Name,Intermediate Region Code,Intermediate Region Name,Regex,World Bank Income Level,Currency,Reference Period Start,Concatenation
-#meta +id,#country +code +v_reliefweb,#country +code +num +v_m49,#country +code +v_fts,,,#meta+independent+bool,#meta+deprecated+bool,#indicator+hrp+bool,#indicator+gho+bool,#country +code +v_iso2,#country +code +v_iso3,,,#country +name +preferred,#country +name +alt +v_iso,#country +name +alt +v_dgacm,#country +name +alt +v_fts,#country +name +short +v_reliefweb,#country +name +alt +v_reliefweb,#country +name +i_en +alt +v_unterm,#country +name +i_fr +alt +v_unterm,#country +name +i_es +alt +v_unterm,#country +name +i_ru +alt +v_unterm,#country +name +i_zh +alt +v_unterm,#country +name +i_ar +alt +v_unterm,#country +name +i_en +formal +v_unterm,#country +name +i_en +alt +v_m49,#country +name +i_fr +alt +v_m49,#country +name +i_es +alt +v_m49,#country +name +i_ru +alt +v_m49,#country +name +i_zh +alt +v_m49,#country +name +i_ar +alt +v_m49,#geo +admin_level,#geo +lat,#geo +lon,#region +main +code,#region +main +name +preferred,#region +sub +code,#region +sub +name +preferred,#region +intermediate +code,#region +intermediate +name +preferred,#country +regex,#indicator+incomelevel,#currency +code,#date+start,
+#meta +id,#country +code +v_reliefweb,#country +code +num +v_m49,#country +code +v_fts,,,#meta+independent+bool,#meta+deprecated+bool,#indicator+hrp+bool,#indicator+gho+bool,#country +code +v_iso2,#country +code +v_iso3,#country +code +alpha2,#country +code +alpha3,#country +name +preferred,#country +name +alt +v_iso,#country +name +alt +v_dgacm,#country +name +alt +v_fts,#country +name +short +v_reliefweb,#country +name +alt +v_reliefweb,#country +name +i_en +alt +v_unterm,#country +name +i_fr +alt +v_unterm,#country +name +i_es +alt +v_unterm,#country +name +i_ru +alt +v_unterm,#country +name +i_zh +alt +v_unterm,#country +name +i_ar +alt +v_unterm,#country +name +i_en +formal +v_unterm,#country +name +i_en +alt +v_m49,#country +name +i_fr +alt +v_m49,#country +name +i_es +alt +v_m49,#country +name +i_ru +alt +v_m49,#country +name +i_zh +alt +v_m49,#country +name +i_ar +alt +v_m49,#geo +admin_level,#geo +lat,#geo +lon,#region +main +code,#region +main +name +preferred,#region +sub +code,#region +sub +name +preferred,#region +intermediate +code,#region +intermediate +name +preferred,#country +regex,#indicator+incomelevel,#currency +code,#date+start,
 1,13,4,1,Y,Y,Y,N,Y,Y,AF,AFG,,,Afghanistan,,,,,,Afghanistan,Afghanistan,Afganistán,Афганистан,阿富汗,أفغانستان,the Islamic Republic of Afghanistan,Afghanistan,Afghanistan,Afganistán,Афганистан,阿富汗,أفغانستان,0,33.83147477,66.02621828,142,Asia,34,Southern Asia,,,afghan,Low,AFN,2004-01-26,1 - Afghanistan
 2,14,248,2,,,N,N,,,AX,ALA,,,Åland Islands,,,,,Aland Islands (Finland),Åland Islands,,,,,,,Åland Islands,Îles d’Åland,Islas Åland,Аландских островов,奥兰群岛,جزر ألاند,0,60.18121338,19.89649072,150,Europe,154,Northern Europe,,,^[å|a]land,,EUR,2004-02-13,2 - Åland Islands
 3,15,8,3,Y,Y,Y,N,,,AL,ALB,,,Albania,,,,,,Albania,Albanie,Albania,Албания,阿尔巴尼亚,ألبانيا,the Republic of Albania,Albania,Albanie,Albania,Албания,阿尔巴尼亚,ألبانيا,0,41.13180899,20.06882519,150,Europe,39,Southern Europe,,,albania,Upper middle,ALL,1974-01-01,3 - Albania
@@ -105,7 +105,7 @@ ID,RW ID,m49 numerical code,FTS API ID,Appears in UNTERM list,Appears in DGACM l
 103,119,356,103,Y,Y,Y,N,,,IN,IND,,,India,,,,,,India,Inde,India,Индия,印度,الهند,the Republic of India,India,Inde,India,Индия,印度,الهند,0,22.37137039,79.32792202,142,Asia,34,Southern Asia,,,^(?!\D*(?:bassas))\D*india(?!.*ocea)(?!na),Lower middle,INR,1975-01-01,103 - India
 104,120,360,104,Y,Y,Y,N,,,ID,IDN,,,Indonesia,,,,,,Indonesia,Indonésie,Indonesia,Индонезия,印度尼西亚,إندونيسيا,the Republic of Indonesia,Indonesia,Indonésie,Indonesia,Индонезия,印度尼西亚,إندونيسيا,0,-2.21433486,117.2844335,142,Asia,35,South-eastern Asia,,,indonesia,Upper middle,IDR,1974-01-01,104 - Indonesia
 105,121,364,105,Y,Y,Y,N,,Y,IR,IRN,,,Iran (Islamic Republic of),,,"Iran, Islamic Republic of",Iran,,Iran (Islamic Republic of),Iran (République islamique d'),Irán (República Islámica del),Иран (Исламская Республика),伊朗伊斯兰共和国,إيران (جمهورية - الإسلامية),the Islamic Republic of Iran,Iran (Islamic Republic of),Iran (République islamique d’),Irán (República Islámica del),Иран (Исламская Республика),伊朗伊斯兰共和国,إيران (جمهورية - الإسلامية),0,32.57533772,54.2973284,142,Asia,34,Southern Asia,,,\biran|persia,Lower middle,IRR,1974-01-01,105 - Iran (Islamic Republic of)
-106,122,368,106,Y,Y,Y,N,,Y,IQ,IRQ,,,Iraq,,,,,,Iraq,Iraq,Iraq,Ирак,伊拉克,العراق,the Republic of Iraq,Iraq,Iraq,Iraq,Ирак,伊拉克,العراق,0,33.04497404,43.77207391,142,Asia,145,Western Asia,,,\biraq|mesopotamia,Upper middle,IQD,1974-01-01,106 - Iraq
+106,122,368,106,Y,Y,Y,N,,,IQ,IRQ,,,Iraq,,,,,,Iraq,Iraq,Iraq,Ирак,伊拉克,العراق,the Republic of Iraq,Iraq,Iraq,Iraq,Ирак,伊拉克,العراق,0,33.04497404,43.77207391,142,Asia,145,Western Asia,,,\biraq|mesopotamia,Upper middle,IQD,1974-01-01,106 - Iraq
 107,123,372,107,Y,Y,Y,N,,,IE,IRL,,,Ireland,,,,,,Ireland,Irlande,Irlanda,Ирландия,爱尔兰,أيرلندا,Ireland,Ireland,Irlande,Irlanda,Ирландия,爱尔兰,آيرلندا,0,53.16969376,-8.154213185,150,Europe,154,Northern Europe,,,^(?!.*north).*\bireland,High,EUR,1974-01-01,107 - Ireland
 108,124,833,108,,,N,N,,,IM,IMN,,,Isle of Man,,,,,Isle of Man (The United Kingdom of Great Britain and Northern Ireland),Isle of Man,,,,,,,Isle of Man,Île de Man,Isla de Man,Остров Мэн,马恩岛,جزيرة مان,0,54.23948288,-4.51817639,150,Europe,154,Northern Europe,,,^(?=.*isle).*\bman,High,GBP,2006-03-29,108 - Isle of Man
 109,125,376,109,Y,Y,Y,N,,,IL,ISR,,,Israel,,,,,,Israel,Israël,Israel,Израиль,以色列,إسرائيل,the State of Israel,Israel,Israël,Israel,Израиль,以色列,إسرائيل,0,31.33857325,34.96023155,142,Asia,145,Western Asia,,,israel,High,ILS,1974-01-01,109 - Israel
@@ -132,8 +132,8 @@ ID,RW ID,m49 numerical code,FTS API ID,Appears in UNTERM list,Appears in DGACM l
 130,143,442,130,Y,Y,Y,N,,,LU,LUX,,,Luxembourg,,,,,,Luxembourg,Luxembourg,Luxemburgo,Люксембург,卢森堡,لكسمبرغ,the Grand Duchy of Luxembourg,Luxembourg,Luxembourg,Luxemburgo,Люксембург,卢森堡,لكسمبرغ,0,49.77027091,6.08637699,150,Europe,155,Western Europe,,,^(?!.*belg).*luxem,High,EUR,1974-01-01,130 - Luxembourg
 131,60,446,131,,,N,N,,,MO,MAC,,,"China, Macao Special Administrative Region",Macao,,Macao,,China - Macau (Special Administrative Region),Macao,,,,,,,"China, Macao Special Administrative Region","Chine, région administrative spéciale de Macao","China, región administrativa especial de Macao","Китай, Специальный административный район Макао",中国澳门特别行政区,الصين، منطقة ماكاو الإدارية الخاصة,0,22.1985265,113.5450075,142,Asia,30,Eastern Asia,,,maca(o|u),High,MOP,1974-01-01,"131 - China, Macao Special Administrative Region"
 132,229,807,132,Y,Y,Y,N,,,MK,MKD,,,North Macedonia,,,"North Macedonia, Republic of",,the Republic of North Macedonia,North Macedonia,Macédoine du Nord,Macedonia del Norte,Северная Македония,北马其顿,مقدونيا الشمالية,the Republic of North Macedonia,North Macedonia,Macédoine du Nord,Macedonia del Norte,Северная Македония,北马其顿,مقدونيا الشمالية,0,41.59654823,21.69480535,150,Europe,39,Southern Europe,,,macedonia|^f\.?y\.?r\.?o\.?m\.?$,Upper middle,MKD,2019-02-14,132 - North Macedonia
-133,144,450,133,Y,Y,Y,N,,Y,MG,MDG,,,Madagascar,,,,,,Madagascar,Madagascar,Madagascar,Мадагаскар,马达加斯加,مدغشقر,the Republic of Madagascar,Madagascar,Madagascar,Madagascar,Мадагаскар,马达加斯加,مدغشقر,0,-19.37969027,46.70406219,2,Africa,202,Sub-Saharan Africa,14,Eastern Africa,madagascar|malagasy,Low,MGA,1993-07-12,133 - Madagascar
-134,146,454,134,Y,Y,Y,N,,,MW,MWI,,,Malawi,,,,,,Malawi,Malawi,Malawi,Малави,马拉维,ملاوي,the Republic of Malawi,Malawi,Malawi,Malawi,Малави,马拉维,ملاوي,0,-13.21991287,34.31171876,2,Africa,202,Sub-Saharan Africa,14,Eastern Africa,malawi|nyasa,Low,MWK,1974-01-01,134 - Malawi
+133,144,450,133,Y,Y,Y,N,,,MG,MDG,,,Madagascar,,,,,,Madagascar,Madagascar,Madagascar,Мадагаскар,马达加斯加,مدغشقر,the Republic of Madagascar,Madagascar,Madagascar,Madagascar,Мадагаскар,马达加斯加,مدغشقر,0,-19.37969027,46.70406219,2,Africa,202,Sub-Saharan Africa,14,Eastern Africa,madagascar|malagasy,Low,MGA,1993-07-12,133 - Madagascar
+134,146,454,134,Y,Y,Y,N,,Y,MW,MWI,,,Malawi,,,,,,Malawi,Malawi,Malawi,Малави,马拉维,ملاوي,the Republic of Malawi,Malawi,Malawi,Malawi,Малави,马拉维,ملاوي,0,-13.21991287,34.31171876,2,Africa,202,Sub-Saharan Africa,14,Eastern Africa,malawi|nyasa,Low,MWK,1974-01-01,134 - Malawi
 135,147,458,135,Y,Y,Y,N,,,MY,MYS,,,Malaysia,,,,,,Malaysia,Malaisie,Malasia,Малайзия,马来西亚,ماليزيا,Malaysia,Malaysia,Malaisie,Malasia,Малайзия,马来西亚,ماليزيا,0,2.745185714,140.4915783,142,Asia,35,South-eastern Asia,,,malaysia,Upper middle,MYR,1974-01-01,135 - Malaysia
 136,148,462,136,Y,Y,Y,N,,,MV,MDV,,,Maldives,,,,,,Maldives,Maldives,Maldivas,Мальдивские Острова,马尔代夫,ملديف,the Republic of Maldives,Maldives,Maldives,Maldivas,Мальдивские Острова,马尔代夫,ملديف,0,5.068606213,73.32614511,142,Asia,34,Southern Asia,,,maldive,Upper middle,MVR,1974-01-01,136 - Maldives
 137,149,466,137,Y,Y,Y,N,Y,Y,ML,MLI,,,Mali,,,,,,Mali,Mali,Malí,Мали,马里,مالي,the Republic of Mali,Mali,Mali,Malí,Мали,马里,مالي,0,17.34640627,-3.525051581,2,Africa,202,Sub-Saharan Africa,11,Western Africa,\bmali\b,Low,XOF,1974-01-01,137 - Mali
@@ -174,7 +174,7 @@ ID,RW ID,m49 numerical code,FTS API ID,Appears in UNTERM list,Appears in DGACM l
 172,185,598,173,Y,Y,Y,N,,,PG,PNG,,,Papua New Guinea,,,,PNG,,Papua New Guinea,Papouasie-Nouvelle-Guinée,Papua Nueva Guinea,Папуа — Новая Гвинея,巴布亚新几内亚,بابوا غينيا الجديدة,the Independent State of Papua New Guinea,Papua New Guinea,Papouasie-Nouvelle-Guinée,Papua Nueva Guinea,Папуа-Новая Гвинея,巴布亚新几内亚,بابوا غينيا الجديدة,0,-6.834760878,143.0464597,9,Oceania,54,Melanesia,,,papua|new.?guinea,Lower middle,PGK,1974-01-01,172 - Papua New Guinea
 173,186,600,174,Y,Y,Y,N,,Y,PY,PRY,,,Paraguay,,,,,,Paraguay,Paraguay,Paraguay,Парагвай,巴拉圭,باراغواي,the Republic of Paraguay,Paraguay,Paraguay,Paraguay,Парагвай,巴拉圭,باراغواي,0,-23.23840821,-58.39126243,19,Americas,419,Latin America and the Caribbean,5,South America,paraguay,Upper middle,PYG,1974-01-01,173 - Paraguay
 174,187,604,175,Y,Y,Y,N,,Y,PE,PER,,,Peru,,,,,,Peru,Pérou,Perú,Перу,秘鲁,بيرو,the Republic of Peru,Peru,Pérou,Perú,Перу,秘鲁,بيرو,0,-9.167216491,-74.37537796,19,Americas,419,Latin America and the Caribbean,5,South America,peru,Upper middle,PEN,1974-01-01,174 - Peru
-175,188,608,176,Y,Y,Y,N,,,PH,PHL,,,Philippines,Philippines (the),,,,,Philippines,Philippines,Filipinas,Филиппины,菲律宾,الفلبين,the Republic of the Philippines,Philippines,Philippines,Filipinas,Филиппины,菲律宾,الفلبين,0,-0.736653675,127.2358509,142,Asia,35,South-eastern Asia,,,philippines,Lower middle,PHP,1976-01-01,175 - Philippines
+175,188,608,176,Y,Y,Y,N,,Y,PH,PHL,,,Philippines,Philippines (the),,,,,Philippines,Philippines,Filipinas,Филиппины,菲律宾,الفلبين,the Republic of the Philippines,Philippines,Philippines,Filipinas,Филиппины,菲律宾,الفلبين,0,-0.736653675,127.2358509,142,Asia,35,South-eastern Asia,,,philippines,Lower middle,PHP,1976-01-01,175 - Philippines
 176,189,612,177,,,N,N,,,PN,PCN,,,Pitcairn,,,,,Pitcairn Islands,Pitcairn,,,,,,,Pitcairn,Pitcairn,Pitcairn,Питкэрн,皮特凯恩,بيتكرن,0,-24.2051566,-127.9093208,9,Oceania,61,Polynesia,,,pitcairn,,NZD,1974-01-01,176 - Pitcairn
 177,190,616,178,Y,Y,Y,N,,Y,PL,POL,,,Poland,,,,,,Poland,Pologne,Polonia,Польша,波兰,بولندا,the Republic of Poland,Poland,Pologne,Polonia,Польша,波兰,بولندا,0,52.12847492,19.40086,150,Europe,151,Eastern Europe,,,poland,High,PLN,1974-01-01,177 - Poland
 178,191,620,179,Y,Y,Y,N,,,PT,PRT,,,Portugal,,,,,,Portugal,Portugal,Portugal,Португалия,葡萄牙,البرتغال,the Portuguese Republic,Portugal,Portugal,Portugal,Португалия,葡萄牙,البرتغال,0,39.23901506,-30.21832194,150,Europe,39,Southern Europe,,,portugal,High,EUR,1974-01-01,178 - Portugal
@@ -240,7 +240,7 @@ ID,RW ID,m49 numerical code,FTS API ID,Appears in UNTERM list,Appears in DGACM l
 238,247,858,239,Y,Y,Y,N,,Y,UY,URY,,,Uruguay,,,,,,Uruguay,Uruguay,Uruguay,Уругвай,乌拉圭,أوروغواي,the Eastern Republic of Uruguay,Uruguay,Uruguay,Uruguay,Уругвай,乌拉圭,أوروغواي,0,-32.80198719,-56.01417232,19,Americas,419,Latin America and the Caribbean,5,South America,uruguay,High,UYU,1974-01-01,238 - Uruguay
 240,249,548,241,Y,Y,Y,N,,,VU,VUT,,,Vanuatu,,,,,,Vanuatu,Vanuatu,Vanuatu,Вануату,瓦努阿图,فانواتو,the Republic of Vanuatu,Vanuatu,Vanuatu,Vanuatu,Вануату,瓦努阿图,فانواتو,0,-21.04390394,171.2797047,9,Oceania,54,Melanesia,,,vanuatu|new.?hebrides,Lower middle,VUV,1980-01-01,240 - Vanuatu
 241,250,862,242,Y,Y,Y,N,Y,Y,VE,VEN,,,Venezuela (Bolivarian Republic of),,,"Venezuela, Bolivarian Republic of",Venezuela,,Venezuela (Bolivarian Republic of),Venezuela (République bolivarienne du),Venezuela (República Bolivariana de),Венесуэла (Боливарианская Республика),委内瑞拉玻利瓦尔共和国,فنزويلا (جمهورية - البوليفارية),the Bolivarian Republic of Venezuela,Venezuela (Bolivarian Republic of),Venezuela (République bolivarienne du),Venezuela (República Bolivariana de),Венесуэла (Боливарианская Республика),委内瑞拉玻利瓦尔共和国,فنزويلا (جمهورية - البوليفارية),0,7.115201972,-66.18367077,19,Americas,419,Latin America and the Caribbean,5,South America,venezuela,,VEF,2009-03-03,241 - Venezuela (Bolivarian Republic of)
-242,251,704,243,Y,Y,Y,N,,,VN,VNM,,,Viet Nam,,,,,,Viet Nam,Viet Nam,Viet Nam,Вьетнам,越南,فييت نام,the Socialist Republic of Viet Nam,Viet Nam,Viet Nam,Viet Nam,Вьетнам,越南,فييت نام,0,16.64893259,106.3103686,142,Asia,35,South-eastern Asia,,,^(?!south)(?!republic).*viet.?nam(?!.*south)|democratic.republic.of.vietnam|socialist.republic.of.viet.?nam|north.viet.?nam|viet.?nam.north,Lower middle,VND,1977-01-01,242 - Viet Nam
+242,251,704,243,Y,Y,Y,N,,Y,VN,VNM,,,Viet Nam,,,,,,Viet Nam,Viet Nam,Viet Nam,Вьетнам,越南,فييت نام,the Socialist Republic of Viet Nam,Viet Nam,Viet Nam,Viet Nam,Вьетнам,越南,فييت نام,0,16.64893259,106.3103686,142,Asia,35,South-eastern Asia,,,^(?!south)(?!republic).*viet.?nam(?!.*south)|democratic.republic.of.vietnam|socialist.republic.of.viet.?nam|north.viet.?nam|viet.?nam.north,Lower middle,VND,1977-01-01,242 - Viet Nam
 243,43,92,244,,,N,N,,,VG,VGB,,,British Virgin Islands,Virgin Islands (British),,"Virgin Islands, British",,,British Virgin Islands,,,,,,,British Virgin Islands,Îles Vierges britanniques,Islas Vírgenes Británicas,Британские Виргинские острова,英属维尔京群岛,جزر فرجن البريطانية,0,18.30332154,-65.11493198,19,Americas,419,Latin America and the Caribbean,29,Caribbean,^(?=.*\bu\.?\s?k).*virgin|^(?=.*brit).*virgin|^(?=.*kingdom).*virgin,High,USD,1974-01-01,243 - British Virgin Islands
 244,252,876,246,,,N,N,,,WF,WLF,,,Wallis and Futuna Islands,Wallis and Futuna,,Wallis and Futuna,,Wallis and Futuna (France),Wallis and Futuna Islands,,,,,,,Wallis and Futuna Islands,Îles Wallis-et-Futuna,Islas Wallis y Futuna,Острова Уоллис и Футуна,瓦利斯群岛和富图纳群岛,جزر واليس وفوتونا,0,-14.36099529,-178.0421057,9,Oceania,61,Polynesia,,,futuna|wallis,,XPF,1974-01-01,244 - Wallis and Futuna Islands
 245,253,732,247,,,N,N,,,EH,ESH,,,Western Sahara,,,"Western Sahara, non-self-governing territory",,,Western Sahara,,,,,,,Western Sahara,Sahara occidental,Sáhara Occidental,Западная Сахара,西撒哈拉,الصحراء الغربية,0,24.66295331,-13.13425705,2,Africa,15,Northern Africa,,,western.sahara,,MAD,1985-01-01,245 - Western Sahara

{hdx_python_country-3.9.2 → hdx_python_country-3.9.4}/tests/hdx/location/test_country.py

@@ -13,13 +13,22 @@ class LocationError(Exception):
 
 
 class TestCountry:
-    @pytest.fixture(scope="function", autouse=True)
-    def setup(self):
-        # Clean up Country class before each test
+    def clear_data(self):
         Country._countriesdata = None
         Country.set_use_live_default(False)
         Country.set_ocha_url()
         Country.set_ocha_path()
+
+    def setup_unofficial_date(self):
+        self.clear_data()
+        Country.set_include_unofficial_default(True)
+        Country.countriesdata()
+
+    @pytest.fixture(scope="function", autouse=True)
+    def setup(self):
+        # Clean up Country class before each test
+        self.clear_data()
+        Country.set_include_unofficial_default(False)
         Country.countriesdata(
             country_name_overrides={"PSE": "oPt"},
             country_name_mappings={"Congo DR": "COD"},
@@ -52,6 +61,10 @@ class TestCountry:
             == "Taiwan (Province of China)"
         )
         assert Country.get_country_name_from_iso3("PSE") == "oPt"
+        with pytest.raises(LocationError):
+            Country.get_iso2_from_iso3("CHI", exception=LocationError)
+        self.setup_unofficial_date()
+        assert Country.get_country_name_from_iso3("CHI") == "Channel Islands"
 
     def test_get_iso2_from_iso3(self):
         assert Country.get_iso2_from_iso3("jpn") == "JP"
@@ -67,6 +80,8 @@ class TestCountry:
 
     def test_get_country_info_from_iso3(self):
         assert Country.get_country_info_from_iso3("bih") == {
+            "#country+alpha2+code": "",
+            "#country+alpha3+code": "",
             "#country+alt+i_ar+name+v_m49": "البوسنة والهرسك",
             "#country+alt+i_ar+name+v_unterm": "البوسنة والهرسك",
             "#country+alt+i_en+name+v_m49": "Bosnia and Herzegovina",
@@ -111,6 +126,8 @@ class TestCountry:
             "#region+name+preferred+sub": "Southern Europe",
         }
         assert Country.get_country_info_from_iso3("PSE") == {
+            "#country+alpha2+code": "",
+            "#country+alpha3+code": "",
             "#country+alt+i_ar+name+v_m49": "دولة فلسطين",
             "#country+alt+i_ar+name+v_unterm": "دولة فلسطين",
             "#country+alt+i_en+name+v_m49": "State of Palestine",
@@ -155,6 +172,55 @@ class TestCountry:
             "#region+main+name+preferred": "Asia",
             "#region+name+preferred+sub": "Western Asia",
         }
+        with pytest.raises(LocationError):
+            Country.get_country_name_from_iso2("AZO", exception=LocationError)
+        self.setup_unofficial_date()
+        assert Country.get_country_info_from_iso3("AZO") == {
+            "#country+alpha2+code": "",
+            "#country+alpha3+code": "AZO",
+            "#country+alt+i_ar+name+v_m49": "",
+            "#country+alt+i_ar+name+v_unterm": "",
+            "#country+alt+i_en+name+v_m49": "",
+            "#country+alt+i_en+name+v_unterm": "Azores Islands",
+            "#country+alt+i_es+name+v_m49": "",
+            "#country+alt+i_es+name+v_unterm": "",
+            "#country+alt+i_fr+name+v_m49": "",
+            "#country+alt+i_fr+name+v_unterm": "",
+            "#country+alt+i_ru+name+v_m49": "",
+            "#country+alt+i_ru+name+v_unterm": "",
+            "#country+alt+i_zh+name+v_m49": "",
+            "#country+alt+i_zh+name+v_unterm": "",
+            "#country+alt+name+v_dgacm": "",
+            "#country+alt+name+v_fts": "",
+            "#country+alt+name+v_iso": "",
+            "#country+alt+name+v_reliefweb": "",
+            "#country+code+num+v_m49": "",
+            "#country+code+v_fts": "",
+            "#country+code+v_iso2": "",
+            "#country+code+v_iso3": "",
+            "#country+code+v_reliefweb": "28",
+            "#country+formal+i_en+name+v_unterm": "",
+            "#country+name+preferred": "Azores Islands (Portugal)",
+            "#country+name+short+v_reliefweb": "",
+            "#country+regex": "azores",
+            "#currency+code": "EUR",
+            "#date+start": "1974-01-01",
+            "#geo+admin_level": "",
+            "#geo+lat": "38.72708329",
+            "#geo+lon": "-27.26017212",
+            "#indicator+bool+gho": "",
+            "#indicator+bool+hrp": "",
+            "#indicator+incomelevel": "",
+            "#meta+bool+deprecated": "N",
+            "#meta+bool+independent": "N",
+            "#meta+id": "249",
+            "#region+code+intermediate": "",
+            "#region+code+main": "150",
+            "#region+code+sub": "39",
+            "#region+intermediate+name+preferred": "",
+            "#region+main+name+preferred": "Europe",
+            "#region+name+preferred+sub": "Southern Europe",
+        }
 
     def test_get_currency_from_iso3(self):
         assert Country.get_currency_from_iso3("jpn") == "JPY"
@@ -164,6 +230,8 @@ class TestCountry:
 
     def test_get_country_info_from_iso2(self):
         assert Country.get_country_info_from_iso2("jp") == {
+            "#country+alpha2+code": "",
+            "#country+alpha3+code": "",
             "#country+alt+i_ar+name+v_m49": "اليابان",
             "#country+alt+i_ar+name+v_unterm": "اليابان",
             "#country+alt+i_en+name+v_m49": "Japan",
@@ -209,6 +277,8 @@ class TestCountry:
         }
         assert Country.get_country_info_from_iso2("ab") is None
         assert Country.get_country_info_from_iso2("TW") == {
+            "#country+alpha2+code": "",
+            "#country+alpha3+code": "",
             "#country+alt+i_ar+name+v_m49": "",
             "#country+alt+i_ar+name+v_unterm": "",
             "#country+alt+i_en+name+v_m49": "",
@@ -254,6 +324,8 @@ class TestCountry:
         }
 
         assert Country.get_country_info_from_iso2("PS") == {
+            "#country+alpha2+code": "",
+            "#country+alpha3+code": "",
             "#country+alt+i_ar+name+v_m49": "دولة فلسطين",
             "#country+alt+i_ar+name+v_unterm": "دولة فلسطين",
             "#country+alt+i_en+name+v_m49": "State of Palestine",
@@ -298,6 +370,56 @@ class TestCountry:
             "#region+main+name+preferred": "Asia",
             "#region+name+preferred+sub": "Western Asia",
         }
+        with pytest.raises(LocationError):
+            Country.get_country_info_from_iso2("XK", exception=LocationError)
+        self.setup_unofficial_date()
+        assert Country.get_country_info_from_iso2("XK") == {
+            "#country+alpha2+code": "XK",
+            "#country+alpha3+code": "XKX",
+            "#country+alt+i_ar+name+v_m49": "",
+            "#country+alt+i_ar+name+v_unterm": "",
+            "#country+alt+i_en+name+v_m49": "",
+            "#country+alt+i_en+name+v_unterm": "Kosovo",
+            "#country+alt+i_es+name+v_m49": "",
+            "#country+alt+i_es+name+v_unterm": "",
+            "#country+alt+i_fr+name+v_m49": "",
+            "#country+alt+i_fr+name+v_unterm": "",
+            "#country+alt+i_ru+name+v_m49": "",
+            "#country+alt+i_ru+name+v_unterm": "",
+            "#country+alt+i_zh+name+v_m49": "",
+            "#country+alt+i_zh+name+v_unterm": "",
+            "#country+alt+name+v_dgacm": "",
+            "#country+alt+name+v_fts": "",
+            "#country+alt+name+v_iso": "",
+            "#country+alt+name+v_reliefweb": "",
+            "#country+code+num+v_m49": "",
+            "#country+code+v_fts": "",
+            "#country+code+v_iso2": "",
+            "#country+code+v_iso3": "",
+            "#country+code+v_reliefweb": "",
+            "#country+formal+i_en+name+v_unterm": "",
+            "#country+name+preferred": "Kosovo",
+            "#country+name+short+v_reliefweb": "",
+            "#country+regex": "kosovo",
+            "#currency+code": "EUR",
+            "#date+start": "1974-01-01",
+            "#geo+admin_level": "",
+            "#geo+lat": "42.61901705",
+            "#geo+lon": "20.90987836",
+            "#indicator+bool+gho": "",
+            "#indicator+bool+hrp": "",
+            "#indicator+incomelevel": "",
+            "#meta+bool+deprecated": "N",
+            "#meta+bool+independent": "N",
+            "#meta+id": "266",
+            "#region+code+intermediate": "",
+            "#region+code+main": "150",
+            "#region+code+sub": "39",
+            "#region+intermediate+name+preferred": "",
+            "#region+main+name+preferred": "Europe",
+            "#region+name+preferred+sub": "Southern Europe",
+        }
+
         with pytest.raises(LocationError):
             Country.get_country_info_from_iso2("ab", exception=LocationError)
 
@@ -319,6 +441,13 @@ class TestCountry:
         )
         assert Country.get_country_name_from_iso2("TW") == "Taiwan (Province of China)"
         assert Country.get_country_name_from_iso2("PS") == "oPt"
+        with pytest.raises(LocationError):
+            Country.get_country_name_from_iso2("AN", exception=LocationError)
+        self.setup_unofficial_date()
+        assert (
+            Country.get_country_name_from_iso2("AN")
+            == "Netherlands Antilles (The Netherlands)"
+        )
 
     def test_get_currency_from_iso2(self):
         assert Country.get_currency_from_iso2("jp") == "JPY"
@@ -343,6 +472,8 @@ class TestCountry:
 
     def test_get_country_info_from_m49(self):
         assert Country.get_country_info_from_m49(4) == {
+            "#country+alpha2+code": "",
+            "#country+alpha3+code": "",
             "#country+alt+i_ar+name+v_m49": "أفغانستان",
             "#country+alt+i_ar+name+v_unterm": "أفغانستان",
             "#country+alt+i_en+name+v_m49": "Afghanistan",
@@ -387,6 +518,8 @@ class TestCountry:
             "#region+name+preferred+sub": "Southern Asia",
         }
         assert Country.get_country_info_from_m49(882) == {
+            "#country+alpha2+code": "",
+            "#country+alpha3+code": "",
             "#country+alt+i_ar+name+v_m49": "ساموا",
             "#country+alt+i_ar+name+v_unterm": "ساموا",
             "#country+alt+i_en+name+v_m49": "Samoa",
@@ -431,6 +564,8 @@ class TestCountry:
             "#region+name+preferred+sub": "Polynesia",
         }
         assert Country.get_country_info_from_m49(275) == {
+            "#country+alpha2+code": "",
+            "#country+alpha3+code": "",
             "#country+alt+i_ar+name+v_m49": "دولة فلسطين",
             "#country+alt+i_ar+name+v_unterm": "دولة فلسطين",
             "#country+alt+i_en+name+v_m49": "State of Palestine",
@@ -528,6 +663,14 @@ class TestCountry:
         assert Country.simplify_countryname(
             "Democratic People's Republic of Korea"
         ) == ("KOREA", ["DEMOCRATIC", "PEOPLE'S", "REPUBLIC", "OF"])
+        assert Country.simplify_countryname("Korea (the Republic of))") == (
+            "KOREA",
+            ["THE", "REPUBLIC", "OF"],
+        )
+        assert Country.simplify_countryname("Korea (the Republic of") == (
+            "KOREA",
+            ["THE", "REPUBLIC", "OF"],
+        )
         assert Country.simplify_countryname(
             "The former Yugoslav Republic of Macedonia"
         ) == ("MACEDONIA", ["THE", "FORMER", "YUGOSLAV", "REPUBLIC", "OF"])
@@ -680,6 +823,9 @@ class TestCountry:
             Country.get_iso3_country_code("abc", exception=ValueError)
         with pytest.raises(ValueError):
             Country.get_iso3_country_code_fuzzy("abcde", exception=ValueError)
+        self.setup_unofficial_date()
+        assert Country.get_iso3_country_code_fuzzy("Kosovo") == ("XKX", True)
+        assert Country.get_iso3_country_code_fuzzy("Kosovo*") == ("XKX", False)
 
     def test_get_countries_in_region(self):
         assert Country.get_countries_in_region("Eastern Asia") == [

{hdx_python_country-3.9.2 → hdx_python_country-3.9.4}/tests/hdx/location/test_currency.py

@@ -106,8 +106,16 @@ class TestCurrency:
         Currency._rates_api = None
         with pytest.raises(CurrencyError):
             Currency.get_current_rate("gbp")
-        Currency._rates_api = Currency._primary_rates_url
         assert Currency.get_current_rate("usd") == 1
+
+        Currency._cached_current_rates = {}
+        Currency._cached_historic_rates = {}
+        Currency._rates_api = ""
+        Currency._secondary_rates = {}
+        Currency._secondary_historic_rates = {}
+        Currency._fallback_to_current = False
+        Currency._no_historic = False
+        Currency.setup(no_historic=True)
         rate1gbp = Currency.get_current_rate("gbp")
         assert rate1gbp != 1
         rate1xdr = Currency.get_current_rate("xdr")

hdx_python_country-3.9.2/CONTRIBUTING.md

@@ -1,53 +0,0 @@
-# Development
-
-## Environment
-
-Development is currently done using Python 3.12. We recommend using a virtual
-environment such as ``venv``:
-
-    python3.12 -m venv venv
-    source venv/bin/activate
-
-In your virtual environment, please install all packages for
-development by running:
-
-    pip install -r requirements.txt
-
-## Pre-Commit
-
-Also be sure to install `pre-commit`, which is run every time
-you make a git commit:
-
-    pre-commit install
-
-With pre-commit, all code is formatted according to
-[ruff](https://github.com/astral-sh/ruff) guidelines.
-
-To check if your changes pass pre-commit without committing, run:
-
-    pre-commit run --all-files
-
-## Testing
-
-To run the tests and view coverage, execute:
-
-    pytest --cov hdx
-
-Follow the example set out already in ``documentation/main.md`` as you write the documentation.
-
-## Packages
-
-[pip-tools](https://github.com/jazzband/pip-tools) is used for
-package management.  If you’ve introduced a new package to the
-source code (i.e.anywhere in `src/`), please add it to the
-`project.dependencies` section of
-`pyproject.toml` with any known version constraints.
-
-For adding packages for testing or development, add them to
-the `test` or `dev` sections under `[project.optional-dependencies]`.
-
-Any changes to the dependencies will be automatically reflected in
-`requirements.txt` with `pre-commit`, but you can re-generate
-the file without committing by executing:
-
-    pre-commit run pip-compile --all-files