hdx-python-pipelineutils 0.0.6__tar.gz → 0.0.8__tar.gz

{hdx_python_pipelineutils-0.0.6 → hdx_python_pipelineutils-0.0.8}/.github/workflows/publish.yaml

@@ -17,7 +17,7 @@ jobs:
       contents: read
 
     steps:
-    - uses: actions/checkout@v6
+    - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
 
     - name: Get history and tags for versioning to work
       run: |
@@ -25,7 +25,7 @@ jobs:
         git fetch --depth=1 origin +refs/tags/*:refs/tags/*
 
     - name: Install uv
-      uses: astral-sh/setup-uv@v7
+      uses: astral-sh/setup-uv@68559e99cc807c1eb7e9238fd43a15bba460eec2 # v10.3.3
 
     - name: Build with uv
       run: uv build

{hdx_python_pipelineutils-0.0.6 → hdx_python_pipelineutils-0.0.8}/.github/workflows/run-python-tests.yaml

@@ -16,10 +16,10 @@ jobs:
       pull-requests: write
 
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
 
       - name: Install uv
-        uses: astral-sh/setup-uv@v7
+        uses: astral-sh/setup-uv@68559e99cc807c1eb7e9238fd43a15bba460eec2 # v10.3.3
         with:
           enable-cache: true
           python-version: "3.13"
@@ -39,13 +39,13 @@ jobs:
         run: uv run pytest
 
       - name: Publish Unit Test Results
-        uses: EnricoMi/publish-unit-test-result-action@v2
+        uses: EnricoMi/publish-unit-test-result-action@7622c5bf3d112a72ab4fa3951c2aa5723d8ab92d # v2.25.0
         if: always()
         with:
           files: test-results.xml
 
       - name: Publish in Coveralls
-        uses: coverallsapp/github-action@v2
+        uses: coverallsapp/github-action@8d6379e14d29928660c4ba802d8e85393440b329 # v2.3.8
         if: always()
         with:
           flag-name: tests

{hdx_python_pipelineutils-0.0.6 → hdx_python_pipelineutils-0.0.8}/.pre-commit-config.yaml

@@ -10,7 +10,7 @@ repos:
       - id: check-ast
 
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.15.7
+    rev: v0.17.3
     hooks:
       # Run the linter.
       - id: ruff-check
@@ -19,7 +19,7 @@ repos:
       - id: ruff-format
 
   - repo: https://github.com/astral-sh/uv-pre-commit
-    rev: 0.10.12
+    rev: 0.13.6
     hooks:
       # Ensure the lockfile is up-to-date with pyproject.toml
       - id: uv-lock

{hdx_python_pipelineutils-0.0.6 → hdx_python_pipelineutils-0.0.8}/CLAUDE.md

@@ -37,7 +37,7 @@ Source lives under `src/hdx/pipelineutils/`:
 - **`org_type.py`** — `OrgType(Lookup)`: resolves organisation-type codes using `org_type_configuration.yaml`.
 - **`sector.py`** — `Sector(Lookup)`: resolves sector codes using `sector_configuration.yaml`.
 - **`hapi_admins.py`** — `complete_admins()`: populates adm-level names from p-codes and vice-versa using `hdx-python-country` `AdminLevel` objects; returns the resolved level and a list of warnings.
-- **`__init__.py`** — shared helpers: `string_params_to_dict`, `match_template` (extracts `{{...}}` placeholders), `get_startend_dates_from_time_period`.
+- **`__init__.py`** — shared helpers: `string_params_to_dict`, `get_startend_dates_from_time_period`.
 
 ## Testing
 
@@ -45,7 +45,7 @@ Tests are in `tests/` and use `pytest`. No live HDX connection is required — d
 
 ## Code Style
 
-Formatted and linted with `ruff` (rules: E, F, I, UP; line-length not enforced). Python ≥ 3.10. Use `X | Y` union syntax (PEP 604), not `Optional`/`Union`. Google-style docstrings with `Args:` and `Returns:` sections.
+Formatted and linted with `ruff` (rules: E, F, I, UP; line-length not enforced). Python ≥ 3.11. Use `X | Y` union syntax (PEP 604), not `Optional`/`Union`. Google-style docstrings with `Args:` and `Returns:` sections.
 
 ## Collaboration Style
 

{hdx_python_pipelineutils-0.0.6 → hdx_python_pipelineutils-0.0.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: hdx-python-pipelineutils
-Version: 0.0.6
+Version: 0.0.8
 Summary: HDX Python Pipeline Utilities
 Project-URL: Homepage, https://github.com/OCHA-DAP/hdx-python-pipelineutils
 Author-email: Michael Rans <rans@email.com>
@@ -18,16 +18,15 @@ Classifier: Operating System :: Unix
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3 :: Only
-Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: 3.14
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
-Requires-Python: >=3.10
-Requires-Dist: hdx-python-api>=6.6.7
-Requires-Dist: hdx-python-country>=4.2.1
-Requires-Dist: hdx-python-utilities>=4.2.0
+Requires-Python: >=3.11
+Requires-Dist: hdx-python-api>=6.7.8
+Requires-Dist: hdx-python-country>=4.2.7
+Requires-Dist: hdx-python-utilities>=4.2.6
 Provides-Extra: docs
 Requires-Dist: mkapi; extra == 'docs'
 Description-Content-Type: text/markdown

{hdx_python_pipelineutils-0.0.6 → hdx_python_pipelineutils-0.0.8}/pyproject.toml

@@ -18,7 +18,6 @@ classifiers = [
     "Programming Language :: Python",
     "Programming Language :: Python :: 3",
     "Programming Language :: Python :: 3 :: Only",
-    "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
     "Programming Language :: Python :: 3.13",
@@ -33,13 +32,13 @@ classifiers = [
 ]
 readme = "README.md"
 dynamic = ["version"]
-requires-python = ">=3.10"
+requires-python = ">=3.11"
 
 
 dependencies = [
-    "hdx-python-api>=6.6.7",
-    "hdx-python-country>=4.2.1",
-    "hdx-python-utilities>=4.2.0",
+    "hdx-python-api>=6.7.8",
+    "hdx-python-country>=4.2.7",
+    "hdx-python-utilities>=4.2.6",
 ]
 
 [project.optional-dependencies]
@@ -50,7 +49,7 @@ dev = [
     "pytest",
     "pytest-cov",
     "pre-commit",
-    "ruff==0.15.7",
+    "ruff==0.17.3",
 ]
 
 [project.urls]
@@ -81,7 +80,7 @@ allow-direct-references = true
 # ----------------------------------------------------------------------------
 
 [tool.ruff]
-target-version = "py310"
+target-version = "py311"
 src = ["src"]
 exclude = ["_version.py"]
 

{hdx_python_pipelineutils-0.0.6 → hdx_python_pipelineutils-0.0.8}/src/hdx/pipelineutils/__init__.py

@@ -1,10 +1,7 @@
-import re
 from datetime import datetime
 
 from hdx.data.dataset import Dataset
 
-template = re.compile("{{.*?}}")
-
 
 def string_params_to_dict(string: str) -> dict[str, str]:
     params = {}
@@ -16,22 +13,6 @@ def string_params_to_dict(string: str) -> dict[str, str]:
     return params
 
 
-def match_template(input: str) -> tuple[str | None, str | None]:
-    """Try to match {{XXX}} in input string
-
-    Args:
-        input: String in which to look for template
-
-    Returns:
-        (Matched string with brackets, matched string without brackets)
-    """
-    match = template.search(input)
-    if match:
-        template_string = match.group()
-        return template_string, template_string[2:-2]
-    return None, None
-
-
 def get_startend_dates_from_time_period(
     dataset: Dataset, today: datetime | None = None
 ) -> dict | None:

{hdx_python_pipelineutils-0.0.6 → hdx_python_pipelineutils-0.0.8}/src/hdx/pipelineutils/_version.py

@@ -18,7 +18,7 @@ version_tuple: tuple[int | str, ...]
 commit_id: str | None
 __commit_id__: str | None
 
-__version__ = version = '0.0.6'
-__version_tuple__ = version_tuple = (0, 0, 6)
+__version__ = version = '0.0.8'
+__version_tuple__ = version_tuple = (0, 0, 8)
 
 __commit_id__ = commit_id = None

{hdx_python_pipelineutils-0.0.6 → hdx_python_pipelineutils-0.0.8}/src/hdx/pipelineutils/hapi_admins.py

@@ -38,11 +38,29 @@ def complete_admins(
             warnings.append(f"PCode unknown {adm_code}->''")
             return ""
 
+    def get_pcode_from_names(level: int) -> str | None:
+        # Exact matching only, so that a wrong parent does not scope the
+        # child lookup to the wrong area
+        pcode = None
+        for j in range(level + 1):
+            if adm_codes[j] in admins[j].pcodes:
+                pcode = adm_codes[j]
+            elif provider_adm_names[j]:
+                pcode, _ = admins[j].get_pcode(
+                    countryiso3,
+                    provider_adm_names[j],
+                    parent=pcode,
+                    fuzzy_match=False,
+                )
+            else:
+                pcode = None
+        return pcode
+
     for i, provider_adm_name in reversed(list(enumerate(provider_adm_names))):
         adm_code = adm_codes[i]
         parent = admins[i].pcode_to_parent.get(adm_code)
         if not parent and i > 0:
-            parent = adm_codes[i - 1]
+            parent = adm_codes[i - 1] or get_pcode_from_names(i - 1) or ""
         if not provider_adm_name:
             provider_adm_name = ""
             provider_adm_names[i] = ""

{hdx_python_pipelineutils-0.0.6 → hdx_python_pipelineutils-0.0.8}/src/hdx/pipelineutils/lookup.py

@@ -59,7 +59,7 @@ class Lookup:
 
         reader = Read.get_reader()
         datasetinfo = self._configuration["datasetinfo"]
-        headers, iterator = reader.read(
+        _headers, iterator = reader.read(
             datasetinfo, file_prefix=self._configuration["file_prefix"]
         )
         code_key = self._configuration["code_key"]

{hdx_python_pipelineutils-0.0.6 → hdx_python_pipelineutils-0.0.8}/src/hdx/pipelineutils/reader.py

@@ -16,7 +16,7 @@ from hdx.utilities.retriever import Retrieve
 from hdx.utilities.saver import save_json
 from slugify import slugify
 
-from . import get_startend_dates_from_time_period, match_template
+from . import get_startend_dates_from_time_period
 
 logger = logging.getLogger(__name__)
 
@@ -68,8 +68,8 @@ class Read(Retrieve):
         temp_dir: Path | str,
         save: bool = False,
         use_saved: bool = False,
-        ignore: Sequence[str] = tuple(),
-        rate_limit: dict | None = {"calls": 1, "period": 0.1},
+        ignore: Sequence[str] = (),
+        rate_limit: dict | None = {"calls": 1, "period": 0.1},  # noqa: B006
         today: datetime | None = None,
         **kwargs: Any,
     ):
@@ -151,25 +151,6 @@ class Read(Retrieve):
         """
         return cls.get_retriever(name)
 
-    @staticmethod
-    def get_url(url: str, **kwargs: Any) -> str:
-        """Get url from a string replacing any template arguments
-
-        Args:
-            url: Url to read
-            **kwargs: Variables to use when evaluating template arguments
-
-        Returns:
-            Url with any template arguments replaced
-        """
-        for kwarg in kwargs:
-            globals()[kwarg] = kwargs[kwarg]
-        template_string, match_string = match_template(url)
-        if template_string:
-            replace_string = eval(match_string)
-            url = url.replace(template_string, replace_string)
-        return url
-
     def clone(self, downloader: Download) -> "Read":
         """Clone a given reader but use the given downloader
 
@@ -225,8 +206,6 @@ class Read(Retrieve):
         if compression:
             kwargs["compression"] = compression
         url = datasetinfo["url"]
-        if isinstance(url, list):
-            url = [self.get_url(x, **kwargs) for x in url]
         filename = kwargs.get("filename")
         if not filename:
             filename = datasetinfo.get("filename")
@@ -348,8 +327,7 @@ class Read(Retrieve):
         """
         filename = name.lower()
         file_type = f".{format}"
-        if filename.endswith(file_type):
-            filename = filename[: -len(file_type)]
+        filename = filename.removesuffix(file_type)
         return f"{slugify(filename, separator='_')}{file_type}"
 
     def construct_filename_and_download(

{hdx_python_pipelineutils-0.0.6 → hdx_python_pipelineutils-0.0.8}/src/hdx/pipelineutils/sector_configuration.yaml

@@ -45,6 +45,7 @@ initial_lookup:
   camp coordination and camp management: "CCM"
   camp coordination camp management: "CCM"
   cash: "Cash"
+  cash multi sectoriel: "Cash"
   cash transfers: "Cash"
   cccm: "CCM"
   ccs: "CCM"

{hdx_python_pipelineutils-0.0.6 → hdx_python_pipelineutils-0.0.8}/tests/test_hapi_admins.py

@@ -96,6 +96,17 @@ class TestAdmins:
         assert adm_level == 2
         assert warnings == []
 
+        provider_adm_names = ["Kabul", "Qara Bagh"]
+        adm_codes = ["", ""]
+        adm_names = ["", ""]
+        adm_level, warnings = complete_admins(
+            admins, countryiso3, provider_adm_names, adm_codes, adm_names
+        )
+        assert adm_codes == ["AF01", "AF0114"]
+        assert adm_names == ["Kabul", "Qara Bagh"]
+        assert adm_level == 2
+        assert warnings == []
+
         provider_adm_names = ["Kabal", "Paghman"]
         adm_codes = ["AF01", ""]
         adm_names = ["", ""]

{hdx_python_pipelineutils-0.0.6 → hdx_python_pipelineutils-0.0.8}/tests/test_lookup.py

@@ -7,6 +7,8 @@ class TestLookup:
         sector = Sector()
         assert sector.get_code("child protection") == "PRO-CPN"
         assert sector.get_code("gestion des sites daccueil temporaires") == "SHL"
+        assert sector.get_code("Cash multi-sectoriel") == "Cash"
+        assert sector.get_code("Abris et Non vivres") == "SHL"
         assert "Intersectoral" in sector.get_code_to_name()
         assert sector.get_name("PRO-MIN") == "Mine Action"
         assert sector.get_name("xxx") is None

{hdx_python_pipelineutils-0.0.6 → hdx_python_pipelineutils-0.0.8}/tests/test_readers.py

@@ -1,4 +1,4 @@
-from datetime import datetime, timezone
+from datetime import UTC, datetime
 
 import pytest
 from hdx.data.dataset import Dataset
@@ -12,8 +12,9 @@ from hdx.pipelineutils.reader import Read
 
 class TestReaders:
     def test_clone(self):
-        with Download(user_agent="test") as downloader:
-            with Read(
+        with (
+            Download(user_agent="test") as downloader,
+            Read(
                 downloader,
                 "fallback_dir",
                 "saved_dir",
@@ -22,12 +23,13 @@ class TestReaders:
                 use_saved=False,
                 prefix="population",
                 today=parse_date("2021-02-01"),
-            ) as reader:
-                clone_reader = reader.clone(downloader)
-                for property, value in vars(reader).items():
-                    if property == "downloader":
-                        continue
-                    assert getattr(clone_reader, property) == value
+            ) as reader,
+        ):
+            clone_reader = reader.clone(downloader)
+            for property, value in vars(reader).items():
+                if property == "downloader":
+                    continue
+                assert getattr(clone_reader, property) == value
 
     def test_read_dataset(self, configuration, monkeypatch):
         def read_from_hdx(dataset_name, _):
@@ -44,45 +46,47 @@ class TestReaders:
             dataset.add_update_resource(resource)
             return dataset
 
-        with temp_dir("TestReader") as temp_folder:
-            with Download(user_agent="test") as downloader:
-                munged_url = "https://docs.google.com/spreadsheets/d/1NjSI2LaS3SqbgYc0HdD8oIb7lofGtiHgoKKATCpwVdY/export?format=csv&gid=1088874596"
-                with Read(
-                    downloader,
-                    temp_folder,
-                    temp_folder,
-                    temp_folder,
-                    save=True,
-                    use_saved=False,
-                    prefix="test",
-                    today=parse_date("2021-02-01"),
-                ) as reader:
-                    monkeypatch.setattr(Dataset, "read_from_hdx", read_from_hdx)
-                    dataset_name = "None"
-                    dataset = reader.read_dataset(dataset_name)
-                    assert dataset is None
-                    dataset_name = "Test Dataset"
-                    dataset = reader.read_dataset(dataset_name)
-                    assert dataset["name"] == dataset_name
-                    assert dataset.get_resource()["url"] == munged_url
-                    monkeypatch.delattr(Dataset, "read_from_hdx")
-                with Read(
-                    downloader,
-                    temp_folder,
-                    temp_folder,
-                    temp_folder,
-                    save=False,
-                    use_saved=True,
-                    prefix="test",
-                    today=parse_date("2021-02-01"),
-                ) as reader:
-                    dataset_name = "None"
-                    dataset = reader.read_dataset(dataset_name)
-                    assert dataset is None
-                    dataset_name = "Test Dataset"
-                    dataset = reader.read_dataset(dataset_name)
-                    assert dataset["name"] == dataset_name
-                    assert dataset.get_resource()["url"] == munged_url
+        with (
+            temp_dir("TestReader") as temp_folder,
+            Download(user_agent="test") as downloader,
+        ):
+            munged_url = "https://docs.google.com/spreadsheets/d/1NjSI2LaS3SqbgYc0HdD8oIb7lofGtiHgoKKATCpwVdY/export?format=csv&gid=1088874596"
+            with Read(
+                downloader,
+                temp_folder,
+                temp_folder,
+                temp_folder,
+                save=True,
+                use_saved=False,
+                prefix="test",
+                today=parse_date("2021-02-01"),
+            ) as reader:
+                monkeypatch.setattr(Dataset, "read_from_hdx", read_from_hdx)
+                dataset_name = "None"
+                dataset = reader.read_dataset(dataset_name)
+                assert dataset is None
+                dataset_name = "Test Dataset"
+                dataset = reader.read_dataset(dataset_name)
+                assert dataset["name"] == dataset_name
+                assert dataset.get_resource()["url"] == munged_url
+                monkeypatch.delattr(Dataset, "read_from_hdx")
+            with Read(
+                downloader,
+                temp_folder,
+                temp_folder,
+                temp_folder,
+                save=False,
+                use_saved=True,
+                prefix="test",
+                today=parse_date("2021-02-01"),
+            ) as reader:
+                dataset_name = "None"
+                dataset = reader.read_dataset(dataset_name)
+                assert dataset is None
+                dataset_name = "Test Dataset"
+                dataset = reader.read_dataset(dataset_name)
+                assert dataset["name"] == dataset_name
+                assert dataset.get_resource()["url"] == munged_url
 
     def test_search_datasets(self, configuration, monkeypatch):
         filename = "TestDataset"
@@ -102,50 +106,50 @@ class TestReaders:
                 datasets.append(dataset)
             return datasets
 
-        with temp_dir("TestReader") as temp_folder:
-            with Download(user_agent="test") as downloader:
-                with Read(
-                    downloader,
-                    temp_folder,
-                    temp_folder,
-                    temp_folder,
-                    save=True,
-                    use_saved=False,
-                    prefix="test",
-                    today=parse_date("2021-02-01"),
-                ) as reader:
-                    monkeypatch.setattr(Dataset, "search_in_hdx", search_in_hdx)
-                    datasets = reader.search_datasets(filename)
-                    assert len(datasets) == 2
-                    dataset = datasets[0]
-                    assert dataset["name"] == f"{filename}_0"
-                    assert dataset.get_resource()["url"] == f"{filename}_0.json"
-                    dataset = datasets[1]
-                    assert dataset["name"] == f"{filename}_1"
-                    assert dataset.get_resource()["url"] == f"{filename}_1.json"
-                    monkeypatch.delattr(Dataset, "search_in_hdx")
-                with Read(
-                    downloader,
-                    temp_folder,
-                    temp_folder,
-                    temp_folder,
-                    save=False,
-                    use_saved=True,
-                    prefix="test",
-                    today=parse_date("2021-02-01"),
-                ) as reader:
-                    datasets = reader.search_datasets(filename)
-                    assert len(datasets) == 2
-                    dataset = datasets[0]
-                    assert dataset["name"] == f"{filename}_0"
-                    assert dataset.get_resource()["url"] == f"{filename}_0.json"
-                    dataset = datasets[1]
-                    assert dataset["name"] == f"{filename}_1"
-                    assert dataset.get_resource()["url"] == f"{filename}_1.json"
+        with (
+            temp_dir("TestReader") as temp_folder,
+            Download(user_agent="test") as downloader,
+        ):
+            with Read(
+                downloader,
+                temp_folder,
+                temp_folder,
+                temp_folder,
+                save=True,
+                use_saved=False,
+                prefix="test",
+                today=parse_date("2021-02-01"),
+            ) as reader:
+                monkeypatch.setattr(Dataset, "search_in_hdx", search_in_hdx)
+                datasets = reader.search_datasets(filename)
+                assert len(datasets) == 2
+                dataset = datasets[0]
+                assert dataset["name"] == f"{filename}_0"
+                assert dataset.get_resource()["url"] == f"{filename}_0.json"
+                dataset = datasets[1]
+                assert dataset["name"] == f"{filename}_1"
+                assert dataset.get_resource()["url"] == f"{filename}_1.json"
+                monkeypatch.delattr(Dataset, "search_in_hdx")
+            with Read(
+                downloader,
+                temp_folder,
+                temp_folder,
+                temp_folder,
+                save=False,
+                use_saved=True,
+                prefix="test",
+                today=parse_date("2021-02-01"),
+            ) as reader:
+                datasets = reader.search_datasets(filename)
+                assert len(datasets) == 2
+                dataset = datasets[0]
+                assert dataset["name"] == f"{filename}_0"
+                assert dataset.get_resource()["url"] == f"{filename}_0.json"
+                dataset = datasets[1]
+                assert dataset["name"] == f"{filename}_1"
+                assert dataset.get_resource()["url"] == f"{filename}_1.json"
 
     def test_read(self, configuration):
-        url = Read.get_url("http://{{var}}", var="hello")
-        assert url == "http://hello"
         datasetinfo = {
             "name": "test",
             "dataset": "sahel-humanitarian-needs-overview",
@@ -180,8 +184,8 @@ class TestReaders:
                 "hdx_provider_name": "OCHA West and Central Africa (ROWCA)",
                 "license": "[Creative Commons Attribution International](http://www.opendefinition.org/licenses/cc-by)",
                 "time_period": {
-                    "end": datetime(2016, 9, 1, 23, 59, 59, tzinfo=timezone.utc),
-                    "start": datetime(2016, 9, 1, 0, 0, tzinfo=timezone.utc),
+                    "end": datetime(2016, 9, 1, 23, 59, 59, tzinfo=UTC),
+                    "start": datetime(2016, 9, 1, 0, 0, tzinfo=UTC),
                 },
                 "title": "Sahel : Humanitarian Needs Overview",
             },
@@ -190,19 +194,19 @@ class TestReaders:
                 "name": "HNO -2017 -Sahel-nutrition.csv",
                 "format": "csv",
                 "hdx_id": "2527ac5b-66fe-46f0-8b9b-7086d2c4ddd3",
-                "update_date": datetime(2017, 3, 10, 10, 8, 37, tzinfo=timezone.utc),
+                "update_date": datetime(2017, 3, 10, 10, 8, 37, tzinfo=UTC),
             },
             "headers": 1,
             "name": "test",
             "source": "Multiple organisations",
             "source_date": {
-                "end": datetime(2016, 9, 1, 23, 59, 59, tzinfo=timezone.utc),
-                "start": datetime(2016, 9, 1, 0, 0, tzinfo=timezone.utc),
+                "end": datetime(2016, 9, 1, 23, 59, 59, tzinfo=UTC),
+                "start": datetime(2016, 9, 1, 0, 0, tzinfo=UTC),
             },
             "source_url": "https://data.humdata.org/dataset/sahel-humanitarian-needs-overview",
             "time_period": {
-                "end": datetime(2016, 9, 1, 23, 59, 59, tzinfo=timezone.utc),
-                "start": datetime(2016, 9, 1, 0, 0, tzinfo=timezone.utc),
+                "end": datetime(2016, 9, 1, 23, 59, 59, tzinfo=UTC),
+                "start": datetime(2016, 9, 1, 0, 0, tzinfo=UTC),
             },
             "url": "https://data.humdata.org/dataset/47f6ef46-500f-421a-9fa2-fefd93facf95/resource/2527ac5b-66fe-46f0-8b9b-7086d2c4ddd3/download/hno-2017-sahel-nutrition.csv",
         }
@@ -251,8 +255,8 @@ class TestReaders:
                 "hdx_provider_name": "OCHA West and Central Africa (ROWCA)",
                 "license": "[Creative Commons Attribution International](http://www.opendefinition.org/licenses/cc-by)",
                 "time_period": {
-                    "end": datetime(2016, 9, 1, 23, 59, 59, tzinfo=timezone.utc),
-                    "start": datetime(2016, 9, 1, 0, 0, tzinfo=timezone.utc),
+                    "end": datetime(2016, 9, 1, 23, 59, 59, tzinfo=UTC),
+                    "start": datetime(2016, 9, 1, 0, 0, tzinfo=UTC),
                 },
                 "title": "Sahel : Humanitarian Needs Overview",
             },
@@ -261,7 +265,7 @@ class TestReaders:
                 "name": "HNO-2017-Sahel- People in need.xlsx",
                 "format": "xlsx",
                 "hdx_id": "d9248be4-7bfb-4a81-a7aa-c035dcb737a2",
-                "update_date": datetime(2017, 3, 10, 10, 8, 37, tzinfo=timezone.utc),
+                "update_date": datetime(2017, 3, 10, 10, 8, 37, tzinfo=UTC),
             },
             "headers": 1,
             "name": "test",
@@ -269,13 +273,13 @@ class TestReaders:
             "sheet": 1,
             "source": "Multiple organisations",
             "source_date": {
-                "end": datetime(2016, 9, 1, 23, 59, 59, tzinfo=timezone.utc),
-                "start": datetime(2016, 9, 1, 0, 0, tzinfo=timezone.utc),
+                "end": datetime(2016, 9, 1, 23, 59, 59, tzinfo=UTC),
+                "start": datetime(2016, 9, 1, 0, 0, tzinfo=UTC),
             },
             "source_url": "https://data.humdata.org/dataset/sahel-humanitarian-needs-overview",
             "time_period": {
-                "end": datetime(2016, 9, 1, 23, 59, 59, tzinfo=timezone.utc),
-                "start": datetime(2016, 9, 1, 0, 0, tzinfo=timezone.utc),
+                "end": datetime(2016, 9, 1, 23, 59, 59, tzinfo=UTC),
+                "start": datetime(2016, 9, 1, 0, 0, tzinfo=UTC),
             },
             "url": "https://data.humdata.org/dataset/47f6ef46-500f-421a-9fa2-fefd93facf95/resource/d9248be4-7bfb-4a81-a7aa-c035dcb737a2/download/hno-2017-sahel-people-in-need.xlsx",
         }