lint

app/__init__.py

@@ -5,8 +5,8 @@
 from flask_bootstrap import Bootstrap
 from flask_migrate import Migrate
 
-from database.models import db
 from app.scripts.load_manager import load_manager
+from database.models import db
 
 load_dotenv()
 

app/routes.py

@@ -1,8 +1,9 @@
 from flask import Blueprint, flash, jsonify, redirect, render_template, request
 
-from .forms import HarvestSourceForm, OrganizationForm
 from database.interface import HarvesterDBInterface
 
+from .forms import HarvestSourceForm, OrganizationForm
+
 mod = Blueprint("harvest", __name__)
 db = HarvesterDBInterface()
 

app/scripts/load_manager.py

@@ -1,4 +1,5 @@
 import os
+
 from database.interface import HarvesterDBInterface
 from harvester.utils import CFHandler
 

database/__init__.py

@@ -1,4 +1,5 @@
 import os
+
 from dotenv import load_dotenv
 
 load_dotenv()

database/interface.py

@@ -1,16 +1,11 @@
 import os
 import uuid
+
 from sqlalchemy import create_engine, inspect, or_, text
 from sqlalchemy.exc import NoResultFound
 from sqlalchemy.orm import scoped_session, sessionmaker
 
-from .models import (
-    HarvestError,
-    HarvestJob,
-    HarvestRecord,
-    HarvestSource,
-    Organization,
-)
+from .models import HarvestError, HarvestJob, HarvestRecord, HarvestSource, Organization
 
 DATABASE_URI = os.getenv("DATABASE_URI")
 

harvester/__init__.py

@@ -2,9 +2,8 @@
 
 from dotenv import load_dotenv
 
-from harvester.logger_config import LOGGING_CONFIG
-
 from database.interface import HarvesterDBInterface
+from harvester.logger_config import LOGGING_CONFIG
 
 load_dotenv()
 

harvester/exceptions.py

@@ -1,8 +1,7 @@
 import logging
 from datetime import datetime
 
-from database.interface import HarvesterDBInterface
-from . import db_interface
+from . import HarvesterDBInterface, db_interface
 
 
 # critical exceptions

harvester/harvest.py

@@ -9,9 +9,9 @@
 
 import ckanapi
 import requests
-
 from jsonschema import Draft202012Validator
 
+from . import HarvesterDBInterface, db_interface
 from .ckan_utils import ckanify_dcatus
 from .exceptions import (
     CompareException,
@@ -21,19 +21,15 @@
     SynchronizeException,
     ValidationException,
 )
-
 from .utils import (
     dataset_to_hash,
-    open_json,
     download_file,
-    sort_dataset,
-    get_title_from_fgdc,
     download_waf,
+    get_title_from_fgdc,
+    open_json,
+    sort_dataset,
     traverse_waf,
 )
-from database.interface import HarvesterDBInterface
-
-from . import db_interface
 
 # requests data
 session = requests.Session()

harvester/utils.py

@@ -6,8 +6,8 @@
 from typing import Union
 
 import requests
-from bs4 import BeautifulSoup
 import sansjson
+from bs4 import BeautifulSoup
 from cloudfoundry_client.client import CloudFoundryClient
 from cloudfoundry_client.v3.tasks import TaskManager
 

tests/conftest.py

@@ -1,13 +1,14 @@
-import os
 import logging
+import os
 from pathlib import Path
 from unittest.mock import patch
 
 import pytest
 from dotenv import load_dotenv
+from flask import Flask
 from sqlalchemy.orm import scoped_session, sessionmaker
+
 from app import create_app
-from flask import Flask
 from database.interface import HarvesterDBInterface
 from database.models import db
 from harvester.utils import CFHandler

tests/integration/cf/test_load_manager.py

@@ -1,9 +1,13 @@
+from unittest.mock import patch
+
 import pytest
 
-from unittest.mock import patch
-from app.scripts.load_manager import load_manager, sort_jobs
-from app.scripts.load_manager import CFHandler
-from app.scripts.load_manager import HarvesterDBInterface
+from app.scripts.load_manager import (
+    CFHandler,
+    HarvesterDBInterface,
+    load_manager,
+    sort_jobs,
+)
 
 
 @pytest.fixture

tests/integration/exception/test_exception_handling.py

@@ -1,5 +1,10 @@
 # ruff: noqa: F841
 
+from unittest.mock import patch
+
+import ckanapi
+import pytest
+
 import harvester
 from harvester.exceptions import (
     DCATUSToCKANException,
@@ -10,10 +15,6 @@
 )
 from harvester.harvest import HarvestSource
 
-import ckanapi
-import pytest
-from unittest.mock import patch
-
 
 class TestExceptionHandling:
     def test_bad_harvest_source_url_exception(