hdx-python-api 6.7.7__tar.gz → 6.7.8__tar.gz

{hdx_python_api-6.7.7 → hdx_python_api-6.7.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@07a047e608db84b3d8c06cd9a7c7dcc9c355c18e # v10.3.2
 
     - name: Build with uv
       run: uv build

{hdx_python_api-6.7.7 → hdx_python_api-6.7.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@07a047e608db84b3d8c06cd9a7c7dcc9c355c18e # v10.3.2
         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_api-6.7.7 → hdx_python_api-6.7.8}/.pre-commit-config.yaml

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

{hdx_python_api-6.7.7 → hdx_python_api-6.7.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: hdx-python-api
-Version: 6.7.7
+Version: 6.7.8
 Summary: HDX Python API for interacting with the Humanitarian Data Exchange
 Project-URL: Homepage, https://github.com/OCHA-DAP/hdx-python-api
 Author: Michael Rans
@@ -28,7 +28,7 @@ Requires-Dist: ckanapi>=4.11
 Requires-Dist: defopt>=7.0.0
 Requires-Dist: email-validator
 Requires-Dist: hdx-python-country>=4.2.6
-Requires-Dist: hdx-python-utilities>=4.2.5
+Requires-Dist: hdx-python-utilities>=4.2.6
 Requires-Dist: makefun
 Requires-Dist: requests
 Provides-Extra: docs

{hdx_python_api-6.7.7 → hdx_python_api-6.7.8}/documentation/explanation/facades.md

@@ -11,4 +11,4 @@ project configuration is used for any configuration specific to your project.
 
 The default logging configuration reads a configuration file internal to the library
 that sets up an coloured console handler outputting at INFO level and a file handler
-writing to errors.log at ERROR level.
+writing to errors.log at ERROR level.

{hdx_python_api-6.7.7 → hdx_python_api-6.7.8}/documentation/explanation/history.md

@@ -15,4 +15,4 @@ resolve issues as quickly as possible. Static metadata can be held in human read
 files so if it needs to be modified, it is straightforward.
 
 The HDX Python library has expanded over time as needs have arisen and is used for a
-range of tasks involving interaction with the HDX platform.
+range of tasks involving interaction with the HDX platform.

{hdx_python_api-6.7.7 → hdx_python_api-6.7.8}/documentation/explanation/information.md

@@ -8,4 +8,4 @@ This library is part of the [Humanitarian Data Exchange](https://data.humdata.or
 HDX.
 
 The code for the library is [here](https://github.com/OCHA-DAP/hdx-python-api).
-The library has detailed API documentation which can be found in the menu at the top.
+The library has detailed API documentation which can be found in the menu at the top.

{hdx_python_api-6.7.7 → hdx_python_api-6.7.8}/documentation/how-to/api-key.md

@@ -21,4 +21,4 @@ the drop down menu
             **.hdx_configuration.yaml** in the current user's home
             directory. Then put in the YAML file:
 
-            hdx_key: "HDX API KEY"
+            hdx_key: "HDX API KEY"

{hdx_python_api-6.7.7 → hdx_python_api-6.7.8}/documentation/how-to/docker.md

@@ -3,4 +3,4 @@
 The library is also available set up and ready to go in a Docker image:
 
     docker pull public.ecr.aws/unocha/hdx-scraper-baseimage:stable
-    docker run -i -t public.ecr.aws/unocha/hdx-scraper-baseimage:stable python3
+    docker run -i -t public.ecr.aws/unocha/hdx-scraper-baseimage:stable python3

{hdx_python_api-6.7.7 → hdx_python_api-6.7.8}/documentation/how-to/framework.md

@@ -54,4 +54,4 @@ Create a file **my_code.py** and copy into it the code below:
         """
         logger.debug("Generating dataset!")
 
-You can then fill out the function **generate_dataset** as required.
+You can then fill out the function **generate_dataset** as required.

{hdx_python_api-6.7.7 → hdx_python_api-6.7.8}/documentation/how-to/install.md

@@ -15,4 +15,4 @@ package that are missing eg. for Ubuntu: python-dev, libffi-dev and libssl-dev.
 If you get import or other errors, then please either recreate your virtualenv if you
 are using one or uninstall hdx-python-api, hdx-python-country and hdx-python-utilities
 using **pip uninstall**, then install hdx-python-api (which will pull in the other
-dependencies).
+dependencies).

{hdx_python_api-6.7.7 → hdx_python_api-6.7.8}/documentation/how-to/logging.md

@@ -23,4 +23,4 @@ Then use the logger like this:
     logger.info("INFORMATION message")
     logger.warning("WARNING message")
     logger.error("ERROR message")
-    logger.critical("CRITICAL error message")
+    logger.critical("CRITICAL error message")

{hdx_python_api-6.7.7 → hdx_python_api-6.7.8}/documentation/how-to/objects.md

@@ -99,4 +99,4 @@ You can delete HDX objects using **delete_from_hdx** and update an object that
 already exists in HDX with the method **update_in_hdx**. These take various
 boolean parameters that all have defaults and are documented in the API docs.
 They do not return anything and they throw exceptions for failures like the
-object to update not existing.
+object to update not existing.

{hdx_python_api-6.7.7 → hdx_python_api-6.7.8}/documentation/how-to/operate-datasets/dataset-resources.md

@@ -106,4 +106,4 @@ dataset is updated from the result:
 
     dataset.set_qa_completed(True)
     dataset.qa_revise_resources("pii", "false")
-    dataset.reset_fs_check()
+    dataset.reset_fs_check()

{hdx_python_api-6.7.7 → hdx_python_api-6.7.8}/documentation/how-to/operate-datasets/location.md

@@ -38,4 +38,4 @@ If you want to add any other kind of location (which must be in this
 [list of valid locations](https://data.humdata.org/api/action/group_list?all_fields=true)),
 you do as shown below.
 
-    dataset.add_other_location("LOCATION")
+    dataset.add_other_location("LOCATION")

{hdx_python_api-6.7.7 → hdx_python_api-6.7.8}/documentation/how-to/operate-datasets/maintainer.md

@@ -10,4 +10,4 @@ If you want to set the maintainer, you do it like this:
 
     dataset.set_maintainer(USER)
 
-USER is either a string id, dictionary or a User object.
+USER is either a string id, dictionary or a User object.

{hdx_python_api-6.7.7 → hdx_python_api-6.7.8}/documentation/how-to/operate-datasets/organization.md

@@ -11,4 +11,4 @@ If you want to set the organization, you do it like this:
     dataset.set_organization(ORGANIZATION)
 
 ORGANIZATION is either a string id, dictionary or an Organization
-object.
+object.

{hdx_python_api-6.7.7 → hdx_python_api-6.7.8}/documentation/how-to/operate-datasets/tags.md

@@ -21,4 +21,4 @@ If you want to add a list of tags, you do it as follows:
 
 To obtain the predefined set of approved tags:
 
-    approved_tags = Vocabulary.approved_tags()
+    approved_tags = Vocabulary.approved_tags()

{hdx_python_api-6.7.7 → hdx_python_api-6.7.8}/documentation/how-to/operate-datasets/time-period.md

@@ -28,4 +28,4 @@ The method below allows you to set the time period using a year range. The start
 end year can be supplied as integers or strings. If no end year is supplied then the
 range will be from the beginning of the start year to the end of that year.
 
-    dataset.set_time_period_year_range(START YEAR, END YEAR)
+    dataset.set_time_period_year_range(START YEAR, END YEAR)

{hdx_python_api-6.7.7 → hdx_python_api-6.7.8}/documentation/how-to/operate-datasets/update-frequency.md

@@ -38,4 +38,4 @@ A list of valid update frequencies can be found using:
 Transforming backwards and forwards between representations can be achieved with this
 function:
 
-    update_frequency = Dataset.transform_update_frequency("UPDATE_FREQUENCY")
+    update_frequency = Dataset.transform_update_frequency("UPDATE_FREQUENCY")

{hdx_python_api-6.7.7 → hdx_python_api-6.7.8}/documentation/reference/changelog.md

@@ -70,4 +70,4 @@ List[str]] (Tuple containing list of added tags and list of deleted tags and tag
 added).
 
 From 3.7.1, the list of tags must be from a set of approved tags (see
-[Set Tags](../how-to/operate-datasets/tags.md)).
+[Set Tags](../how-to/operate-datasets/tags.md)).

{hdx_python_api-6.7.7 → hdx_python_api-6.7.8}/documentation/tutorials/getting-started.md

@@ -130,4 +130,4 @@ virtualenv if not installed:
 
      On other OSs:
 
-        rm -rf test
+        rm -rf test

{hdx_python_api-6.7.7 → hdx_python_api-6.7.8}/pyproject.toml

@@ -39,7 +39,7 @@ dependencies = [
     "defopt>=7.0.0",
     "email_validator",
     "hdx-python-country>=4.2.6",
-    "hdx-python-utilities>=4.2.5",
+    "hdx-python-utilities>=4.2.6",
     "makefun",
     "requests",
 ]
@@ -55,7 +55,7 @@ dev = [
     "pytest-cov",
     "pytest-mock",
     "pre-commit",
-    "ruff==0.14.14",
+    "ruff==0.17.3",
 ]
 
 [project.urls]

{hdx_python_api-6.7.7 → hdx_python_api-6.7.8}/src/hdx/api/_version.py

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

{hdx_python_api-6.7.7 → hdx_python_api-6.7.8}/src/hdx/api/configuration.py

@@ -200,7 +200,7 @@ class Configuration(UserDict):
             if hdx_read_only is None:
                 hdx_read_only = False
         self.hdx_read_only = hdx_read_only
-        logger.info(f"Read only access to HDX: {str(self.hdx_read_only)}")
+        logger.info(f"Read only access to HDX: {self.hdx_read_only!s}")
 
         if self.hdx_site == "hdx_custom_site":
             hdx_key = None

{hdx_python_api-6.7.7 → hdx_python_api-6.7.8}/src/hdx/api/utilities/date_helper.py

@@ -63,7 +63,7 @@ class DateHelper:
     def get_time_period_info(
         hdx_time_period: str,
         date_format: str | None = None,
-        today: datetime = now_utc(),
+        today: datetime | None = None,
     ) -> dict:
         """Get time period as datetimes and strings in specified format.
         If no format is supplied, the ISO 8601 format is used. Returns a
@@ -80,6 +80,8 @@ class DateHelper:
         Returns:
             Dictionary of date information
         """
+        if today is None:
+            today = now_utc()
         result = {}
         if hdx_time_period:
             if hdx_time_period[0] == "[" and hdx_time_period[-1] == "]":

{hdx_python_api-6.7.7 → hdx_python_api-6.7.8}/src/hdx/api/utilities/hdx_error_handler.py

@@ -1,6 +1,7 @@
 import logging
 from collections.abc import Sequence
 from os import getenv
+from types import TracebackType
 from typing import Any
 
 from hdx.utilities.dictandlist import dict_of_sets_add
@@ -32,7 +33,7 @@ class HDXErrorHandler(ErrorHandler):
     ):
         super().__init__(should_exit_on_error)
         if write_to_hdx is None:
-            write_to_hdx = getenv("ERR_TO_HDX", True)
+            write_to_hdx = getenv("ERR_TO_HDX", "True")
         if write_to_hdx in (False, 0, "false", "False", "FALSE", "N", "n", ""):
             self._write_to_hdx = False
             logger.info("Errors won't be written to HDX")
@@ -210,7 +211,12 @@ class HDXErrorHandler(ErrorHandler):
         if self._write_to_hdx:
             self.write_errors_to_hdx()
 
-    def __exit__(self, exc_type: Any, exc_value: Any, traceback: Any) -> None:
+    def __exit__(
+        self,
+        exc_type: type[BaseException] | None,
+        exc_value: BaseException | None,
+        traceback: TracebackType | None,
+    ) -> None:
         if self._write_to_hdx:
             self.write_errors_to_hdx()
         super().__exit__(exc_type, exc_value, traceback)

{hdx_python_api-6.7.7 → hdx_python_api-6.7.8}/src/hdx/data/dataset.py

@@ -10,6 +10,7 @@ from pathlib import Path
 from typing import (
     TYPE_CHECKING,
     Any,
+    ClassVar,
     Optional,
     Union,
 )
@@ -19,7 +20,6 @@ from hdx.utilities.base_downloader import BaseDownload
 from hdx.utilities.dateparse import (
     default_date,
     default_enddate,
-    now_utc,
     now_utc_notz,
     parse_date,
     parse_date_range,
@@ -34,12 +34,11 @@ import hdx.api.utilities.url_utils
 import hdx.data.organization as org_module
 import hdx.data.resource as res_module
 import hdx.data.showcase as sc_module
-import hdx.data.user as user
-import hdx.data.vocabulary as vocabulary
 from hdx.api.configuration import Configuration
 from hdx.api.locations import Locations
 from hdx.api.utilities.date_helper import DateHelper
 from hdx.api.utilities.filestore_helper import FilestoreHelper
+from hdx.data import user, vocabulary
 from hdx.data.activity import Activity
 from hdx.data.hdxobject import HDXError, HDXObject
 from hdx.data.resource_matcher import ResourceMatcher
@@ -67,7 +66,7 @@ class Dataset(HDXObject):
 
     max_attempts = 5
     max_int = sys.maxsize
-    update_frequencies = {
+    update_frequencies: ClassVar[dict[str, str]] = {
         "-2": "As needed",
         "-1": "Never",
         "0": "Live",
@@ -224,7 +223,7 @@ class Dataset(HDXObject):
             session = hdx.api.utilities.url_utils.get_ckan_ready_session(
                 self.configuration
             )
-            for resource in dataset_dict.get("resources", tuple()):
+            for resource in dataset_dict.get("resources", ()):
                 resource["url"] = hdx.api.utilities.url_utils.follow_url(
                     resource["url"], session=session
                 )
@@ -295,11 +294,10 @@ class Dataset(HDXObject):
             The resource that was added after matching with any existing resource
         """
         resource = self._get_resource_from_obj(resource)
-        if "package_id" in resource:
-            if not ignore_datasetid:
-                raise HDXError(
-                    f"Resource {resource['name']} being added already has a dataset id!"
-                )
+        if "package_id" in resource and not ignore_datasetid:
+            raise HDXError(
+                f"Resource {resource['name']} being added already has a dataset id!"
+            )
         resource.check_both_url_filetoupload()
         resource_index = ResourceMatcher.match_resource_list(self._resources, resource)
         if resource_index is None:
@@ -331,11 +329,10 @@ class Dataset(HDXObject):
         resource_objects = []
         for resource in resources:
             resource = self._get_resource_from_obj(resource)
-            if "package_id" in resource:
-                if not ignore_datasetid:
-                    raise HDXError(
-                        f"Resource {resource['name']} being added already has a dataset id!"
-                    )
+            if "package_id" in resource and not ignore_datasetid:
+                raise HDXError(
+                    f"Resource {resource['name']} being added already has a dataset id!"
+                )
             resource.check_both_url_filetoupload()
             resource_objects.append(resource)
         (
@@ -371,9 +368,8 @@ class Dataset(HDXObject):
         Returns:
             True if resource removed or False if not
         """
-        if isinstance(resource, str):
-            if is_valid_uuid(resource) is False:
-                raise HDXError(f"{resource} is not a valid resource id!")
+        if isinstance(resource, str) and is_valid_uuid(resource) is False:
+            raise HDXError(f"{resource} is not a valid resource id!")
         return self._remove_hdxobject(self._resources, resource, delete=delete)
 
     def get_resources(self) -> list["Resource"]:
@@ -593,8 +589,8 @@ class Dataset(HDXObject):
     def revise(
         match: dict[str, Any],
         filter: Sequence[str] = (),
-        update: dict[str, Any] = {},
-        files_to_upload: dict[str, str] = {},
+        update: dict[str, Any] | None = None,
+        files_to_upload: dict[str, str] | None = None,
         configuration: Configuration | None = None,
         **kwargs: Any,
     ) -> "Dataset":
@@ -611,6 +607,10 @@ class Dataset(HDXObject):
         Returns:
             Dataset object
         """
+        if files_to_upload is None:
+            files_to_upload = {}
+        if update is None:
+            update = {}
         separators = (",", ":")
         data = {"match": json.dumps(match, separators=separators)}
         if filter:
@@ -750,11 +750,11 @@ class Dataset(HDXObject):
             for resource_index in resources_to_delete:
                 del resources_to_update[resource_index]
                 new_fsresources = {}
-                for index in filestore_resources:
+                for index, fsresource in filestore_resources.items():
                     if index > resource_index:
-                        new_fsresources[index - 1] = filestore_resources[index]
+                        new_fsresources[index - 1] = fsresource
                     else:
-                        new_fsresources[index] = filestore_resources[index]
+                        new_fsresources[index] = fsresource
                 filestore_resources = new_fsresources
             for (
                 resource_index,
@@ -1182,15 +1182,13 @@ class Dataset(HDXObject):
         """
         self.check_resources_url_filetoupload()
         loadedid = self.data.get("id")
-        if loadedid is not None:
-            if not self._dataset_load_from_hdx(loadedid):
-                logger.warning(f"Failed to load dataset with id {loadedid}")
-                loadedid = None
+        if loadedid is not None and not self._dataset_load_from_hdx(loadedid):
+            logger.warning(f"Failed to load dataset with id {loadedid}")
+            loadedid = None
         if not loadedid:
             loadedid = self.data.get("name")
-            if loadedid is not None:
-                if not self._dataset_load_from_hdx(loadedid):
-                    loadedid = None
+            if loadedid is not None and not self._dataset_load_from_hdx(loadedid):
+                loadedid = None
         if loadedid:
             statuses, _ = self._dataset_hdx_update(
                 allow_no_resources=allow_no_resources,
@@ -1433,8 +1431,7 @@ class Dataset(HDXObject):
         """
         resources = []
         for dataset in datasets:
-            for resource in dataset.get_resources():
-                resources.append(resource)
+            resources.extend(dataset.get_resources())
         return resources
 
     def get_activities(self, all_pages: bool = False, **kwargs: Any) -> list[Activity]:
@@ -1479,7 +1476,7 @@ class Dataset(HDXObject):
     def get_time_period(
         self,
         date_format: str | None = None,
-        today: datetime = now_utc(),
+        today: datetime | None = None,
     ) -> dict:
         """Get dataset date as datetimes and strings in specified format. If no format is supplied, the ISO 8601
         format is used. Returns a dictionary containing keys startdate (start date as datetime), enddate (end
@@ -1595,7 +1592,7 @@ class Dataset(HDXObject):
             int(update_frequency)
         except ValueError:
             update_frequency = Dataset.transform_update_frequency(update_frequency)
-        if update_frequency not in Dataset.update_frequencies.keys():
+        if update_frequency not in Dataset.update_frequencies:
             raise HDXError("Invalid update frequency supplied!")
         self.data["data_update_frequency"] = update_frequency
 
@@ -1748,7 +1745,7 @@ class Dataset(HDXObject):
         Returns:
             True if country added or False if country already present
         """
-        iso3, match = Country.get_iso3_country_code_fuzzy(country, use_live=use_live)
+        iso3, _match = Country.get_iso3_country_code_fuzzy(country, use_live=use_live)
         if iso3 is None:
             raise HDXError(f"Country: {country} - cannot find iso3 code!")
         return self.add_other_location(
@@ -1883,7 +1880,7 @@ class Dataset(HDXObject):
         Returns:
             None
         """
-        if isinstance(maintainer, user.User) or isinstance(maintainer, dict):
+        if isinstance(maintainer, (user.User, dict)):
             if "id" not in maintainer:
                 maintainer = user.User.read_from_hdx(
                     maintainer["name"], configuration=self.configuration
@@ -1918,9 +1915,7 @@ class Dataset(HDXObject):
         Returns:
             None
         """
-        if isinstance(organization, org_module.Organization) or isinstance(
-            organization, dict
-        ):
+        if isinstance(organization, (org_module.Organization, dict)):
             if "id" not in organization:
                 organization = org_module.Organization.read_from_hdx(
                     organization["name"], configuration=self.configuration
@@ -1966,7 +1961,7 @@ class Dataset(HDXObject):
         Returns:
             Dataset showcase dict
         """
-        if isinstance(showcase, sc_module.Showcase) or isinstance(showcase, dict):
+        if isinstance(showcase, (sc_module.Showcase, dict)):
             if "id" not in showcase:
                 showcase = sc_module.Showcase.read_from_hdx(showcase["name"])
             showcase = showcase["id"]
@@ -1981,7 +1976,7 @@ class Dataset(HDXObject):
     def add_showcase(
         self,
         showcase: Union["Showcase", dict, str],
-        showcases_to_check: Sequence["Showcase"] = None,
+        showcases_to_check: Sequence["Showcase"] | None = None,
     ) -> bool:
         """Add dataset to showcase
 
@@ -1995,8 +1990,8 @@ class Dataset(HDXObject):
         dataset_showcase = self._get_dataset_showcase_dict(showcase)
         if showcases_to_check is None:
             showcases_to_check = self.get_showcases()
-        for showcase in showcases_to_check:
-            if dataset_showcase["showcase_id"] == showcase["id"]:
+        for showcase_to_check in showcases_to_check:
+            if dataset_showcase["showcase_id"] == showcase_to_check["id"]:
                 return False
         showcase = sc_module.Showcase(
             {"id": dataset_showcase["showcase_id"]},
@@ -2008,7 +2003,7 @@ class Dataset(HDXObject):
     def add_showcases(
         self,
         showcases: Sequence[Union["Showcase", dict, str]],
-        showcases_to_check: Sequence["Showcase"] = None,
+        showcases_to_check: Sequence["Showcase"] | None = None,
     ) -> bool:
         """Add dataset to multiple showcases
 
@@ -2229,7 +2224,7 @@ class Dataset(HDXObject):
         """
         if isinstance(resource, int) and not isinstance(resource, bool):
             resource = self._resources[resource]
-        if isinstance(resource, res_module.Resource) or isinstance(resource, dict):
+        if isinstance(resource, (res_module.Resource, dict)):
             res = resource.get("id")
             if res is None:
                 resource = resource["name"]
@@ -2576,12 +2571,10 @@ class Dataset(HDXObject):
                 return None
             startdate = result.get("startdate")
             if startdate is not None:
-                if startdate < dates[0]:
-                    dates[0] = startdate
+                dates[0] = min(dates[0], startdate)
             enddate = result.get("enddate")
             if enddate is not None:
-                if enddate > dates[1]:
-                    dates[1] = enddate
+                dates[1] = max(dates[1], enddate)
             return row
 
         filepath = Path(folder) / filename

{hdx_python_api-6.7.7 → hdx_python_api-6.7.8}/src/hdx/data/hdxobject.py

@@ -425,7 +425,7 @@ class HDXObject(UserDict, ABC):
         try:
             if files_to_upload:
                 for key, value in files_to_upload.items():
-                    open_files_to_upload[key] = open(value, "rb")
+                    open_files_to_upload[key] = open(value, "rb")  # noqa: SIM115
             return self.configuration.call_remoteckan(
                 self.actions()[action], data, files=open_files_to_upload
             )
@@ -603,7 +603,7 @@ class HDXObject(UserDict, ABC):
             return False
         if isinstance(obj, str):
             obj_id = obj
-        elif isinstance(obj, dict) or isinstance(obj, HDXObject):
+        elif isinstance(obj, (dict, HDXObject)):
             obj_id = obj.get(matchon)
         else:
             raise HDXError("Type of object not a string, dict or T<=HDXObject")
@@ -613,7 +613,7 @@ class HDXObject(UserDict, ABC):
             objid = objdata.get(matchon)
             if objid and objid == obj_id:
                 if delete:
-                    objlist[i].delete_from_hdx()
+                    objdata.delete_from_hdx()
                 del objlist[i]
                 return True
         return False

{hdx_python_api-6.7.7 → hdx_python_api-6.7.8}/src/hdx/data/location.py

@@ -2,11 +2,12 @@
 
 import logging
 from collections.abc import Sequence
+from contextlib import suppress
 from typing import Any, Optional
 
 from hdx.api.configuration import Configuration
 from hdx.data.activity import Activity
-from hdx.data.hdxobject import HDXObject
+from hdx.data.hdxobject import HDXError, HDXObject
 
 logger = logging.getLogger(__name__)
 
@@ -187,12 +188,10 @@ class Location(HDXObject):
             if name in compiled_locations:
                 final_locations.append(compiled_locations[name])
             else:
-                try:
+                with suppress(HDXError):
                     missing_location = location._write_to_hdx("show", {"id": name})
                     if missing_location:
                         final_locations.append(missing_location)
-                except Exception:
-                    pass
 
         return final_locations
 

{hdx_python_api-6.7.7 → hdx_python_api-6.7.8}/src/hdx/data/organization.py

@@ -2,6 +2,7 @@
 
 import logging
 from collections.abc import Sequence
+from contextlib import suppress
 from pathlib import Path
 from typing import TYPE_CHECKING, Any, Optional, Union
 
@@ -303,12 +304,10 @@ class Organization(HDXObject):
             if name in compiled_orgs:
                 final_orgs.append(compiled_orgs[name])
             else:
-                try:
+                with suppress(HDXError):
                     missing_org = organization._write_to_hdx("show", {"id": name})
                     if missing_org:
                         final_orgs.append(missing_org)
-                except Exception:
-                    pass
 
         return final_orgs