Fixed various issues with project:

- Lining issues - Format Issues - __init__.py issues
ONSdigital · Jan 28, 2025 · 601ae19 · 601ae19
1 parent 9cfa3d0
commit 601ae19
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 72 deletions.
diff --git a/Makefile b/Makefile
@@ -16,7 +16,7 @@ format:
 lint:
 	@poetry run black --check .
 	@poetry run isort --check .
-	@poetry run flake8 --max-line-length=88 .
+	@poetry run flake8 --ignore=E501 .
 
 .PHONY: test
 ## Run unit tests

diff --git a/README.md b/README.md
@@ -42,31 +42,3 @@ Run unit tests:
 ```shell
 poetry run python -m pytest
 ```
-
-
-### Running Locally
-
-Run the following commands in a terminal
-
-```shell
-gcloud config set project <project_id>
-```
-
-```shell
-gcloud compute start-iap-tunnel restapi-1 80 --local-host-port=localhost:8011
-```
-
-```shell
-export BLAISE_API_URL="localhost:8011"
-export BLAISE_SERVER_PARK="gusty"
-```
-
-Need to get files from poetry to requirements.txt by running
-```shell
-poetry export -f requirements.txt --without-hashes > requirements.txt
-```
-
-Then using python 3.9 the main.py file
-```
-main.py
-```
diff --git a/__init__.py b/__init__.py
diff --git a/services/mypi.ini b/services/mypi.ini
diff --git a/services/validation_service.py b/services/validation_service.py
@@ -60,8 +60,8 @@ def validate_questionnaire_name(self):
         if not result:
             error_message = (
                 f"{self.request_json['questionnaire_name']} is not a valid "
-                + "questionnaire name format. "
-                + "Questionnaire name must start with 3 letters, followed by 4 numbers"
+                "questionnaire name format. "
+                "Questionnaire name must start with 3 letters, followed by 4 numbers"
             )
 
             logging.error(error_message)

diff --git a/tests/services/test_blaise_service.py b/tests/services/test_blaise_service.py
@@ -1,5 +1,5 @@
-from unittest import mock
 from contextlib import contextmanager
+from unittest import mock
 
 import blaise_restapi
 import pytest
@@ -10,8 +10,6 @@
 from services.blaise_service import BlaiseService
 from services.validation_service import ValidationService
 from tests.helpers import get_default_config
-
-from main import process_zip_file
 from utilities.custom_exceptions import BlaiseError, ConfigError
 
 
@@ -37,9 +35,7 @@ class TestUtils:
             ("IPS2503_edit", None),
         ],
     )
-    def test_get_questionnaire_name(
-            self, file_name, questionnaire_name
-    ):
+    def test_get_questionnaire_name(self, file_name, questionnaire_name):
         # arrange
         result = utils.get_questionnaire_name(file_name)
 
@@ -156,7 +152,7 @@ def test_get_ingest_calls_the_rest_api_endpoint_with_the_correct_parameters(
 class TestValidateQuestionnaireExists:
     @mock.patch.object(blaise_restapi.Client, "questionnaire_exists_on_server_park")
     def test_validate_questionnaire_exists_does_not_raise_an_exception_when_questionnaire_exists(
-            self, mock_questionnaire_exists_on_server_park
+        self, mock_questionnaire_exists_on_server_park
     ):
         # arrange
         mock_questionnaire_exists_on_server_park.return_value = {
@@ -174,7 +170,7 @@ def test_validate_questionnaire_exists_does_not_raise_an_exception_when_question
 
     @mock.patch.object(blaise_restapi.Client, "questionnaire_exists_on_server_park")
     def test_validate_questionnaire_exists_logs_and_raises_a_blaise_error_exception_when_rest_api_fails(
-            self, mock_questionnaire_exists_on_server_park, caplog
+        self, mock_questionnaire_exists_on_server_park, caplog
     ):
         # arrange
         mock_questionnaire_exists_on_server_park.side_effect = Exception(
@@ -197,10 +193,10 @@ def test_validate_questionnaire_exists_logs_and_raises_a_blaise_error_exception_
         )
         assert err.value.args[0] == error_message
         assert (
-                   "root",
-                   40,
-                   error_message,
-               ) in caplog.record_tuples
+            "root",
+            40,
+            error_message,
+        ) in caplog.record_tuples
 
     def test_validate_config_does_not_raise_an_exception_when_given_valid_config(self):
         # arrange
@@ -214,24 +210,22 @@ def test_validate_config_does_not_raise_an_exception_when_given_valid_config(sel
 
 class TestProcessZipFile:
 
-    @mock.patch.object(validation_service.ValidationService, "validate_questionnaire_exists")
-    def test_validation_questionnaire_exists(
-            self, mock_validate_questionnaire_exists
-    ):
+    @mock.patch.object(
+        validation_service.ValidationService, "validate_questionnaire_exists"
+    )
+    def test_validation_questionnaire_exists(self, mock_validate_questionnaire_exists):
         # arrange
         validation_service = ValidationService()
         questionnaire_name = "IPS2501A"
         config = Config(blaise_api_url="foo", blaise_server_park="bar")
 
         # act
-        validation_service.validate_questionnaire_exists(
-            questionnaire_name, config
-        )
+        validation_service.validate_questionnaire_exists(questionnaire_name, config)
 
         # assert
         assert mock_validate_questionnaire_exists.called_with(
-            questionnaire_name,
-            config)
+            questionnaire_name, config
+        )
 
 
 @contextmanager

diff --git a/utilities/__init__.py b/utilities/__init__.py
diff --git a/utils.py b/utils.py
@@ -21,4 +21,4 @@ class InvalidFileExtension(Exception):
 
 
 class InvalidFileType(Exception):
-    pass
+    pass
Original file line number	Diff line number	Diff line change
Expand Up		@@ -21,4 +21,4 @@ class InvalidFileExtension(Exception):


		class InvalidFileType(Exception):
		pass
		pass