diff --git a/datagovharvester/extract/__init__.py b/datagovharvester/extract/__init__.py index 6680270a..4345e69d 100644 --- a/datagovharvester/extract/__init__.py +++ b/datagovharvester/extract/__init__.py @@ -1,7 +1,7 @@ -from datagovharvester.validate.dcat_us import is_dcatus_schema -from datagovharvester.utils.s3_utilities import upload_to_S3 -from datagovharvester.extract.utils import download_json from datagovharvester.extract.dcatus import parse_catalog +from datagovharvester.extract.utils import download_json +from datagovharvester.utils.s3_utilities import upload_to_S3 +from datagovharvester.validate.dcat_us import is_dcatus_schema # ruff: noqa: F841 diff --git a/datagovharvester/extract/dcatus.py b/datagovharvester/extract/dcatus.py index ce71ca2a..0c48311d 100644 --- a/datagovharvester/extract/dcatus.py +++ b/datagovharvester/extract/dcatus.py @@ -1,4 +1,5 @@ import json + from datagovharvester import content_types, extract_feat_name from datagovharvester.utils.s3_utilities import create_s3_upload_data diff --git a/datagovharvester/extract/utils.py b/datagovharvester/extract/utils.py index aec608f5..96012b37 100644 --- a/datagovharvester/extract/utils.py +++ b/datagovharvester/extract/utils.py @@ -1,6 +1,7 @@ -import requests import json +import requests + def download_json(url): """ download file and pull json from response diff --git a/datagovharvester/utils/s3_utilities.py b/datagovharvester/utils/s3_utilities.py index 1235fcc0..c1571691 100644 --- a/datagovharvester/utils/s3_utilities.py +++ b/datagovharvester/utils/s3_utilities.py @@ -1,5 +1,6 @@ import boto3 import botocore + from datagovharvester import bucket_name # ruff: noqa: F841 diff --git a/datagovharvester/validate/dcat_us.py b/datagovharvester/validate/dcat_us.py index 145811ee..a2be3549 100644 --- a/datagovharvester/validate/dcat_us.py +++ b/datagovharvester/validate/dcat_us.py @@ -1,5 +1,6 @@ -from jsonschema.exceptions import ValidationError from jsonschema import Draft202012Validator +from jsonschema.exceptions import ValidationError + def is_dcatus_schema( catalog ): diff --git a/tests/extract/conftest.py b/tests/extract/conftest.py index 5c50ffaf..771ad440 100644 --- a/tests/extract/conftest.py +++ b/tests/extract/conftest.py @@ -1,7 +1,9 @@ -import pytest -from dotenv import load_dotenv import os from uuid import uuid4 + +import pytest +from dotenv import load_dotenv + from datagovharvester.utils.s3_utilities import create_s3_client diff --git a/tests/extract/test_dcatus.py b/tests/extract/test_dcatus.py index cd67955c..87866cb3 100644 --- a/tests/extract/test_dcatus.py +++ b/tests/extract/test_dcatus.py @@ -1,6 +1,7 @@ from datagovharvester import bucket_name from datagovharvester.extract import main + def test_extract_dcatus(get_dcatus_job, create_client): """ download dcat-us json file and store result in s3 bucket. get_dcatus_job (dict) : fixture containing job data diff --git a/tests/validate/dcatus/conftest.py b/tests/validate/dcatus/conftest.py index 3bafe568..aa397c28 100644 --- a/tests/validate/dcatus/conftest.py +++ b/tests/validate/dcatus/conftest.py @@ -1,5 +1,7 @@ -import pytest from pathlib import Path + +import pytest + from datagovharvester.utils.json_utilities import open_json BASE_DIR = Path(__file__).parents[3]