hdx-python-utilities 3.6.0__tar.gz → 3.6.2__tar.gz

{hdx_python_utilities-3.6.0 → hdx_python_utilities-3.6.2}/.github/workflows/run-python-tests.yaml

@@ -4,6 +4,7 @@
 name: Run tests
 
 on:
+  workflow_dispatch: # add run button in github
   push:
     branches-ignore:
       - gh-pages

{hdx_python_utilities-3.6.0 → hdx_python_utilities-3.6.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: hdx-python-utilities
-Version: 3.6.0
+Version: 3.6.2
 Summary: HDX Python Utilities for streaming tabular data, date and time handling and other helpful functions
 Project-URL: Homepage, https://github.com/OCHA-DAP/hdx-python-utilities
 Author-email: Michael Rans <rans@email.com>

{hdx_python_utilities-3.6.0 → hdx_python_utilities-3.6.2}/documentation/.readthedocs.yaml

@@ -1,7 +1,7 @@
 version: 2
 
 mkdocs:
-  configuration: mkdocs.yml
+  configuration: docs/mkdocs.yml
   fail_on_warning: false
 
 build:
@@ -13,5 +13,3 @@ build:
       - pip install --upgrade mkdocs
       - pip install pydoc-markdown
       - pydoc-markdown documentation/pydoc-markdown.yaml
-      - mv docs/content/* docs
-      - rmdir docs/content

{hdx_python_utilities-3.6.0 → hdx_python_utilities-3.6.2}/documentation/main.md

@@ -82,7 +82,7 @@ methods that all downloaders should have: `download_file`, `download_text`,
 Note that a single `Download` object cannot be used in parallel: each download operation 
 must be completed before starting the next. 
 
-For example, given YAML file extraparams.yml:
+For example, given YAML file extraparams.yaml:
 
     mykey:
         basic_auth: "XXXXXXXX"
@@ -92,7 +92,7 @@ We can create a downloader as shown below that will use the authentication defin
 `basic\_auth` and add the parameter `locale=en` to each request (eg. for get request 
 <http://myurl/lala?param1=p1&locale=en>):
 
-    with Download(user_agent="test", extra_params_yaml="extraparams.yml", extra_params_lookup="mykey") as downloader:
+    with Download(user_agent="test", extra_params_yaml="extraparams.yaml", extra_params_lookup="mykey") as downloader:
         response = downloader.download(url)  # get requests library response
         json = response.json()
 
@@ -340,16 +340,16 @@ Examples:
 Examples:
 
     # Load YAML
-    mydict = load_yaml("my_yaml.yml")
+    mydict = load_yaml("my_yaml.yaml")
 
     # Load 2 YAMLs and merge into dictionary
-    mydict = load_and_merge_yaml("my_yaml1.yml", "my_yaml2.yml")
+    mydict = load_and_merge_yaml("my_yaml1.yaml", "my_yaml2.yaml")
 
     # Load YAML into existing dictionary
-    mydict = load_yaml_into_existing_dict(existing_dict, "my_yaml.yml")
+    mydict = load_yaml_into_existing_dict(existing_dict, "my_yaml.yaml")
 
     # Load JSON
-    mydict = load_json("my_json.yml")
+    mydict = load_json("my_json.yaml")
 
     # Load 2 JSONs and merge into dictionary
     mydict = load_and_merge_json("my_json1.json", "my_json2.json")
@@ -359,7 +359,7 @@ Examples:
 
     # Save dictionary to YAML file in pretty format
     # preserving order if it is an OrderedDict
-    save_yaml(mydict, "mypath.yml", pretty=True, sortkeys=False)
+    save_yaml(mydict, "mypath.yaml", pretty=True, sortkeys=False)
 
     # Save dictionary to JSON file in compact form
     # sorting the keys
@@ -679,6 +679,27 @@ transformation outputs a string. It is used as follows:
             ) as state:
                 assert state.get() == date2.replace(hour=0, minute=0)
 
+            with State(
+                statepath,
+                State.dates_str_to_country_date_dict,
+                State.country_date_dict_to_dates_str,
+            ) as state:
+                state_dict = state.get()
+                assert state_dict == {"DEFAULT": date1}
+                state_dict["AFG"] = date2
+                state.set(state_dict)
+            with State(
+                statepath,
+                State.dates_str_to_country_date_dict,
+                State.country_date_dict_to_dates_str,
+            ) as state:
+                state_dict = state.get()
+                assert state_dict == {
+                    "DEFAULT": date1,
+                    "AFG": date2.replace(hour=0, minute=0),
+                }
+
+
 If run inside a GitHub Action, the saved state file could be committed to 
 GitHub so that on the next run the state is available in the repository.
 
@@ -819,5 +840,5 @@ Examples:
 
 ## Easy building and packaging
 
-The pyproject.toml, setup.cfg, .readthedocs.yml and GitHub Actions workflows 
+The pyproject.toml, setup.cfg, .readthedocs.yaml and GitHub Actions workflows 
 provide a template that can be used by other projects or libraries.

{hdx_python_utilities-3.6.0 → hdx_python_utilities-3.6.2}/documentation/pydoc-markdown.yaml

@@ -9,7 +9,7 @@ renderer:
   output_directory: docs
   mkdocs_config:
     site_name: HDX Python Utilities
-    theme: readthedocs
+    theme: mkdocs
     repo_url: "https://github.com/OCHA-DAP/hdx-python-utilities"
   markdown:
     source_linker:

{hdx_python_utilities-3.6.0 → hdx_python_utilities-3.6.2}/requirements.txt

@@ -4,6 +4,8 @@
 #
 #    pip-compile --all-extras --output-file=requirements.txt --resolver=backtracking pyproject.toml
 #
+annotated-types==0.5.0
+    # via pydantic
 attrs==23.1.0
     # via
     #   frictionless
@@ -11,15 +13,15 @@ attrs==23.1.0
     #   jsonschema
 beautifulsoup4==4.12.2
     # via hdx-python-utilities (pyproject.toml)
-certifi==2023.5.7
+certifi==2023.7.22
     # via requests
 cfgv==3.3.1
     # via pre-commit
-chardet==5.1.0
+chardet==5.2.0
     # via frictionless
-charset-normalizer==3.1.0
+charset-normalizer==3.2.0
     # via requests
-click==8.1.3
+click==8.1.6
     # via typer
 colorama==0.4.6
     # via typer
@@ -27,9 +29,9 @@ coverage[toml]==7.2.7
     # via pytest-cov
 decorator==5.1.1
     # via validators
-distlib==0.3.6
+distlib==0.3.7
     # via virtualenv
-dnspython==2.3.0
+dnspython==2.4.1
     # via email-validator
 email-validator==2.0.0.post2
     # via hdx-python-utilities (pyproject.toml)
@@ -37,19 +39,19 @@ et-xmlfile==1.1.0
     # via openpyxl
 filelock==3.12.2
     # via virtualenv
-frictionless==5.13.1
+frictionless==5.15.10
     # via hdx-python-utilities (pyproject.toml)
 html5lib==1.1
     # via hdx-python-utilities (pyproject.toml)
-humanize==4.6.0
+humanize==4.7.0
     # via frictionless
-identify==2.5.24
+identify==2.5.26
     # via pre-commit
 idna==3.4
     # via
     #   email-validator
     #   requests
-ijson==3.2.2
+ijson==3.2.3
     # via hdx-python-utilities (pyproject.toml)
 iniconfig==2.0.0
     # via pytest
@@ -83,19 +85,21 @@ packaging==23.1
     # via pytest
 petl==1.7.12
     # via frictionless
-platformdirs==3.7.0
+platformdirs==3.10.0
     # via virtualenv
 pluggy==1.2.0
     # via pytest
 pre-commit==3.3.3
     # via hdx-python-utilities (pyproject.toml)
-pydantic==1.10.9
+pydantic==2.1.1
     # via frictionless
-pygments==2.15.1
+pydantic-core==2.4.0
+    # via pydantic
+pygments==2.16.1
     # via rich
 pyrsistent==0.19.3
     # via jsonschema
-pytest==7.3.2
+pytest==7.4.0
     # via
     #   hdx-python-utilities (pyproject.toml)
     #   pytest-cov
@@ -110,7 +114,7 @@ python-dateutil==2.8.2
     #   hdx-python-utilities (pyproject.toml)
 python-slugify==8.0.1
     # via frictionless
-pyyaml==6.0
+pyyaml==6.0.1
     # via
     #   frictionless
     #   pre-commit
@@ -125,7 +129,7 @@ requests-file==1.5.1
     # via hdx-python-utilities (pyproject.toml)
 rfc3986==2.0.0
     # via frictionless
-rich==13.4.2
+rich==13.5.2
     # via typer
 ruamel-yaml==0.17.32
     # via hdx-python-utilities (pyproject.toml)
@@ -153,16 +157,17 @@ text-unidecode==1.3
     # via python-slugify
 typer[all]==0.9.0
     # via frictionless
-typing-extensions==4.6.3
+typing-extensions==4.7.1
     # via
     #   frictionless
     #   pydantic
+    #   pydantic-core
     #   typer
-urllib3==2.0.3
+urllib3==2.0.4
     # via requests
 validators==0.20.0
     # via frictionless
-virtualenv==20.23.1
+virtualenv==20.24.2
     # via pre-commit
 webencodings==0.5.1
     # via html5lib

{hdx_python_utilities-3.6.0 → hdx_python_utilities-3.6.2}/src/hdx/utilities/_version.py

@@ -1,4 +1,4 @@
 # file generated by setuptools_scm
 # don't change, don't track in version control
-__version__ = version = '3.6.0'
-__version_tuple__ = version_tuple = (3, 6, 0)
+__version__ = version = '3.6.2'
+__version_tuple__ = version_tuple = (3, 6, 2)

{hdx_python_utilities-3.6.0 → hdx_python_utilities-3.6.2}/src/hdx/utilities/downloader.py

@@ -31,7 +31,7 @@ class Download(BaseDownload):
 
     Args:
         user_agent (Optional[str]): User agent string. HDXPythonUtilities/X.X.X- is prefixed.
-        user_agent_config_yaml (Optional[str]): Path to YAML user agent configuration. Ignored if user_agent supplied. Defaults to ~/.useragent.yml.
+        user_agent_config_yaml (Optional[str]): Path to YAML user agent configuration. Ignored if user_agent supplied. Defaults to ~/.useragent.yaml.
         user_agent_lookup (Optional[str]): Lookup key for YAML. Ignored if user_agent supplied.
         use_env (bool): Whether to read environment variables. Defaults to True.
         fail_on_missing_file (bool): Raise an exception if any specified configuration files are missing. Defaults to True.
@@ -1255,7 +1255,7 @@ class Download(BaseDownload):
         Args:
             custom_configs (Dict[str, Dict]): Optional dictionary of custom configurations.
             user_agent (Optional[str]): User agent string. HDXPythonUtilities/X.X.X- is prefixed.
-            user_agent_config_yaml (Optional[str]): Path to YAML user agent configuration. Ignored if user_agent supplied. Defaults to ~/.useragent.yml.
+            user_agent_config_yaml (Optional[str]): Path to YAML user agent configuration. Ignored if user_agent supplied. Defaults to ~/.useragent.yaml.
             user_agent_lookup (Optional[str]): Lookup key for YAML. Ignored if user_agent supplied.
             use_env (bool): Whether to read environment variables. Defaults to True.
             fail_on_missing_file (bool): Raise an exception if any specified configuration files are missing. Defaults to True.

{hdx_python_utilities-3.6.0 → hdx_python_utilities-3.6.2}/src/hdx/utilities/email.py

@@ -38,11 +38,11 @@ class Email:
         **kwargs: See below
         email_config_dict (dict): HDX configuration dictionary OR
         email_config_json (str): Path to JSON HDX configuration OR
-        email_config_yaml (str): Path to YAML HDX configuration. Defaults to ~/hdx_email_configuration.yml.
+        email_config_yaml (str): Path to YAML HDX configuration. Defaults to ~/hdx_email_configuration.yaml.
     """
 
     default_email_config_yaml = join(
-        expanduser("~"), "hdx_email_configuration.yml"
+        expanduser("~"), "hdx_email_configuration.yaml"
     )
 
     def __init__(self, **kwargs: Any) -> None:
@@ -171,7 +171,7 @@ class Email:
                 recipient, check_deliverability=True
             )  # validate and get info
             normalised_recipients.append(
-                v["email"]
+                v.normalized
             )  # replace with normalized form
         return normalised_recipients
 
@@ -209,7 +209,7 @@ class Email:
         v = validate_email(
             sender, check_deliverability=False
         )  # validate and get info
-        sender = v["email"]  # replace with normalized form
+        sender = v.normalized
 
         if html_body is not None:
             msg = MIMEMultipart("alternative")

{hdx_python_utilities-3.6.0 → hdx_python_utilities-3.6.2}/src/hdx/utilities/html.py

@@ -31,7 +31,7 @@ if BeautifulSoup is not None:
             url (str): url to read
             downloader (Download): Download object. Defaults to creating a Download object with given user agent values.
             user_agent (Optional[str]): User agent string. HDXPythonUtilities/X.X.X- is prefixed.
-            user_agent_config_yaml (Optional[str]): Path to YAML user agent configuration. Ignored if user_agent supplied. Defaults to ~/.useragent.yml.
+            user_agent_config_yaml (Optional[str]): Path to YAML user agent configuration. Ignored if user_agent supplied. Defaults to ~/.useragent.yaml.
             user_agent_lookup (Optional[str]): Lookup key for YAML. Ignored if user_agent supplied.
 
         Returns:

{hdx_python_utilities-3.6.0 → hdx_python_utilities-3.6.2}/src/hdx/utilities/session.py

@@ -35,7 +35,7 @@ def get_session(
 
     Args:
         user_agent (Optional[str]): User agent string. HDXPythonUtilities/X.X.X- is prefixed.
-        user_agent_config_yaml (Optional[str]): Path to YAML user agent configuration. Ignored if user_agent supplied. Defaults to ~/.useragent.yml.
+        user_agent_config_yaml (Optional[str]): Path to YAML user agent configuration. Ignored if user_agent supplied. Defaults to ~/.useragent.yaml.
         user_agent_lookup (Optional[str]): Lookup key for YAML. Ignored if user_agent supplied.
         use_env (bool): Whether to read environment variables. Defaults to True.
         fail_on_missing_file (bool): Raise an exception if any specified configuration files are missing. Defaults to True.

{hdx_python_utilities-3.6.0 → hdx_python_utilities-3.6.2}/src/hdx/utilities/state.py

@@ -1,7 +1,8 @@
 """Utility to save state to a file and read it back."""
 import logging
-from typing import Any, Callable
+from typing import Any, Callable, Dict
 
+from hdx.utilities.dateparse import iso_string_from_datetime, parse_date
 from hdx.utilities.loader import load_text
 from hdx.utilities.saver import save_text
 
@@ -91,3 +92,41 @@ class State:
             None
         """
         self.state = state
+
+    @staticmethod
+    def dates_str_to_country_date_dict(dates_str: str) -> Dict:
+        """Convert a comma separated string of key=date string pairs eg.
+        "default=2017-01-01,afg=2019-01-01" to a dictionary of key date
+        mappings eg.
+        {"default": 2017-01-01 as datetime, "afg": 2019-01-01 as datetime}
+
+        Args:
+            dates_str (str): Comma separated string of key=date string pairs
+
+        Returns:
+            Dict: Dictionary of key date mappings
+        """
+        result = {}
+        for keyvalue in dates_str.split(","):
+            key, value = keyvalue.split("=")
+            result[key] = parse_date(value)
+        return result
+
+    @staticmethod
+    def country_date_dict_to_dates_str(country_date_dict: Dict) -> str:
+        """Convert a dictionary of key date mappings eg.
+        {"default": 2017-01-01 as datetime, "afg": 2019-01-01 as datetime}
+        to a comma separated string of key=date string pairs eg.
+        "default=2017-01-01,afg=2019-01-01"
+
+        Args:
+            country_date_dict (Dict): Dictionary of key date mappings
+
+        Returns:
+            str: Comma separated string of key=date string pairs
+        """
+        strlist = []
+        for key, value in country_date_dict.items():
+            valstr = iso_string_from_datetime(value)
+            strlist.append(f"{key}={valstr}")
+        return ",".join(strlist)

{hdx_python_utilities-3.6.0 → hdx_python_utilities-3.6.2}/src/hdx/utilities/useragent.py

@@ -15,7 +15,7 @@ class UserAgentError(Exception):
 
 
 class UserAgent:
-    default_user_agent_config_yaml = join(expanduser("~"), ".useragent.yml")
+    default_user_agent_config_yaml = join(expanduser("~"), ".useragent.yaml")
     user_agent = None
 
     @staticmethod
@@ -82,13 +82,18 @@ class UserAgent:
         """
         if not user_agent_config_yaml:
             user_agent_config_yaml = cls.default_user_agent_config_yaml
-            logger.info(
-                f"No user agent or user agent config file given. Using default user agent config file: {user_agent_config_yaml}."
-            )
-        if not isfile(user_agent_config_yaml):
-            raise UserAgentError(
-                "User_agent should be supplied in a YAML config file. It can be your project's name for example."
-            )
+            if not isfile(user_agent_config_yaml):
+                user_agent_config_yaml = user_agent_config_yaml.replace(
+                    ".yaml", ".yml"
+                )
+            if isfile(user_agent_config_yaml):
+                logger.info(
+                    f"No user agent or user agent config file given. Using default user agent config file: {user_agent_config_yaml}."
+                )
+            else:
+                raise UserAgentError(
+                    f"User_agent should be supplied in a YAML config file and no configuration file at default path: {cls.default_user_agent_config_yaml}. User agent can be your project's name for example."
+                )
         logger.info(
             f"Loading user agent config from: {user_agent_config_yaml}"
         )
@@ -116,7 +121,7 @@ class UserAgent:
 
         Args:
             user_agent (Optional[str]): User agent string. HDXPythonLibrary/X.X.X- is prefixed.
-            user_agent_config_yaml (Optional[str]): Path to YAML user agent configuration. Ignored if user_agent supplied. Defaults to ~/.useragent.yml.
+            user_agent_config_yaml (Optional[str]): Path to YAML user agent configuration. Ignored if user_agent supplied. Defaults to ~/.useragent.yaml.
             user_agent_lookup (Optional[str]): Lookup key for YAML. Ignored if user_agent supplied.
 
         Returns:
@@ -154,7 +159,7 @@ class UserAgent:
 
         Args:
             user_agent (Optional[str]): User agent string. HDXPythonLibrary/X.X.X- is prefixed.
-            user_agent_config_yaml (Optional[str]): Path to YAML user agent configuration. Ignored if user_agent supplied. Defaults to ~/.useragent.yml.
+            user_agent_config_yaml (Optional[str]): Path to YAML user agent configuration. Ignored if user_agent supplied. Defaults to ~/.useragent.yaml.
             user_agent_lookup (Optional[str]): Lookup key for YAML. Ignored if user_agent supplied.
 
         Returns:
@@ -177,7 +182,7 @@ class UserAgent:
 
         Args:
             user_agent (Optional[str]): User agent string. HDXPythonLibrary/X.X.X- is prefixed.
-            user_agent_config_yaml (Optional[str]): Path to YAML user agent configuration. Ignored if user_agent supplied. Defaults to ~/.useragent.yml.
+            user_agent_config_yaml (Optional[str]): Path to YAML user agent configuration. Ignored if user_agent supplied. Defaults to ~/.useragent.yaml.
             user_agent_lookup (Optional[str]): Lookup key for YAML. Ignored if user_agent supplied.
 
         Returns:

hdx_python_utilities-3.6.2/tests/fixtures/state/analysis_dates.txt

@@ -0,0 +1 @@
+DEFAULT=2020-09-23

{hdx_python_utilities-3.6.0 → hdx_python_utilities-3.6.2}/tests/hdx/utilities/test_downloader.py

@@ -43,7 +43,7 @@ class TestDownloader:
 
     @pytest.fixture(scope="class")
     def fixturefile(self, downloaderfolder):
-        return join(downloaderfolder, "extra_params_tree.yml")
+        return join(downloaderfolder, "extra_params_tree.yaml")
 
     @pytest.fixture(scope="class")
     def fixtureurl(self):
@@ -55,11 +55,11 @@ class TestDownloader:
 
     @pytest.fixture(scope="class")
     def getfixtureurl(self):
-        return "http://httpbin.org/get"
+        return "https://httpbin.org/get"
 
     @pytest.fixture(scope="class")
     def postfixtureurl(self):
-        return "http://httpbin.org/post"
+        return "https://httpbin.org/post"
 
     @pytest.fixture(scope="class")
     def fixturenotexistsurl(self):
@@ -121,7 +121,7 @@ class TestDownloader:
             assert downloader.session.auth == ("user", "pass")
         with Download(basic_auth_file=basicauthfile) as downloader:
             assert downloader.session.auth == ("testuser", "testpass")
-        extraparamsyamltree = join(downloaderfolder, "extra_params_tree.yml")
+        extraparamsyamltree = join(downloaderfolder, "extra_params_tree.yaml")
         with Download(
             extra_params_yaml=extraparamsyamltree, extra_params_lookup="mykey"
         ) as downloader:
@@ -172,7 +172,7 @@ class TestDownloader:
             )
         with pytest.raises(IOError):
             Download(basic_auth_file="NOTEXIST")
-        extraparamsyaml = join(downloaderfolder, "extra_params.yml")
+        extraparamsyaml = join(downloaderfolder, "extra_params.yaml")
         test_url = "http://www.lalala.com/lala"
         with Download(
             basic_auth_file=basicauthfile, extra_params_dict={"key1": "val1"}
@@ -367,7 +367,7 @@ class TestDownloader:
             f = downloader.download_file(fixturefile, folder=tmpdir)
             fpath = abspath(f)
             remove(f)
-            assert fpath == abspath(join(tmpdir, "extra_params_tree.yml"))
+            assert fpath == abspath(join(tmpdir, "extra_params_tree.yaml"))
             f = downloader.download_file(fixtureurl, folder=tmpdir)
             fpath = abspath(f)
             remove(f)

{hdx_python_utilities-3.6.0 → hdx_python_utilities-3.6.2}/tests/hdx/utilities/test_email.py

@@ -13,7 +13,7 @@ class TestEmail:
 
     @pytest.fixture(scope="class")
     def email_yaml(self, configfolder):
-        return join(configfolder, "hdx_email_configuration.yml")
+        return join(configfolder, "hdx_email_configuration.yaml")
 
     def test_mail(self, mocksmtp):
         smtp_initargs = {

{hdx_python_utilities-3.6.0 → hdx_python_utilities-3.6.2}/tests/hdx/utilities/test_loader.py

@@ -117,17 +117,17 @@ test"""
     def test_load_empty(self, fixturesfolder):
         loaderfolder = join(fixturesfolder, "loader")
         with pytest.raises(LoadError):
-            load_text(join(loaderfolder, "empty.yml"))
+            load_text(join(loaderfolder, "empty.yaml"))
         with pytest.raises(LoadError):
-            load_yaml(join(loaderfolder, "empty.yml"))
+            load_yaml(join(loaderfolder, "empty.yaml"))
         with pytest.raises(LoadError):
             load_json(join(loaderfolder, "empty.json"))
 
     def test_load_and_merge_yaml(self, configfolder):
         result = load_and_merge_yaml(
             [
-                join(configfolder, "hdx_config.yml"),
-                join(configfolder, "project_configuration.yml"),
+                join(configfolder, "hdx_config.yaml"),
+                join(configfolder, "project_configuration.yaml"),
             ]
         )
         assert list(result.items()) == list(TestLoader.expected_yaml.items())
@@ -142,9 +142,9 @@ test"""
         assert list(result.items()) == list(TestLoader.expected_json.items())
 
     def test_load_yaml_into_existing_dict(self, configfolder):
-        existing_dict = load_yaml(join(configfolder, "hdx_config.yml"))
+        existing_dict = load_yaml(join(configfolder, "hdx_config.yaml"))
         result = load_yaml_into_existing_dict(
-            existing_dict, join(configfolder, "project_configuration.yml")
+            existing_dict, join(configfolder, "project_configuration.yaml")
         )
         assert list(result.items()) == list(TestLoader.expected_yaml.items())
 

{hdx_python_utilities-3.6.0 → hdx_python_utilities-3.6.2}/tests/hdx/utilities/test_saver.py

@@ -99,7 +99,7 @@ class TestLoader:
 
     @pytest.fixture(scope="class")
     def json_csv_configuration(self, fixturesfolder):
-        return load_yaml(join(fixturesfolder, "config", "json_csv.yml"))
+        return load_yaml(join(fixturesfolder, "config", "json_csv.yaml"))
 
     @pytest.mark.parametrize(
         "filename,pretty,sortkeys",

hdx_python_utilities-3.6.2/tests/hdx/utilities/test_state.py

@@ -0,0 +1,83 @@
+"""State Utility Tests"""
+from datetime import datetime, timezone
+from os.path import join
+from shutil import copyfile
+
+import pytest
+
+from hdx.utilities.dateparse import iso_string_from_datetime, parse_date
+from hdx.utilities.path import temp_dir
+from hdx.utilities.state import State
+
+
+class TestState:
+    @pytest.fixture(scope="class")
+    def statefolder(self, fixturesfolder):
+        return join(fixturesfolder, "state")
+
+    @pytest.fixture(scope="class")
+    def statefile(self):
+        return "last_build_date.txt"
+
+    @pytest.fixture(scope="class")
+    def multidatestatefile(self):
+        return "analysis_dates.txt"
+
+    @pytest.fixture(scope="class")
+    def date1(self):
+        return datetime(2020, 9, 23, 0, 0, tzinfo=timezone.utc)
+
+    @pytest.fixture(scope="class")
+    def date2(self):
+        return datetime(2022, 5, 12, 10, 15, tzinfo=timezone.utc)
+
+    def test_state(self, statefolder, statefile, date1, date2):
+        with temp_dir(folder="test_state") as tmpdir:
+            statepath = join(tmpdir, statefile)
+            copyfile(join(statefolder, statefile), statepath)
+            with State(
+                statepath, parse_date, iso_string_from_datetime
+            ) as state:
+                assert state.get() == date1
+            with State(
+                statepath, parse_date, iso_string_from_datetime
+            ) as state:
+                assert state.get() == date1
+                state.set(date2)
+            with State(
+                statepath, parse_date, iso_string_from_datetime
+            ) as state:
+                assert state.get() == date2.replace(hour=0, minute=0)
+
+    def test_multi_date_state(
+        self, statefolder, multidatestatefile, date1, date2
+    ):
+        with temp_dir(folder="test_multidatestate") as tmpdir:
+            statepath = join(tmpdir, multidatestatefile)
+            copyfile(join(statefolder, multidatestatefile), statepath)
+            with State(
+                statepath,
+                State.dates_str_to_country_date_dict,
+                State.country_date_dict_to_dates_str,
+            ) as state:
+                state_dict = state.get()
+                assert state_dict == {"DEFAULT": date1}
+            with State(
+                statepath,
+                State.dates_str_to_country_date_dict,
+                State.country_date_dict_to_dates_str,
+            ) as state:
+                state_dict = state.get()
+                assert state_dict == {"DEFAULT": date1}
+                state_dict["AFG"] = date2
+                state.set(state_dict)
+            with State(
+                statepath,
+                State.dates_str_to_country_date_dict,
+                State.country_date_dict_to_dates_str,
+            ) as state:
+                state_dict = state.get()
+                assert state_dict == {
+                    "DEFAULT": date1,
+                    "AFG": date2.replace(hour=0, minute=0),
+                }

{hdx_python_utilities-3.6.0 → hdx_python_utilities-3.6.2}/tests/hdx/utilities/test_useragent.py

@@ -11,23 +11,23 @@ from hdx.utilities.useragent import UserAgent, UserAgentError
 class TestUserAgent:
     @pytest.fixture(scope="class")
     def user_agent_config_yaml(self, configfolder):
-        return join(configfolder, "user_agent_config.yml")
+        return join(configfolder, "user_agent_config.yaml")
 
     @pytest.fixture(scope="class")
     def user_agent_config2_yaml(self, configfolder):
-        return join(configfolder, "user_agent_config2.yml")
+        return join(configfolder, "user_agent_config2.yaml")
 
     @pytest.fixture(scope="class")
     def user_agent_config3_yaml(self, configfolder):
-        return join(configfolder, "user_agent_config3.yml")
+        return join(configfolder, "user_agent_config3.yaml")
 
     @pytest.fixture(scope="class")
     def empty_yaml(self, configfolder):
-        return join(configfolder, "empty.yml")
+        return join(configfolder, "empty.yaml")
 
     @pytest.fixture(scope="class")
     def user_agent_config_wrong_yaml(self, configfolder):
-        return join(configfolder, "user_agent_config_wrong.yml")
+        return join(configfolder, "user_agent_config_wrong.yaml")
 
     def test_user_agent(
         self,

hdx_python_utilities-3.6.0/tests/hdx/utilities/test_state.py

@@ -1,40 +0,0 @@
-"""State Utility Tests"""
-from datetime import datetime, timezone
-from os.path import join
-from shutil import copyfile
-
-import pytest
-
-from hdx.utilities.dateparse import iso_string_from_datetime, parse_date
-from hdx.utilities.path import temp_dir
-from hdx.utilities.state import State
-
-
-class TestState:
-    @pytest.fixture(scope="class")
-    def statefolder(self, fixturesfolder):
-        return join(fixturesfolder, "state")
-
-    @pytest.fixture(scope="class")
-    def statefile(self):
-        return "last_build_date.txt"
-
-    def test_state(self, statefolder, statefile):
-        with temp_dir(folder="test_state") as tmpdir:
-            statepath = join(tmpdir, statefile)
-            copyfile(join(statefolder, statefile), statepath)
-            date1 = datetime(2020, 9, 23, 0, 0, tzinfo=timezone.utc)
-            date2 = datetime(2022, 5, 12, 10, 15, tzinfo=timezone.utc)
-            with State(
-                statepath, parse_date, iso_string_from_datetime
-            ) as state:
-                assert state.get() == date1
-            with State(
-                statepath, parse_date, iso_string_from_datetime
-            ) as state:
-                assert state.get() == date1
-                state.set(date2)
-            with State(
-                statepath, parse_date, iso_string_from_datetime
-            ) as state:
-                assert state.get() == date2.replace(hour=0, minute=0)