update makefiles for lint

Author: pooleycodes

request-api/makefile

@@ -1,17 +1,15 @@
 test: lint test-coverage
 
-lint:: 
-	make black ./src
-	python -m flake8 ./src
+lint: black-check flake8
 
-black-check:
-	black --check .
+black-check: 
+	python -m black --check ./src ./tests
 
-black:
-	black .
+flake8: 
+	python -m flake8 ./src ./tests
 
-flake8:
-	flake8 .
+black:
+	python -m black .
 
 test-coverage:: coverage-unit coverage-integration coverage-acceptance
 

request-processor/makerules/python.mk

@@ -1,11 +1,12 @@
 all:: lint test-coverage
 
-lint:
-	make black ./src/application
-	python -m flake8 ./src/application
+lint: black-check flake8
 
-black-check:
-	black --check .
+black-check: 
+	python -m black --check ./src ./tests
+
+flake8: 
+	python -m flake8 ./src ./tests
 
 black:
 	python -m black .

request-processor/src/tasks.py

@@ -141,7 +141,7 @@ def handle_check_file(request_schema, request_data, tmp_dir):
 
 
 @celery.task(base=CheckDataUrlTask, name=CheckDataUrlTask.name)
-def check_dataurl(request: Dict, directories=None):
+def check_dataurl(request: Dict, directories=None):  # noqa
     logger.info(
         f"Started check_dataurl task for request_id = {request.get('id', 'unknown')}"
     )

request-processor/tests/integration/src/test_tasks.py

@@ -99,7 +99,7 @@ def test_check_datafile(
             "https://example.com/arcgis/rest/services/MapServer",
             (
                 None,
-                '{"type":"FeatureCollection","features":[{"type":"Feature","properties":{"name":"Test Feature"}}]}'.encode(
+                '{"type":"FeatureCollection","features":[{"type":"Feature","properties":{"name":"Test Feature"}}]}'.encode(  # noqa: E501
                     "utf-8"
                 ),
             ),

request-processor/tests/unit/src/application/core/test_pipeline.py

@@ -1,6 +1,4 @@
 import pytest
-import os
-import csv
 from unittest.mock import MagicMock
 from src.application.core.pipeline import (
     fetch_add_data_response,

request-processor/tests/unit/src/application/core/test_utils.py

@@ -357,8 +357,6 @@ def test_validate_endpoint_csv_read_error(monkeypatch, tmp_path):
     """Test validate_endpoint when reading CSV fails"""
     pipeline_dir = tmp_path / "pipeline"
     pipeline_dir.mkdir()
-    url = "http://example.com/endpoint"
-
     endpoint_csv_path = pipeline_dir / "endpoint.csv"
     endpoint_csv_path.write_bytes(b"\x00\x00\x00")
 
@@ -380,7 +378,6 @@ def test_validate_source_creates_new_source(monkeypatch, tmp_path):
     """Test validate_source creates new source entry when it doesn't exist"""
     pipeline_dir = tmp_path / "pipeline"
     pipeline_dir.mkdir()
-    source_csv_path = pipeline_dir / "source.csv"
 
     documentation_url = "http://example.com/doc"
     collection = "test-collection"

request-processor/tests/unit/src/application/core/test_workflow.py

@@ -6,13 +6,11 @@
     fetch_pipeline_csvs,
     add_data_workflow,
     fetch_add_data_pipeline_csvs,
-    fetch_add_data_collection_csvs,
 )
 import csv
 import hashlib
 import os
 from pathlib import Path
-import urllib
 from urllib.error import HTTPError
 
 

request-processor/tests/unit/src/test_tasks.py

@@ -3,11 +3,10 @@
 import pytest
 import json
 from src import tasks
-from src.tasks import save_response_to_db, _fetch_resource, check_dataurl
+from src.tasks import save_response_to_db, check_dataurl
 from request_model import models, schemas
-from unittest.mock import patch, MagicMock
+from unittest.mock import MagicMock
 from application.exceptions.customExceptions import CustomException
-from application.configurations.config import Directories
 
 
 @pytest.mark.parametrize(
@@ -640,7 +639,7 @@ def mock_run_workflow(
         tasks, "_get_request", lambda rid: {"id": rid, "status": "COMPLETE"}
     )
 
-    result = check_dataurl(request, directories_json)
+    check_dataurl(request, directories_json)
 
     assert len(workflow_calls) == 1
     assert workflow_calls[0]["file_name"] == "brownfield-data.csv"