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

{hdx_python_country-3.9.4 → hdx_python_country-3.9.6}/.pre-commit-config.yaml

@@ -1,5 +1,5 @@
 default_language_version:
-    python: python3.12
+    python: python3.13
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
     rev: v5.0.0
@@ -8,15 +8,15 @@ repos:
       - id: end-of-file-fixer
       - id: check-ast
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.9.10
+    rev: v0.12.0
     hooks:
       # Run the linter.
-      - id: ruff
+      - id: ruff-check
         args: [ --fix ]
       # Run the formatter.
       - id: ruff-format
   - repo: https://github.com/astral-sh/uv-pre-commit
-    rev: 0.6.5
+    rev: 0.7.14
     hooks:
       # Run the pip compile
       - id: pip-compile

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hdx-python-country
-Version: 3.9.4
+Version: 3.9.6
 Summary: HDX Python country code and exchange rate (fx) utilities
 Project-URL: Homepage, https://github.com/OCHA-DAP/hdx-python-country
 Author: Michael Rans

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

@@ -96,9 +96,9 @@ The usage of the country mappings functionality is best illustrated by some exam
     # "#country+alt+i_fr+name+v_m49": "Japon", "#country+alt+i_fr+name+v_unterm": "Japon",
     # "#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_dgacm": "", "#country+alt+name+v_hpctools": "",
     # "#country+alt+name+v_iso": "", "#country+alt+name+v_reliefweb": "",
-    # "#country+code+num+v_m49": "392", "#country+code+v_fts": "112",
+    # "#country+code+num+v_m49": "392", "#country+code+v_hpctools": "112",
     # "#country+code+v_iso2": "JP", "#country+code+v_iso3": "JPN",
     # "#country+code+v_reliefweb": "128", "#country+formal+i_en+name+v_unterm": "Japan",
     # "#country+name+preferred": "Japan", "#country+name+short+v_reliefweb": "",

{hdx_python_country-3.9.4 → hdx_python_country-3.9.6}/hatch.toml

@@ -24,7 +24,7 @@ version_scheme = "python-simplified-semver"
 features = ["test"]
 
 [[envs.hatch-test.matrix]]
-python = ["3.12"]
+python = ["3.13"]
 
 [envs.hatch-test.scripts]
 run = """

{hdx_python_country-3.9.4 → hdx_python_country-3.9.6}/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.2.1
+astdoc==1.3.0
     # via mkapi
 attrs==25.3.0
     # via
@@ -12,9 +12,9 @@ attrs==25.3.0
     #   referencing
 babel==2.17.0
     # via mkdocs-material
-backrefs==5.8
+backrefs==5.9
     # via mkdocs-material
-certifi==2025.4.26
+certifi==2025.7.9
     # via requests
 cfgv==3.4.0
     # via pre-commit
@@ -22,13 +22,13 @@ chardet==5.2.0
     # via frictionless
 charset-normalizer==3.4.2
     # via requests
-click==8.1.8
+click==8.2.1
     # via
     #   mkdocs
     #   typer
 colorama==0.4.6
     # via mkdocs-material
-coverage==7.8.0
+coverage==7.9.2
     # via pytest-cov
 distlib==0.3.9
     # via virtualenv
@@ -44,7 +44,7 @@ hdx-python-utilities==3.8.7
     # via hdx-python-country (pyproject.toml)
 humanize==4.12.3
     # via frictionless
-identify==2.6.10
+identify==2.6.12
     # via pre-commit
 idna==3.10
     # via requests
@@ -64,7 +64,7 @@ jsonlines==4.0.0
     # via hdx-python-utilities
 jsonpath-ng==1.7.0
     # via libhxl
-jsonschema==4.23.0
+jsonschema==4.24.0
     # via
     #   frictionless
     #   tableschema-to-template
@@ -74,14 +74,14 @@ libhxl==5.2.2
     # via hdx-python-country (pyproject.toml)
 loguru==0.7.3
     # via hdx-python-utilities
-markdown==3.8
+markdown==3.8.2
     # via
     #   mkdocs
     #   mkdocs-material
     #   pymdown-extensions
 markdown-it-py==3.0.0
     # via rich
-marko==2.1.3
+marko==2.1.4
     # via frictionless
 markupsafe==3.0.2
     # via
@@ -93,7 +93,7 @@ mergedeep==1.3.4
     # via
     #   mkdocs
     #   mkdocs-get-deps
-mkapi==4.4.0
+mkapi==4.4.3
     # via hdx-python-country (pyproject.toml)
 mkdocs==1.6.1
     # via
@@ -101,7 +101,7 @@ mkdocs==1.6.1
     #   mkdocs-material
 mkdocs-get-deps==0.2.0
     # via mkdocs
-mkdocs-material==9.6.14
+mkdocs-material==9.6.15
     # via mkapi
 mkdocs-material-extensions==1.3.1
     # via mkdocs-material
@@ -124,30 +124,33 @@ platformdirs==4.3.8
     #   mkdocs-get-deps
     #   virtualenv
 pluggy==1.6.0
-    # via pytest
+    # via
+    #   pytest
+    #   pytest-cov
 ply==3.11
     # via
     #   jsonpath-ng
     #   libhxl
 pre-commit==4.2.0
     # via hdx-python-country (pyproject.toml)
-pydantic==2.11.4
+pydantic==2.11.7
     # via frictionless
 pydantic-core==2.33.2
     # via pydantic
-pygments==2.19.1
+pygments==2.19.2
     # via
     #   mkdocs-material
+    #   pytest
     #   rich
-pymdown-extensions==10.15
+pymdown-extensions==10.16
     # via mkdocs-material
 pyphonetics==0.5.3
     # via hdx-python-utilities
-pytest==8.3.5
+pytest==8.4.1
     # via
     #   hdx-python-country (pyproject.toml)
     #   pytest-cov
-pytest-cov==6.1.1
+pytest-cov==6.2.1
     # via hdx-python-country (pyproject.toml)
 python-dateutil==2.9.0.post0
     # via
@@ -176,7 +179,7 @@ referencing==0.36.2
     # via
     #   jsonschema
     #   jsonschema-specifications
-requests==2.32.3
+requests==2.32.4
     # via
     #   frictionless
     #   libhxl
@@ -188,11 +191,11 @@ rfc3986==2.0.0
     # via frictionless
 rich==14.0.0
     # via typer
-rpds-py==0.25.0
+rpds-py==0.26.0
     # via
     #   jsonschema
     #   referencing
-ruamel-yaml==0.18.10
+ruamel-yaml==0.18.14
     # via hdx-python-utilities
 ruamel-yaml-clib==0.2.12
     # via ruamel-yaml
@@ -202,7 +205,7 @@ simpleeval==1.0.3
     # via frictionless
 six==1.17.0
     # via python-dateutil
-structlog==25.3.0
+structlog==25.4.0
     # via libhxl
 tableschema-to-template==0.0.13
     # via hdx-python-utilities
@@ -212,23 +215,22 @@ tenacity==9.1.2
     # via hdx-python-country (pyproject.toml)
 text-unidecode==1.3
     # via python-slugify
-typer==0.15.4
+typer==0.16.0
     # via frictionless
-typing-extensions==4.13.2
+typing-extensions==4.14.1
     # via
     #   frictionless
     #   pydantic
     #   pydantic-core
-    #   referencing
     #   typer
     #   typing-inspection
-typing-inspection==0.4.0
+typing-inspection==0.4.1
     # via pydantic
 unidecode==1.4.0
     # via
     #   libhxl
     #   pyphonetics
-urllib3==2.4.0
+urllib3==2.5.0
     # via
     #   libhxl
     #   requests
@@ -240,13 +242,13 @@ watchdog==6.0.0
     # via mkdocs
 wheel==0.45.1
     # via libhxl
-xlrd==2.0.1
+xlrd==2.0.2
     # via hdx-python-utilities
 xlrd3==1.1.0
     # via libhxl
 xlsx2csv==0.8.4
     # via hdx-python-utilities
-xlsxwriter==3.2.3
+xlsxwriter==3.2.5
     # via tableschema-to-template
 xlwt==1.3.0
     # via hdx-python-utilities

{hdx_python_country-3.9.4 → hdx_python_country-3.9.6}/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 +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,
+ID,RW ID,m49 numerical code,HPC Tools 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,HPC Tools 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_hpctools,,,#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_hpctools,#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

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

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

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

@@ -743,7 +743,10 @@ class Country:
             for simplification2 in simplifications:
                 remove.append(simplification2)
         remove = "|".join(remove)
-        regex = re.compile(r"[^\w\s]|\b(" + remove + r")\b", flags=re.IGNORECASE)
+        regex = re.compile(
+            r"[" + punctuation.replace("'", "") + r"]|\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.4 → hdx_python_country-3.9.6}/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 +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,
+ID,RW ID,m49 numerical code,HPC Tools 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,HPC Tools 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_hpctools,,,#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_hpctools,#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

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

@@ -95,11 +95,11 @@ class TestCountry:
             "#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_hpctools": "",
             "#country+alt+name+v_iso": "",
             "#country+alt+name+v_reliefweb": "",
             "#country+code+num+v_m49": "70",
-            "#country+code+v_fts": "28",
+            "#country+code+v_hpctools": "28",
             "#country+code+v_iso2": "BA",
             "#country+code+v_iso3": "BIH",
             "#country+code+v_reliefweb": "40",
@@ -141,11 +141,11 @@ class TestCountry:
             "#country+alt+i_zh+name+v_m49": "巴勒斯坦国",
             "#country+alt+i_zh+name+v_unterm": "巴勒斯坦国",
             "#country+alt+name+v_dgacm": "",
-            "#country+alt+name+v_fts": "occupied Palestinian territory",
+            "#country+alt+name+v_hpctools": "occupied Palestinian territory",
             "#country+alt+name+v_iso": "Palestine, State of",
             "#country+alt+name+v_reliefweb": "occupied Palestinian territory",
             "#country+code+num+v_m49": "275",
-            "#country+code+v_fts": "171",
+            "#country+code+v_hpctools": "171",
             "#country+code+v_iso2": "PS",
             "#country+code+v_iso3": "PSE",
             "#country+code+v_reliefweb": "180",
@@ -191,11 +191,11 @@ class TestCountry:
             "#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_hpctools": "",
             "#country+alt+name+v_iso": "",
             "#country+alt+name+v_reliefweb": "",
             "#country+code+num+v_m49": "",
-            "#country+code+v_fts": "",
+            "#country+code+v_hpctools": "",
             "#country+code+v_iso2": "",
             "#country+code+v_iso3": "",
             "#country+code+v_reliefweb": "28",
@@ -245,11 +245,11 @@ class TestCountry:
             "#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_hpctools": "",
             "#country+alt+name+v_iso": "",
             "#country+alt+name+v_reliefweb": "",
             "#country+code+num+v_m49": "392",
-            "#country+code+v_fts": "112",
+            "#country+code+v_hpctools": "112",
             "#country+code+v_iso2": "JP",
             "#country+code+v_iso3": "JPN",
             "#country+code+v_reliefweb": "128",
@@ -292,11 +292,11 @@ class TestCountry:
             "#country+alt+i_zh+name+v_m49": "",
             "#country+alt+i_zh+name+v_unterm": "",
             "#country+alt+name+v_dgacm": "",
-            "#country+alt+name+v_fts": "Taiwan, Province of China",
+            "#country+alt+name+v_hpctools": "Taiwan, Province of China",
             "#country+alt+name+v_iso": "",
             "#country+alt+name+v_reliefweb": "China - Taiwan Province",
             "#country+code+num+v_m49": "158",
-            "#country+code+v_fts": "219",
+            "#country+code+v_hpctools": "219",
             "#country+code+v_iso2": "TW",
             "#country+code+v_iso3": "TWN",
             "#country+code+v_reliefweb": "61",
@@ -339,11 +339,11 @@ class TestCountry:
             "#country+alt+i_zh+name+v_m49": "巴勒斯坦国",
             "#country+alt+i_zh+name+v_unterm": "巴勒斯坦国",
             "#country+alt+name+v_dgacm": "",
-            "#country+alt+name+v_fts": "occupied Palestinian territory",
+            "#country+alt+name+v_hpctools": "occupied Palestinian territory",
             "#country+alt+name+v_iso": "Palestine, State of",
             "#country+alt+name+v_reliefweb": "occupied Palestinian territory",
             "#country+code+num+v_m49": "275",
-            "#country+code+v_fts": "171",
+            "#country+code+v_hpctools": "171",
             "#country+code+v_iso2": "PS",
             "#country+code+v_iso3": "PSE",
             "#country+code+v_reliefweb": "180",
@@ -389,11 +389,11 @@ class TestCountry:
             "#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_hpctools": "",
             "#country+alt+name+v_iso": "",
             "#country+alt+name+v_reliefweb": "",
             "#country+code+num+v_m49": "",
-            "#country+code+v_fts": "",
+            "#country+code+v_hpctools": "",
             "#country+code+v_iso2": "",
             "#country+code+v_iso3": "",
             "#country+code+v_reliefweb": "",
@@ -487,11 +487,11 @@ class TestCountry:
             "#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_hpctools": "",
             "#country+alt+name+v_iso": "",
             "#country+alt+name+v_reliefweb": "",
             "#country+code+num+v_m49": "4",
-            "#country+code+v_fts": "1",
+            "#country+code+v_hpctools": "1",
             "#country+code+v_iso2": "AF",
             "#country+code+v_iso3": "AFG",
             "#country+code+v_reliefweb": "13",
@@ -533,11 +533,11 @@ class TestCountry:
             "#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_hpctools": "",
             "#country+alt+name+v_iso": "",
             "#country+alt+name+v_reliefweb": "",
             "#country+code+num+v_m49": "882",
-            "#country+code+v_fts": "193",
+            "#country+code+v_hpctools": "193",
             "#country+code+v_iso2": "WS",
             "#country+code+v_iso3": "WSM",
             "#country+code+v_reliefweb": "204",
@@ -579,11 +579,11 @@ class TestCountry:
             "#country+alt+i_zh+name+v_m49": "巴勒斯坦国",
             "#country+alt+i_zh+name+v_unterm": "巴勒斯坦国",
             "#country+alt+name+v_dgacm": "",
-            "#country+alt+name+v_fts": "occupied Palestinian territory",
+            "#country+alt+name+v_hpctools": "occupied Palestinian territory",
             "#country+alt+name+v_iso": "Palestine, State of",
             "#country+alt+name+v_reliefweb": "occupied Palestinian territory",
             "#country+code+num+v_m49": "275",
-            "#country+code+v_fts": "171",
+            "#country+code+v_hpctools": "171",
             "#country+code+v_iso2": "PS",
             "#country+code+v_iso3": "PSE",
             "#country+code+v_reliefweb": "180",
@@ -674,6 +674,7 @@ class TestCountry:
         assert Country.simplify_countryname(
             "The former Yugoslav Republic of Macedonia"
         ) == ("MACEDONIA", ["THE", "FORMER", "YUGOSLAV", "REPUBLIC", "OF"])
+        assert Country.simplify_countryname("d'Ivoire Côte") == ("D'IVOIRE", ["CÔTE"])
 
     def test_get_iso3_country_code(self):
         assert Country.get_iso3_country_code("jpn") == "JPN"
@@ -826,6 +827,7 @@ class TestCountry:
         self.setup_unofficial_date()
         assert Country.get_iso3_country_code_fuzzy("Kosovo") == ("XKX", True)
         assert Country.get_iso3_country_code_fuzzy("Kosovo*") == ("XKX", False)
+        assert Country.get_iso3_country_code_fuzzy("d'Ivoire Côte") == ("CIV", False)
 
     def test_get_countries_in_region(self):
         assert Country.get_countries_in_region("Eastern Asia") == [