hdx-python-country 3.8.9__tar.gz → 3.9.1__tar.gz

hdx_python_country-3.8.9/.config/pre-commit-config.yaml → hdx_python_country-3.9.1/.pre-commit-config.yaml

@@ -12,10 +12,9 @@ repos:
     hooks:
       # Run the linter.
       - id: ruff
-        args: [--config, .config/ruff.toml, --fix]
+        args: [ --fix ]
       # Run the formatter.
       - id: ruff-format
-        args: [--config, .config/ruff.toml]
   - repo: https://github.com/astral-sh/uv-pre-commit
     rev: 0.6.5
     hooks:

{hdx_python_country-3.8.9 → hdx_python_country-3.9.1}/CONTRIBUTING.md

@@ -2,10 +2,10 @@
 
 ## Environment
 
-Development is currently done using Python 3.11. We recommend using a virtual
+Development is currently done using Python 3.12. We recommend using a virtual
 environment such as ``venv``:
 
-    python3.11 -m venv venv
+    python3.12 -m venv venv
     source venv/bin/activate
 
 In your virtual environment, please install all packages for
@@ -20,25 +20,18 @@ you make a git commit:
 
     pre-commit install
 
-The configuration file for this project is in a
-non-standard location. Thus, you will need to edit your
-`.git/hooks/pre-commit` file to reflect this. Change
-the line that begins with `ARGS` to:
-
-    ARGS=(hook-impl --config=.config/pre-commit-config.yaml --hook-type=pre-commit)
-
 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 --config=.config/pre-commit-config.yaml
+    pre-commit run --all-files
 
 ## Testing
 
 To run the tests and view coverage, execute:
 
-    pytest -c .config/pytest.ini --cov hdx --cov-config .config/coveragerc
+    pytest --cov hdx
 
 Follow the example set out already in ``documentation/main.md`` as you write the documentation.
 
@@ -57,4 +50,4 @@ 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 --config=.config/pre-commit-config.yaml
+    pre-commit run pip-compile --all-files

{hdx_python_country-3.8.9 → hdx_python_country-3.9.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hdx-python-country
-Version: 3.8.9
+Version: 3.9.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

hdx_python_country-3.9.1/hatch.toml

@@ -0,0 +1,37 @@
+# Build
+
+[build.targets.wheel]
+packages = ["src/hdx"]
+
+[build.hooks.vcs]
+version-file = "src/hdx/location/_version.py"
+
+[metadata]
+allow-direct-references = true
+
+# Versioning
+
+[version]
+source = "vcs"
+
+[version.raw-options]
+local_scheme = "no-local-version"
+version_scheme = "python-simplified-semver"
+
+# Tests
+
+[envs.hatch-test]
+features = ["test"]
+
+[[envs.hatch-test.matrix]]
+python = ["3.12"]
+
+[envs.hatch-test.scripts]
+run = """
+       pytest --rootdir=. --junitxml=test-results.xml --cov --no-cov-on-fail \
+       --cov-report=lcov --cov-report=term-missing
+       """
+
+[envs.hatch-static-analysis]
+config-path = "none"
+dependencies = ["ruff==0.9.10"]

{hdx_python_country-3.8.9 → hdx_python_country-3.9.1}/pyproject.toml

@@ -51,51 +51,3 @@ Homepage = "https://github.com/OCHA-DAP/hdx-python-country"
 test = ["pytest", "pytest-cov"]
 dev = ["pre-commit"]
 docs = ["mkapi"]
-
-#########
-# Hatch #
-#########
-
-# Build
-
-[tool.hatch.build.targets.wheel]
-packages = ["src/hdx"]
-
-[tool.hatch.build.hooks.vcs]
-version-file = "src/hdx/location/_version.py"
-
-[tool.hatch.metadata]
-allow-direct-references = true
-
-# Versioning
-
-[tool.hatch.version]
-source = "vcs"
-
-[tool.hatch.version.raw-options]
-local_scheme = "no-local-version"
-version_scheme = "python-simplified-semver"
-
-# Tests
-
-[tool.hatch.envs.hatch-test]
-features = ["test"]
-
-[[tool.hatch.envs.hatch-test.matrix]]
-python = ["3.12"]
-
-[tool.hatch.envs.hatch-test.scripts]
-run = """
-       pytest -c .config/pytest.ini --rootdir=. --junitxml=test-results.xml \
-       --cov --cov-config=.config/coveragerc --no-cov-on-fail \
-       --cov-report=lcov --cov-report=term-missing
-       """
-
-[tool.hatch.envs.hatch-static-analysis]
-dependencies = ["ruff==0.9.10"]
-
-[tool.hatch.envs.hatch-static-analysis.scripts]
-format-check = ["ruff format --config .config/ruff.toml --check --diff {args:.}",]
-format-fix = ["ruff format --config .config/ruff.toml {args:.}",]
-lint-check = ["ruff check --config .config/ruff.toml {args:.}",]
-lint-fix = ["ruff check --config .config/ruff.toml --fix {args:.}",]

{hdx_python_country-3.8.9/.config → hdx_python_country-3.9.1}/pytest.ini

@@ -1,4 +1,4 @@
 [pytest]
-pythonpath = ../src
+pythonpath = src
 addopts = "--color=yes"
 log_cli = 1

{hdx_python_country-3.8.9 → hdx_python_country-3.9.1}/requirements.txt

@@ -28,7 +28,7 @@ click==8.1.8
     #   typer
 colorama==0.4.6
     # via mkdocs-material
-coverage==7.7.0
+coverage==7.7.1
     # via pytest-cov
 distlib==0.3.9
     # via virtualenv

hdx_python_country-3.9.1/src/hdx/location/__init__.py

@@ -0,0 +1 @@
+from ._version import version as __version__  # noqa: F401

{hdx_python_country-3.8.9 → hdx_python_country-3.9.1}/src/hdx/location/_version.py

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '3.8.9'
-__version_tuple__ = version_tuple = (3, 8, 9)
+__version__ = version = '3.9.1'
+__version_tuple__ = version_tuple = (3, 9, 1)

{hdx_python_country-3.8.9 → hdx_python_country-3.9.1}/src/hdx/location/currency.py

@@ -5,7 +5,7 @@ from copy import copy
 from datetime import datetime, timezone
 from typing import Dict, Optional, Union
 
-from . import get_int_timestamp
+from .int_timestamp import get_int_timestamp
 from hdx.utilities.dateparse import (
     now_utc,
     parse_date,
@@ -318,7 +318,7 @@ class Currency:
             return fx_rate
         fx_rate = cls._get_secondary_current_rate(currency)
         if fx_rate is not None:
-            logger.warning(f"Using secondary current rate for {currency}!")
+            logger.debug(f"Using secondary current rate for {currency}!")
             cls._cached_current_rates[currency] = fx_rate
             return fx_rate
         raise CurrencyError(f"Failed to get rate for currency {currency}!")
@@ -480,7 +480,7 @@ class Currency:
         if cls._fallback_to_current:
             fx_rate = cls.get_current_rate(currency)
             if fx_rate:
-                logger.warning(
+                logger.debug(
                     f"Falling back to current rate for currency {currency} on date {date.isoformat()}!"
                 )
             return fx_rate

hdx_python_country-3.9.1/src/hdx/location/int_timestamp.py

@@ -0,0 +1,22 @@
+from datetime import datetime
+
+from hdx.utilities.dateparse import get_timestamp_from_datetime
+
+_cache_timestamp_lookup = {}
+
+
+def get_int_timestamp(date: datetime) -> int:
+    """
+    Get integer timestamp from datetime object with caching
+
+    Args:
+        date (datetime): datetime object
+
+    Returns:
+        int: Integer timestamp
+    """
+    timestamp = _cache_timestamp_lookup.get(date)
+    if timestamp is None:
+        timestamp = int(round(get_timestamp_from_datetime(date)))
+        _cache_timestamp_lookup[date] = timestamp
+    return timestamp

{hdx_python_country-3.8.9 → hdx_python_country-3.9.1}/src/hdx/location/wfp_exchangerates.py

@@ -1,7 +1,7 @@
 import logging
 from typing import Dict, List
 
-from . import get_int_timestamp
+from .int_timestamp import get_int_timestamp
 from .wfp_api import WFPAPI
 from hdx.utilities.dateparse import parse_date
 from hdx.utilities.typehint import ListTuple
@@ -27,9 +27,10 @@ class WFPExchangeRates:
         """
         currencies = []
         for currency in self.wfp_api.get_items("Currency/List"):
-            currencies.append(
-                {"code": currency["name"], "name": currency["extendedName"]}
-            )
+            currency_name = currency["extendedName"]
+            if currency_name:
+                currency_name = currency_name.strip()
+            currencies.append({"code": currency["name"], "name": currency_name})
         return currencies
 
     def get_currencies(self) -> List[str]:

{hdx_python_country-3.8.9 → hdx_python_country-3.9.1}/tests/hdx/location/test_currency.py

@@ -4,8 +4,8 @@ from os.path import join
 
 import pytest
 
-from hdx.location import get_int_timestamp
 from hdx.location.currency import Currency, CurrencyError
+from hdx.location.int_timestamp import get_int_timestamp
 from hdx.utilities.dateparse import parse_date
 from hdx.utilities.downloader import Download
 from hdx.utilities.path import get_temp_dir

{hdx_python_country-3.8.9 → hdx_python_country-3.9.1}/tests/hdx/location/test_wfp_exchangerates.py

@@ -2,8 +2,8 @@ from os.path import join
 
 import pytest
 
-from hdx.location import get_int_timestamp
 from hdx.location.currency import Currency
+from hdx.location.int_timestamp import get_int_timestamp
 from hdx.location.wfp_api import WFPAPI
 from hdx.location.wfp_exchangerates import WFPExchangeRates
 from hdx.utilities.dateparse import parse_date

hdx_python_country-3.8.9/src/hdx/location/__init__.py

@@ -1,17 +0,0 @@
-from datetime import datetime
-
-from ._version import version as __version__  # noqa: F401
-from hdx.utilities.dateparse import get_timestamp_from_datetime
-
-
-def get_int_timestamp(date: datetime) -> int:
-    """
-    Get integer timestamp from datetime object
-
-    Args:
-        date (datetime): datetime object
-
-    Returns:
-        int: Integer timestamp
-    """
-    return int(round(get_timestamp_from_datetime(date)))