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

{hdx_python_country-3.9.2 → hdx_python_country-3.9.3}/.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.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hdx-python-country
-Version: 3.9.2
+Version: 3.9.3
 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.6
 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.3}/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.3}/pyproject.toml

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

{hdx_python_country-3.9.2 → hdx_python_country-3.9.3}/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,23 +28,25 @@ click==8.1.8
     #   typer
 colorama==0.4.6
     # via mkdocs-material
-coverage==7.7.1
+coverage==7.8.0
     # via pytest-cov
+cydifflib==1.2.0
+    # via hdx-python-utilities
 distlib==0.3.9
     # via virtualenv
 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.6
     # 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
@@ -68,21 +70,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 +95,7 @@ mergedeep==1.3.4
     # via
     #   mkdocs
     #   mkdocs-get-deps
-mkapi==4.1.3
+mkapi==4.3.2
     # via hdx-python-country (pyproject.toml)
 mkdocs==1.6.1
     # via
@@ -102,7 +103,7 @@ mkdocs==1.6.1
     #   mkdocs-material
 mkdocs-get-deps==0.2.0
     # via mkdocs
-mkdocs-material==9.6.9
+mkdocs-material==9.6.12
     # via mkapi
 mkdocs-material-extensions==1.3.1
     # via mkdocs-material
@@ -110,7 +111,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,7 +119,7 @@ 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
     # via
@@ -132,15 +133,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 +149,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
@@ -187,11 +188,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.24.0
     # via
     #   jsonschema
     #   referencing
@@ -205,38 +204,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.3
     # 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.1
     # via pre-commit
 watchdog==6.0.0
     # via mkdocs
@@ -248,7 +248,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.3}/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.3'
+__version_tuple__ = version_tuple = (3, 9, 3)

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

@@ -709,7 +709,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.3}/tests/hdx/location/test_country.py

@@ -528,6 +528,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"])

{hdx_python_country-3.9.2 → hdx_python_country-3.9.3}/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