hdx-python-scraper 2.4.1__tar.gz → 2.5.0__tar.gz

{hdx_python_scraper-2.4.1 → hdx_python_scraper-2.5.0}/.config/pre-commit-config.yaml

@@ -9,7 +9,7 @@ repos:
         exclude: test_scraper_.*\.json
       - id: check-ast
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.5.1
+    rev: v0.6.4
     hooks:
       # Run the linter.
       - id: ruff
@@ -18,7 +18,7 @@ repos:
       - id: ruff-format
         args: [--config, .config/ruff.toml]
   - repo: https://github.com/astral-sh/uv-pre-commit
-    rev: 0.2.13
+    rev: 0.4.7
     hooks:
       # Run the pip compile
       - id: pip-compile

{hdx_python_scraper-2.4.1 → hdx_python_scraper-2.5.0}/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

{hdx_python_scraper-2.4.1 → hdx_python_scraper-2.5.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: hdx-python-scraper
-Version: 2.4.1
+Version: 2.5.0
 Summary: HDX Python scraper utilities to assemble data from multiple sources
 Project-URL: Homepage, https://github.com/OCHA-DAP/hdx-python-scraper
 Author-email: Michael Rans <rans@email.com>
@@ -26,8 +26,8 @@ Classifier: Programming Language :: Python :: 3.12
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Requires-Python: >=3.8
 Requires-Dist: gspread
-Requires-Dist: hdx-python-api>=6.3.2
-Requires-Dist: hdx-python-country>=3.7.6
+Requires-Dist: hdx-python-api>=6.3.4
+Requires-Dist: hdx-python-country>=3.7.8
 Requires-Dist: hdx-python-utilities>=3.7.3
 Requires-Dist: regex
 Provides-Extra: dev

{hdx_python_scraper-2.4.1 → hdx_python_scraper-2.5.0}/documentation/main.md

@@ -26,6 +26,8 @@ install with:
     pip install hdx-python-scraper[pandas]
 
 ## Breaking Changes
+From 2.5.0, package names have changed to avoid name space clashes
+
 From 2.3.0, resource name is used when available instead of creating name from
 url so tests that use saved data from the Read class may break. file_type
 parameters in various Read methods renamed to format.
@@ -335,7 +337,7 @@ default is:
 ### Custom Scrapers
 
 It is possible to define custom scrapers written in Python which must inherit
-[BaseScraper](https://github.com/OCHA-DAP/hdx-python-scraper/blob/main/src/hdx/scraper/base_scraper.py),
+[BaseScraper](https://github.com/OCHA-DAP/hdx-python-scraper/blob/main/src/hdx/scraper/framework/base_scraper.py),
 calling its constructor and providing a `run` method. Other methods where a default
 implementation has been provided can be overridden such as `add_sources` and
 `add_population`. There are also two hooks for running steps at particular points.
@@ -392,7 +394,7 @@ from regions to values. In this case, since national and regional each have only
 header and HXL hashtag, there is only one dictionary to populate for each.
 
 An example of a custom scraper can be seen
-[here](https://github.com/OCHA-DAP/hdx-python-scraper/blob/main/tests/hdx/scraper/education_closures.py).
+[here](https://github.com/OCHA-DAP/hdx-python-scraper/blob/main/tests/hdx/scraper/framework/scrapers/education_closures.py).
 
 An example of overriding `add_sources` to customise the source information that is
 output is as follows:

{hdx_python_scraper-2.4.1 → hdx_python_scraper-2.5.0}/documentation/pydoc-markdown.yaml

@@ -3,7 +3,7 @@ loaders:
     search_path:
       - ../src
     packages:
-      - hdx.scraper
+      - hdx.scraper.framework
 renderer:
   type: mkdocs
   output_directory: docs
@@ -21,21 +21,18 @@ renderer:
       source: main.md
     - title: API Documentation
       children:
-        - title: Source Readers
+        - title: Runner
           contents:
-            - hdx.scraper.utilities.readers.*
-        - title: Configurable Scrapers
+            - hdx.scraper.framework.runner.Runner.*
+        - title: Scraper Base Class
           contents:
-            - hdx.scraper.configurable.*
-        - title: Base Class for Scrapers
+            - hdx.scraper.framework.base_scraper.BaseScraper.*
+        - title: Scrapers
           contents:
-            - hdx.scraper.base_scraper.BaseScraper.*
-        - title: Fallbacks
-          contents:
-            - hdx.scraper.utilities.fallbacks.Fallbacks
-        - title: Run Scrapers
-          contents:
-            - hdx.scraper.runner.Runner.*
+            - hdx.scraper.framework.scrapers.*
         - title: Outputs
           contents:
-            - hdx.scraper.outputs.*
+            - hdx.scraper.framework.outputs.*
+        - title: Utilities
+          contents:
+            - hdx.scraper.framework.utilities.*

{hdx_python_scraper-2.4.1 → hdx_python_scraper-2.5.0}/pyproject.toml

@@ -34,8 +34,8 @@ classifiers = [
 requires-python = ">=3.8"
 
 dependencies = [
-    "hdx-python-api>=6.3.2",
-    "hdx-python-country>=3.7.6",
+    "hdx-python-api>=6.3.4",
+    "hdx-python-country>=3.7.8",
     "hdx-python-utilities>=3.7.3",
     "gspread",
     "regex",
@@ -65,7 +65,7 @@ dev = ["pre-commit"]
 packages = ["src/hdx"]
 
 [tool.hatch.build.hooks.vcs]
-version-file = "src/hdx/scraper/_version.py"
+version-file = "src/hdx/scraper/framework/_version.py"
 
 # Versioning
 

{hdx_python_scraper-2.4.1 → hdx_python_scraper-2.5.0}/requirements.txt

@@ -2,18 +2,16 @@
 #    uv pip compile pyproject.toml --resolver=backtracking --all-extras -o requirements.txt
 annotated-types==0.7.0
     # via pydantic
-attrs==23.2.0
+attrs==24.2.0
     # via
     #   frictionless
     #   jsonlines
     #   jsonschema
     #   referencing
-cachetools==5.4.0
+cachetools==5.5.0
     # via google-auth
-certifi==2024.7.4
+certifi==2024.8.30
     # via requests
-cffi==1.16.0
-    # via cryptography
 cfgv==3.4.0
     # via pre-commit
 chardet==5.2.0
@@ -24,10 +22,8 @@ ckanapi==4.8
     # via hdx-python-api
 click==8.1.7
     # via typer
-coverage==7.6.0
+coverage==7.6.1
     # via pytest-cov
-cryptography==43.0.0
-    # via pyopenssl
 defopt==6.4.0
     # via hdx-python-api
 distlib==0.3.8
@@ -44,11 +40,11 @@ email-validator==2.2.0
     # via hdx-python-api
 et-xmlfile==1.1.0
     # via openpyxl
-filelock==3.15.4
+filelock==3.16.0
     # via virtualenv
-frictionless==5.17.0
+frictionless==5.17.1
     # via hdx-python-utilities
-google-auth==2.32.0
+google-auth==2.34.0
     # via
     #   google-auth-oauthlib
     #   gspread
@@ -56,9 +52,9 @@ google-auth-oauthlib==1.2.1
     # via gspread
 gspread==6.1.2
     # via hdx-python-scraper (pyproject.toml)
-hdx-python-api==6.3.2
+hdx-python-api==6.3.4
     # via hdx-python-scraper (pyproject.toml)
-hdx-python-country==3.7.7
+hdx-python-country==3.7.8
     # via
     #   hdx-python-scraper (pyproject.toml)
     #   hdx-python-api
@@ -69,15 +65,15 @@ hdx-python-utilities==3.7.3
     #   hdx-python-country
 humanize==4.10.0
     # via frictionless
-identify==2.6.0
+identify==2.6.1
     # via pre-commit
-idna==3.7
+idna==3.10
     # via
     #   email-validator
     #   requests
 ijson==3.3.0
     # via hdx-python-utilities
-inflect==7.3.1
+inflect==7.4.0
     # via quantulum3
 iniconfig==2.0.0
     # via pytest
@@ -111,15 +107,13 @@ markupsafe==2.1.5
     # via jinja2
 mdurl==0.1.2
     # via markdown-it-py
-more-itertools==10.3.0
+more-itertools==10.5.0
     # via inflect
-ndg-httpsclient==0.5.1
-    # via hdx-python-api
 nodeenv==1.9.1
     # via pre-commit
 num2words==0.5.13
     # via quantulum3
-numpy==2.0.1
+numpy==2.1.1
     # via pandas
 oauthlib==3.2.2
     # via requests-oauthlib
@@ -131,7 +125,7 @@ pandas==2.2.2
     # via hdx-python-scraper (pyproject.toml)
 petl==1.7.15
     # via frictionless
-platformdirs==4.2.2
+platformdirs==4.3.3
     # via virtualenv
 pluggy==1.5.0
     # via pytest
@@ -143,29 +137,21 @@ pockets==0.9.1
     # via sphinxcontrib-napoleon
 pre-commit==3.8.0
     # via hdx-python-scraper (pyproject.toml)
-pyasn1==0.6.0
+pyasn1==0.6.1
     # via
-    #   hdx-python-api
-    #   ndg-httpsclient
     #   pyasn1-modules
     #   rsa
-pyasn1-modules==0.4.0
+pyasn1-modules==0.4.1
     # via google-auth
-pycparser==2.22
-    # via cffi
-pydantic==2.8.2
+pydantic==2.9.1
     # via frictionless
-pydantic-core==2.20.1
+pydantic-core==2.23.3
     # via pydantic
 pygments==2.18.0
     # via rich
-pyopenssl==24.2.1
-    # via
-    #   hdx-python-api
-    #   ndg-httpsclient
 pyphonetics==0.5.3
     # via hdx-python-country
-pytest==8.3.2
+pytest==8.3.3
     # via
     #   hdx-python-scraper (pyproject.toml)
     #   pytest-cov
@@ -183,9 +169,9 @@ python-slugify==8.0.4
     # via
     #   ckanapi
     #   frictionless
-pytz==2024.1
+pytz==2024.2
     # via pandas
-pyyaml==6.0.1
+pyyaml==6.0.2
     # via
     #   frictionless
     #   pre-commit
@@ -198,7 +184,7 @@ referencing==0.35.1
     # via
     #   jsonschema
     #   jsonschema-specifications
-regex==2024.7.24
+regex==2024.9.11
     # via hdx-python-scraper (pyproject.toml)
 requests==2.32.3
     # via
@@ -214,9 +200,9 @@ requests-oauthlib==2.0.0
     # via google-auth-oauthlib
 rfc3986==2.0.0
     # via frictionless
-rich==13.7.1
+rich==13.8.1
     # via typer
-rpds-py==0.19.1
+rpds-py==0.20.0
     # via
     #   jsonschema
     #   referencing
@@ -226,13 +212,13 @@ ruamel-yaml==0.18.6
     # via hdx-python-utilities
 ruamel-yaml-clib==0.2.8
     # via ruamel-yaml
-setuptools==72.1.0
+setuptools==75.0.0
     # via ckanapi
 shellingham==1.5.4
     # via typer
 simpleeval==0.9.13
     # via frictionless
-simplejson==3.19.2
+simplejson==3.19.3
     # via ckanapi
 six==1.16.0
     # via
@@ -255,7 +241,7 @@ text-unidecode==1.3
     # via python-slugify
 typeguard==4.3.0
     # via inflect
-typer==0.12.3
+typer==0.12.5
     # via frictionless
 typing-extensions==4.12.2
     # via
@@ -270,15 +256,15 @@ unidecode==1.3.8
     # via
     #   libhxl
     #   pyphonetics
-urllib3==2.2.2
+urllib3==2.2.3
     # via
     #   libhxl
     #   requests
-validators==0.33.0
+validators==0.34.0
     # via frictionless
-virtualenv==20.26.3
+virtualenv==20.26.4
     # via pre-commit
-wheel==0.43.0
+wheel==0.44.0
     # via libhxl
 xlrd==2.0.1
     # via hdx-python-utilities

{hdx_python_scraper-2.4.1/src/hdx/scraper → hdx_python_scraper-2.5.0/src/hdx/scraper/framework}/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '2.4.1'
-__version_tuple__ = version_tuple = (2, 4, 1)
+__version__ = version = '2.5.0'
+__version_tuple__ = version_tuple = (2, 5, 0)

{hdx_python_scraper-2.4.1/src/hdx/scraper → hdx_python_scraper-2.5.0/src/hdx/scraper/framework}/runner.py

@@ -5,11 +5,11 @@ from traceback import format_exc
 from typing import Any, Callable, Dict, List, Optional, Tuple, Union
 
 from .base_scraper import BaseScraper
-from .configurable.aggregator import Aggregator
-from .configurable.resource_downloader import ResourceDownloader
-from .configurable.scraper import ConfigurableScraper
-from .configurable.timeseries import TimeSeries
 from .outputs.base import BaseOutput
+from .scrapers.aggregator import Aggregator
+from .scrapers.configurable_scraper import ConfigurableScraper
+from .scrapers.resource_downloader import ResourceDownloader
+from .scrapers.timeseries import TimeSeries
 from .utilities import get_startend_dates_from_time_period
 from .utilities.fallbacks import Fallbacks
 from .utilities.reader import Read

{hdx_python_scraper-2.4.1/tests/hdx/scraper → hdx_python_scraper-2.5.0/tests/hdx/scraper/framework}/conftest.py

@@ -8,10 +8,10 @@ from . import bool_assert
 from hdx.api.configuration import Configuration
 from hdx.api.locations import Locations
 from hdx.location.country import Country
-from hdx.scraper.base_scraper import BaseScraper
-from hdx.scraper.utilities import string_params_to_dict
-from hdx.scraper.utilities.fallbacks import Fallbacks
-from hdx.scraper.utilities.reader import Read
+from hdx.scraper.framework.base_scraper import BaseScraper
+from hdx.scraper.framework.utilities import string_params_to_dict
+from hdx.scraper.framework.utilities.fallbacks import Fallbacks
+from hdx.scraper.framework.utilities.reader import Read
 from hdx.utilities.dateparse import parse_date
 
 

{hdx_python_scraper-2.4.1/tests/hdx/scraper → hdx_python_scraper-2.5.0/tests/hdx/scraper/framework/custom}/affected_targeted_reached.py

@@ -1,7 +1,7 @@
 import logging
 
-from hdx.scraper.base_scraper import BaseScraper
-from hdx.scraper.utilities.sources import Sources
+from hdx.scraper.framework.base_scraper import BaseScraper
+from hdx.scraper.framework.utilities.sources import Sources
 from hdx.utilities.dateparse import default_date
 from hdx.utilities.dictandlist import dict_of_lists_add
 from hdx.utilities.text import number_format

{hdx_python_scraper-2.4.1/tests/hdx/scraper → hdx_python_scraper-2.5.0/tests/hdx/scraper/framework/custom}/education_closures.py

@@ -1,7 +1,7 @@
 import logging
 from typing import Dict
 
-from hdx.scraper.base_scraper import BaseScraper
+from hdx.scraper.framework.base_scraper import BaseScraper
 from hdx.utilities.dateparse import default_date, parse_date
 
 logger = logging.getLogger(__name__)

{hdx_python_scraper-2.4.1/tests/hdx/scraper → hdx_python_scraper-2.5.0/tests/hdx/scraper/framework/custom}/education_enrolment.py

@@ -1,6 +1,6 @@
 import logging
 
-from hdx.scraper.base_scraper import BaseScraper
+from hdx.scraper.framework.base_scraper import BaseScraper
 from hdx.utilities.text import get_fraction_str
 
 logger = logging.getLogger(__name__)

hdx_python_scraper-2.4.1/tests/hdx/scraper/test_scrapers_custom.py → hdx_python_scraper-2.5.0/tests/hdx/scraper/framework/custom/test_custom.py

@@ -3,18 +3,18 @@ from datetime import datetime, timezone
 
 import pytest
 
+from ..conftest import check_scraper, check_scrapers
 from .affected_targeted_reached import AffectedTargetedReached
-from .conftest import check_scraper, check_scrapers
 from .education_closures import EducationClosures
 from .education_enrolment import EducationEnrolment
 from hdx.location.adminlevel import AdminLevel
-from hdx.scraper.base_scraper import BaseScraper
-from hdx.scraper.runner import Runner
-from hdx.scraper.utilities.reader import Read
+from hdx.scraper.framework.base_scraper import BaseScraper
+from hdx.scraper.framework.runner import Runner
+from hdx.scraper.framework.utilities.reader import Read
 from hdx.utilities.dateparse import parse_date
 
 
-class TestScrapersCustom:
+class TestCustom:
     hapi_values_closure = {
         "hdx_id": "6a41be98-75b9-4365-9ea3-e33d0dd2668b",
         "hdx_stub": "global-school-closures-covid19",

{hdx_python_scraper-2.4.1/tests/hdx/scraper → hdx_python_scraper-2.5.0/tests/hdx/scraper/framework/outputs}/test_output.py

@@ -6,10 +6,10 @@ import numpy as np
 import pandas
 import pytest
 
-from hdx.scraper.outputs.base import BaseOutput
-from hdx.scraper.outputs.excelfile import ExcelFile
-from hdx.scraper.outputs.googlesheets import GoogleSheets
-from hdx.scraper.outputs.json import JsonFile
+from hdx.scraper.framework.outputs.base import BaseOutput
+from hdx.scraper.framework.outputs.excelfile import ExcelFile
+from hdx.scraper.framework.outputs.googlesheets import GoogleSheets
+from hdx.scraper.framework.outputs.json import JsonFile
 from hdx.utilities.path import temp_dir
 
 

hdx_python_scraper-2.4.1/tests/hdx/scraper/test_scrapers_aggregation.py → hdx_python_scraper-2.5.0/tests/hdx/scraper/framework/scrapers/test_aggregation.py

@@ -1,11 +1,11 @@
-from .conftest import run_check_scraper, run_check_scrapers
-from hdx.scraper.base_scraper import BaseScraper
-from hdx.scraper.runner import Runner
-from hdx.scraper.utilities.sources import Sources
+from ..conftest import run_check_scraper, run_check_scrapers
+from hdx.scraper.framework.base_scraper import BaseScraper
+from hdx.scraper.framework.runner import Runner
+from hdx.scraper.framework.utilities.sources import Sources
 from hdx.utilities.dateparse import parse_date
 
 
-class TestScrapersAggregation:
+class TestAggregation:
     def test_get_aggregation_hxl(self, configuration):
         BaseScraper.population_lookup = {}
         today = parse_date("2020-10-01")

hdx_python_scraper-2.4.1/tests/hdx/scraper/test_scrapers_appenddata.py → hdx_python_scraper-2.5.0/tests/hdx/scraper/framework/scrapers/test_appenddata.py

@@ -2,19 +2,19 @@ from copy import deepcopy
 
 import pytest
 
-from .conftest import run_check_scrapers
+from ..conftest import run_check_scrapers
 from hdx.location.country import Country
-from hdx.scraper.base_scraper import BaseScraper
-from hdx.scraper.outputs.json import JsonFile
-from hdx.scraper.runner import Runner
-from hdx.scraper.utilities.sources import Sources
-from hdx.scraper.utilities.writer import Writer
+from hdx.scraper.framework.base_scraper import BaseScraper
+from hdx.scraper.framework.outputs.json import JsonFile
+from hdx.scraper.framework.runner import Runner
+from hdx.scraper.framework.utilities.sources import Sources
+from hdx.scraper.framework.utilities.writer import Writer
 from hdx.utilities.dateparse import parse_date
 
 
 # Test that scrapers can add to output from previous scrapers
 # Also test producing sources per admin unit eg. #targeted+total+eth
-class TestScrapersAppendData:
+class TestAppendData:
     @pytest.fixture
     def iso3s(self):
         return (

hdx_python_scraper-2.4.1/tests/hdx/scraper/test_scrapers_global.py → hdx_python_scraper-2.5.0/tests/hdx/scraper/framework/scrapers/test_global.py

@@ -2,10 +2,10 @@ import logging
 
 import pytest
 
-from .conftest import run_check_scraper
-from hdx.scraper.base_scraper import BaseScraper
-from hdx.scraper.runner import Runner
-from hdx.scraper.utilities.sources import Sources
+from ..conftest import run_check_scraper
+from hdx.scraper.framework.base_scraper import BaseScraper
+from hdx.scraper.framework.runner import Runner
+from hdx.scraper.framework.utilities.sources import Sources
 from hdx.utilities.dateparse import parse_date
 
 

hdx_python_scraper-2.4.1/tests/hdx/scraper/test_scrapers_multipleurls.py → hdx_python_scraper-2.5.0/tests/hdx/scraper/framework/scrapers/test_multipleurls.py

@@ -1,10 +1,10 @@
-from .conftest import run_check_scraper
-from hdx.scraper.base_scraper import BaseScraper
-from hdx.scraper.runner import Runner
+from ..conftest import run_check_scraper
+from hdx.scraper.framework.base_scraper import BaseScraper
+from hdx.scraper.framework.runner import Runner
 from hdx.utilities.dateparse import parse_date
 
 
-class TestScrapersMultipleURLs:
+class TestMultipleURLs:
     def test_get_key_figures(self, configuration):
         BaseScraper.population_lookup = {}
         today = parse_date("2020-10-01")

hdx_python_scraper-2.4.1/tests/hdx/scraper/test_scrapers_national.py → hdx_python_scraper-2.5.0/tests/hdx/scraper/framework/scrapers/test_national.py

@@ -1,15 +1,15 @@
-from .conftest import run_check_scraper, run_check_scrapers
+from ..conftest import run_check_scraper, run_check_scrapers
 from .unhcr_myanmar_idps import idps_post_run
-from hdx.scraper.base_scraper import BaseScraper
-from hdx.scraper.outputs.json import JsonFile
-from hdx.scraper.runner import Runner
-from hdx.scraper.utilities.reader import Read
-from hdx.scraper.utilities.writer import Writer
+from hdx.scraper.framework.base_scraper import BaseScraper
+from hdx.scraper.framework.outputs.json import JsonFile
+from hdx.scraper.framework.runner import Runner
+from hdx.scraper.framework.utilities.reader import Read
+from hdx.scraper.framework.utilities.writer import Writer
 from hdx.utilities.dateparse import parse_date
 from hdx.utilities.errors_onexit import ErrorsOnExit
 
 
-class TestScrapersNational:
+class TestNational:
     def test_get_national_afg(self, configuration):
         BaseScraper.population_lookup = {}
         today = parse_date("2020-10-01")

hdx_python_scraper-2.4.1/tests/hdx/scraper/test_scrapers_regionaltoplevel.py → hdx_python_scraper-2.5.0/tests/hdx/scraper/framework/scrapers/test_regionaltoplevel.py

@@ -1,13 +1,13 @@
-from .conftest import run_check_scraper, run_check_scrapers
-from hdx.scraper.base_scraper import BaseScraper
-from hdx.scraper.outputs.json import JsonFile
-from hdx.scraper.runner import Runner
-from hdx.scraper.utilities.sources import Sources
-from hdx.scraper.utilities.writer import Writer
+from ..conftest import run_check_scraper, run_check_scrapers
+from hdx.scraper.framework.base_scraper import BaseScraper
+from hdx.scraper.framework.outputs.json import JsonFile
+from hdx.scraper.framework.runner import Runner
+from hdx.scraper.framework.utilities.sources import Sources
+from hdx.scraper.framework.utilities.writer import Writer
 from hdx.utilities.dateparse import parse_date
 
 
-class TestScrapersRegionalToplevel:
+class TestRegionalToplevel:
     access_national_headers = (
         [
             "% of visas pending or denied",

hdx_python_scraper-2.4.1/tests/hdx/scraper/test_scrapers_resource_downloaders.py → hdx_python_scraper-2.5.0/tests/hdx/scraper/framework/scrapers/test_resource_downloaders.py

@@ -2,13 +2,13 @@ from os.path import exists, join
 
 import pytest
 
-from hdx.scraper.base_scraper import BaseScraper
-from hdx.scraper.runner import Runner
+from hdx.scraper.framework.base_scraper import BaseScraper
+from hdx.scraper.framework.runner import Runner
 from hdx.utilities.dateparse import parse_date
 from hdx.utilities.path import temp_dir
 
 
-class TestScrapersResourceDownloader:
+class TestResourceDownloader:
     @pytest.fixture(scope="function")
     def output_file(self, fixtures):
         return join(fixtures, "test_output.xlsx")

hdx_python_scraper-2.4.1/tests/hdx/scraper/test_scrapers_subnational.py → hdx_python_scraper-2.5.0/tests/hdx/scraper/framework/scrapers/test_subnational.py

@@ -1,13 +1,13 @@
-from .conftest import run_check_scraper
+from ..conftest import run_check_scraper
 from hdx.location.adminlevel import AdminLevel
-from hdx.scraper.base_scraper import BaseScraper
-from hdx.scraper.outputs.json import JsonFile
-from hdx.scraper.runner import Runner
-from hdx.scraper.utilities.writer import Writer
+from hdx.scraper.framework.base_scraper import BaseScraper
+from hdx.scraper.framework.outputs.json import JsonFile
+from hdx.scraper.framework.runner import Runner
+from hdx.scraper.framework.utilities.writer import Writer
 from hdx.utilities.dateparse import parse_date
 
 
-class TestScrapersSubnational:
+class TestSubnational:
     def test_get_subnational(self, configuration):
         BaseScraper.population_lookup = {}
         today = parse_date("2020-10-01")

hdx_python_scraper-2.4.1/tests/hdx/scraper/test_scrapers_timeseries.py → hdx_python_scraper-2.5.0/tests/hdx/scraper/framework/scrapers/test_timeseries.py

@@ -1,10 +1,10 @@
-from hdx.scraper.base_scraper import BaseScraper
-from hdx.scraper.outputs.json import JsonFile
-from hdx.scraper.runner import Runner
+from hdx.scraper.framework.base_scraper import BaseScraper
+from hdx.scraper.framework.outputs.json import JsonFile
+from hdx.scraper.framework.runner import Runner
 from hdx.utilities.dateparse import parse_date
 
 
-class TestScrapersTimeSeries:
+class TestTimeSeries:
     def test_timeseries(self, configuration):
         BaseScraper.population_lookup = {}
         iso3s = ("AFG", "MMR")

{hdx_python_scraper-2.4.1/tests/hdx/scraper → hdx_python_scraper-2.5.0/tests/hdx/scraper/framework}/test_runner.py

@@ -2,8 +2,8 @@ from copy import copy
 from datetime import datetime, timezone
 
 from .conftest import run_check_scrapers
-from hdx.scraper.base_scraper import BaseScraper
-from hdx.scraper.runner import Runner
+from hdx.scraper.framework.base_scraper import BaseScraper
+from hdx.scraper.framework.runner import Runner
 from hdx.utilities.dateparse import parse_date
 
 

{hdx_python_scraper-2.4.1/tests/hdx/scraper → hdx_python_scraper-2.5.0/tests/hdx/scraper/framework/utilities}/test_readers.py

@@ -4,7 +4,7 @@ import pytest
 
 from hdx.data.dataset import Dataset
 from hdx.data.resource import Resource
-from hdx.scraper.utilities.reader import Read
+from hdx.scraper.framework.utilities.reader import Read
 from hdx.utilities.dateparse import parse_date
 from hdx.utilities.downloader import Download
 from hdx.utilities.path import temp_dir

{hdx_python_scraper-2.4.1/tests/hdx/scraper → hdx_python_scraper-2.5.0/tests/hdx/scraper/framework/utilities}/test_regionlookup.py

@@ -1,4 +1,4 @@
-from hdx.scraper.utilities.region_lookup import RegionLookup
+from hdx.scraper.framework.utilities.region_lookup import RegionLookup
 
 
 class TestRegionLookup:

{hdx_python_scraper-2.4.1/tests/hdx/scraper → hdx_python_scraper-2.5.0/tests/hdx/scraper/framework/utilities}/test_sources.py

@@ -1,9 +1,11 @@
 import pytest
 
 from hdx.location.adminlevel import AdminLevel
-from hdx.scraper.base_scraper import BaseScraper
-from hdx.scraper.configurable.scraper import ConfigurableScraper
-from hdx.scraper.utilities.sources import Sources
+from hdx.scraper.framework.base_scraper import BaseScraper
+from hdx.scraper.framework.scrapers.configurable_scraper import (
+    ConfigurableScraper,
+)
+from hdx.scraper.framework.utilities.sources import Sources
 from hdx.utilities.dateparse import parse_date
 
 

{hdx_python_scraper-2.4.1/tests/hdx/scraper → hdx_python_scraper-2.5.0/tests/hdx/scraper/framework/utilities}/test_utils.py

@@ -1,4 +1,4 @@
-from hdx.scraper.utilities import get_rowval, string_params_to_dict
+from hdx.scraper.framework.utilities import get_rowval, string_params_to_dict
 
 
 class TestUtils: