hdx-python-country 3.7.0__tar.gz → 3.7.1__tar.gz

{hdx_python_country-3.7.0 → hdx_python_country-3.7.1}/.config/pre-commit-config.yaml

@@ -8,7 +8,7 @@ repos:
       - id: end-of-file-fixer
       - id: check-ast
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.3.2
+    rev: v0.4.4
     hooks:
       # Run the linter.
       - id: ruff
@@ -16,10 +16,11 @@ repos:
       # Run the formatter.
       - id: ruff-format
         args: [--config, .config/ruff.toml]
-  - repo: https://github.com/jazzband/pip-tools
-    rev: 7.4.1
+  - repo: https://github.com/astral-sh/uv-pre-commit
+    rev: 0.1.45
     hooks:
+      # Run the pip compile
       - id: pip-compile
         name: pip-compile requirements.txt
         files: pyproject.toml
-        args: [pyproject.toml, --resolver=backtracking, --all-extras, --upgrade, -q, -o, requirements.txt]
+        args: [ pyproject.toml, --resolver=backtracking, --all-extras, --upgrade, -q, -o, requirements.txt ]

{hdx_python_country-3.7.0 → hdx_python_country-3.7.1}/.config/ruff.toml

@@ -12,6 +12,5 @@ ignore = [
     "E501" # Line too long
 ]
 
-
 [lint.isort]
 known-local-folder = ["hdx"]

{hdx_python_country-3.7.0 → hdx_python_country-3.7.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: hdx-python-country
-Version: 3.7.0
+Version: 3.7.1
 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.6.7
+Requires-Dist: hdx-python-utilities>=3.6.8
 Requires-Dist: libhxl>=5.2.1
 Requires-Dist: pyphonetics
 Provides-Extra: dev

{hdx_python_country-3.7.0 → hdx_python_country-3.7.1}/documentation/.readthedocs.yaml

@@ -11,5 +11,6 @@ build:
   jobs:
     pre_build:
       - pip install --upgrade mkdocs
+      - pip install mkdocs-material
       - pip install pydoc-markdown
       - pydoc-markdown documentation/pydoc-markdown.yaml

{hdx_python_country-3.7.0 → hdx_python_country-3.7.1}/documentation/pydoc-markdown.yaml

@@ -9,7 +9,7 @@ renderer:
   output_directory: docs
   mkdocs_config:
     site_name: HDX Python Country
-    theme: mkdocs
+    theme: material
     repo_url: "https://github.com/OCHA-DAP/hdx-python-country"
   markdown:
     source_linker:
@@ -24,9 +24,9 @@ renderer:
       - title: Countries
         contents:
           - hdx.location.country.*
-      - title: Administration level one
+      - title: Administration Level
         contents:
-          - hdx.location.adminone.*
+          - hdx.location.adminlevel.*
       - title: Currencies
         contents:
           - hdx.location.currency.*

{hdx_python_country-3.7.0 → hdx_python_country-3.7.1}/pyproject.toml

@@ -34,7 +34,7 @@ classifiers = [
 requires-python = ">=3.8"
 
 dependencies = [
-    "hdx-python-utilities>=3.6.7",
+    "hdx-python-utilities>=3.6.8",
     "libhxl>=5.2.1",
     "pyphonetics",
 ]

{hdx_python_country-3.7.0 → hdx_python_country-3.7.1}/requirements.txt

@@ -1,16 +1,13 @@
-#
-# This file is autogenerated by pip-compile with Python 3.11
-# by the following command:
-#
-#    pip-compile --all-extras --output-file=requirements.txt pyproject.toml
-#
-annotated-types==0.6.0
+# This file was autogenerated by uv via the following command:
+#    uv pip compile pyproject.toml --resolver=backtracking --all-extras -o requirements.txt
+annotated-types==0.7.0
     # via pydantic
 attrs==23.2.0
     # via
     #   frictionless
     #   jsonlines
     #   jsonschema
+    #   referencing
 certifi==2024.2.2
     # via requests
 cfgv==3.4.0
@@ -21,25 +18,23 @@ charset-normalizer==3.3.2
     # via requests
 click==8.1.7
     # via typer
-colorama==0.4.6
-    # via typer
-coverage[toml]==7.4.4
+coverage==7.5.1
     # via pytest-cov
 distlib==0.3.8
     # via virtualenv
 et-xmlfile==1.1.0
     # via openpyxl
-filelock==3.13.3
+filelock==3.14.0
     # via virtualenv
-frictionless==5.16.1
+frictionless==5.17.0
     # via hdx-python-utilities
-hdx-python-utilities==3.6.7
+hdx-python-utilities==3.6.8
     # via hdx-python-country (pyproject.toml)
 humanize==4.9.0
     # via frictionless
-identify==2.5.35
+identify==2.5.36
     # via pre-commit
-idna==3.6
+idna==3.7
     # via requests
 ijson==3.2.3
     # via hdx-python-utilities
@@ -47,16 +42,18 @@ iniconfig==2.0.0
     # via pytest
 isodate==0.6.1
     # via frictionless
-jinja2==3.1.3
+jinja2==3.1.4
     # via frictionless
 jsonlines==4.0.0
     # via hdx-python-utilities
 jsonpath-ng==1.6.1
     # via libhxl
-jsonschema==4.17.3
+jsonschema==4.22.0
     # via
     #   frictionless
     #   tableschema-to-template
+jsonschema-specifications==2023.12.1
+    # via jsonschema
 libhxl==5.2.1
     # via hdx-python-country (pyproject.toml)
 loguru==0.7.2
@@ -77,27 +74,25 @@ packaging==24.0
     # via pytest
 petl==1.7.15
     # via frictionless
-platformdirs==4.2.0
+platformdirs==4.2.2
     # via virtualenv
-pluggy==1.4.0
+pluggy==1.5.0
     # via pytest
 ply==3.11
     # via
     #   jsonpath-ng
     #   libhxl
-pre-commit==3.7.0
+pre-commit==3.7.1
     # via hdx-python-country (pyproject.toml)
-pydantic==2.6.4
+pydantic==2.7.1
     # via frictionless
-pydantic-core==2.16.3
+pydantic-core==2.18.2
     # via pydantic
-pygments==2.17.2
+pygments==2.18.0
     # via rich
 pyphonetics==0.5.3
     # via hdx-python-country (pyproject.toml)
-pyrsistent==0.20.0
-    # via jsonschema
-pytest==8.1.1
+pytest==8.2.1
     # via
     #   hdx-python-country (pyproject.toml)
     #   pytest-cov
@@ -119,21 +114,31 @@ pyyaml==6.0.1
     #   tableschema-to-template
 ratelimit==2.2.1
     # via hdx-python-utilities
-requests==2.31.0
+referencing==0.35.1
+    # via
+    #   jsonschema
+    #   jsonschema-specifications
+requests==2.32.2
     # via
     #   frictionless
     #   libhxl
     #   requests-file
-requests-file==2.0.0
+requests-file==2.1.0
     # via hdx-python-utilities
 rfc3986==2.0.0
     # via frictionless
 rich==13.7.1
     # via typer
+rpds-py==0.18.1
+    # via
+    #   jsonschema
+    #   referencing
 ruamel-yaml==0.18.6
     # via hdx-python-utilities
 ruamel-yaml-clib==0.2.8
     # via ruamel-yaml
+setuptools==70.0.0
+    # via nodeenv
 shellingham==1.5.4
     # via typer
 simpleeval==0.9.13
@@ -152,9 +157,9 @@ tabulate==0.9.0
     # via frictionless
 text-unidecode==1.3
     # via python-slugify
-typer[all]==0.10.0
+typer==0.12.3
     # via frictionless
-typing-extensions==4.10.0
+typing-extensions==4.11.0
     # via
     #   frictionless
     #   pydantic
@@ -168,9 +173,9 @@ urllib3==2.2.1
     # via
     #   libhxl
     #   requests
-validators==0.24.0
+validators==0.28.1
     # via frictionless
-virtualenv==20.25.1
+virtualenv==20.26.2
     # via pre-commit
 wheel==0.43.0
     # via libhxl
@@ -182,6 +187,3 @@ xlsxwriter==3.2.0
     # via tableschema-to-template
 xlwt==1.3.0
     # via hdx-python-utilities
-
-# The following packages are considered to be unsafe in a requirements file:
-# setuptools

{hdx_python_country-3.7.0 → hdx_python_country-3.7.1}/src/hdx/location/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '3.7.0'
-__version_tuple__ = version_tuple = (3, 7, 0)
+__version__ = version = '3.7.1'
+__version_tuple__ = version_tuple = (3, 7, 1)

{hdx_python_country-3.7.0 → hdx_python_country-3.7.1}/src/hdx/location/adminlevel.py

@@ -743,3 +743,16 @@ class AdminLevel:
             logger.error(line)
             output.append(line)
         return output
+
+    def output_admin_name_mappings(self) -> List[str]:
+        """Output log of name mappings
+
+        Returns:
+            List[str]: List of mappings
+        """
+        output = []
+        for name, pcode in self.admin_name_mappings.items():
+            line = f"{name}: {self.pcode_to_name[pcode]} ({pcode})"
+            logger.info(line)
+            output.append(line)
+        return output

{hdx_python_country-3.7.0 → hdx_python_country-3.7.1}/tests/hdx/location/test_adminlevel.py

@@ -155,6 +155,11 @@ class TestAdminLevel:
             "test - Could not find ABC in map names!",
             "test - NER: Could not find ABCDEFGH in map names!",
         ]
+        output = adminone.output_admin_name_mappings()
+        assert len(output) == 62
+        assert output[0] == "Nord-Ouest: North West (HT09)"
+        assert output[31] == "Juba Dhexe: Middle Juba (SO27)"
+        assert output[61] == "CU Niamey: Niamey (NER008)"
 
     def test_adminlevel_fuzzy(self, config):
         adminone = AdminLevel(config)
@@ -231,7 +236,7 @@ class TestAdminLevel:
         adminone = AdminLevel(config)
         adminone.setup_from_url()
         assert adminone.get_admin_level("YEM") == 1
-        assert len(adminone.get_pcode_list()) == 2506
+        assert len(adminone.get_pcode_list()) == 2509
         assert adminone.get_pcode_length("YEM") == 4
         assert adminone.get_pcode("YEM", "YE30", logname="test") == (
             "YE30",