Fix lint issues

Author: markdlv-sf

src/datacustomcode/deploy.py

@@ -18,7 +18,6 @@
 import json
 import os
 import shutil
-import tarfile
 import tempfile
 import time
 from typing import (
@@ -144,7 +143,9 @@ def create_deployment(
 DOCKER_IMAGE_NAME = "datacloud-custom-code-dependency-builder"
 DEPENDENCIES_ARCHIVE_NAME = "native_dependencies"
 DEPENDENCIES_ARCHIVE_FULL_NAME = f"{DEPENDENCIES_ARCHIVE_NAME}.tar.gz"
-DEPENDENCIES_ARCHIVE_PATH = os.path.join("payload", "archives", DEPENDENCIES_ARCHIVE_FULL_NAME)
+DEPENDENCIES_ARCHIVE_PATH = os.path.join(
+    "payload", "archives", DEPENDENCIES_ARCHIVE_FULL_NAME
+)
 ZIP_FILE_NAME = "deployment.zip"
 
 
@@ -154,7 +155,10 @@ def prepare_dependency_archive(directory: str) -> None:
 
     if not image_exists:
         logger.info("Building docker image...")
-        cmd = f"{PLATFORM_ENV_VAR} docker build -t {DOCKER_IMAGE_NAME} -f Dockerfile.dependencies ."
+        cmd = (
+            f"{PLATFORM_ENV_VAR} docker build -t {DOCKER_IMAGE_NAME} "
+            f"-f Dockerfile.dependencies ."
+        )
         cmd_output(cmd)
 
     with tempfile.TemporaryDirectory() as temp_dir:

tests/test_deploy.py

@@ -2,9 +2,9 @@
 
 from unittest.mock import (
     MagicMock,
+    call,
     mock_open,
     patch,
-    call,
 )
 import zipfile
 
@@ -41,8 +41,13 @@
 
 class TestPrepareDependencyArchive:
     # Shared expected commands
-    EXPECTED_DOCKER_IMAGES_CMD = "docker images -q datacloud-custom-code-dependency-builder"
-    EXPECTED_BUILD_CMD = "DOCKER_DEFAULT_PLATFORM=linux/amd64 docker build -t datacloud-custom-code-dependency-builder -f Dockerfile.dependencies ."
+    EXPECTED_DOCKER_IMAGES_CMD = (
+        "docker images -q datacloud-custom-code-dependency-builder"
+    )
+    EXPECTED_BUILD_CMD = (
+        "DOCKER_DEFAULT_PLATFORM=linux/amd64 docker build "
+        "-t datacloud-custom-code-dependency-builder -f Dockerfile.dependencies ."
+    )
     EXPECTED_DOCKER_RUN_CMD = (
         "DOCKER_DEFAULT_PLATFORM=linux/amd64 docker run --rm "
         "-v /tmp/test_dir:/workspace "
@@ -89,7 +94,10 @@ def test_prepare_dependency_archive_image_exists(
         mock_makedirs.assert_called_once_with("payload/archives", exist_ok=True)
 
         # Verify archive was copied back
-        mock_copy.assert_any_call("/tmp/test_dir/native_dependencies.tar.gz", "payload/archives/native_dependencies.tar.gz")
+        mock_copy.assert_any_call(
+            "/tmp/test_dir/native_dependencies.tar.gz",
+            "payload/archives/native_dependencies.tar.gz",
+        )
 
     @patch("datacustomcode.deploy.cmd_output")
     @patch("datacustomcode.deploy.shutil.copy")
@@ -132,7 +140,10 @@ def test_prepare_dependency_archive_build_image(
         mock_makedirs.assert_called_once_with("payload/archives", exist_ok=True)
 
         # Verify archive was copied back
-        mock_copy.assert_any_call("/tmp/test_dir/native_dependencies.tar.gz", "payload/archives/native_dependencies.tar.gz")
+        mock_copy.assert_any_call(
+            "/tmp/test_dir/native_dependencies.tar.gz",
+            "payload/archives/native_dependencies.tar.gz",
+        )
 
     @patch("datacustomcode.deploy.cmd_output")
     @patch("datacustomcode.deploy.shutil.copy")
@@ -151,9 +162,12 @@ def test_prepare_dependency_archive_docker_build_failure(
 
         # Mock cmd_output to return None for image check, then raise exception for build
         from datacustomcode.cmd import CalledProcessError
+
         mock_cmd_output.side_effect = [
             None,  # Image doesn't exist
-            CalledProcessError(1, ("docker", "build"), b"Build failed", b"Error"),  # Build fails
+            CalledProcessError(
+                1, ("docker", "build"), b"Build failed", b"Error"
+            ),  # Build fails
         ]
 
         with pytest.raises(CalledProcessError, match="Build failed"):
@@ -182,9 +196,12 @@ def test_prepare_dependency_archive_docker_run_failure(
 
         # Mock cmd_output to return image ID, then raise exception for run
         from datacustomcode.cmd import CalledProcessError
+
         mock_cmd_output.side_effect = [
             "abc123",  # Image exists
-            CalledProcessError(1, ("docker", "run"), b"Run failed", b"Error"),  # Run fails
+            CalledProcessError(
+                1, ("docker", "run"), b"Run failed", b"Error"
+            ),  # Run fails
         ]
 
         with pytest.raises(CalledProcessError, match="Run failed"):
@@ -234,35 +251,51 @@ def test_prepare_dependency_archive_file_copy_failure(
 class TestHasNonemptyRequirementsFile:
     @patch("datacustomcode.deploy.os.path.dirname")
     @patch("datacustomcode.deploy.os.path.isfile")
-    @patch("builtins.open", new_callable=mock_open, read_data="numpy==1.21.0\npandas==1.3.0")
+    @patch(
+        "builtins.open",
+        new_callable=mock_open,
+        read_data="numpy==1.21.0\npandas==1.3.0",
+    )
     def test_has_nonempty_requirements_file_with_dependencies(
         self, mock_file, mock_isfile, mock_dirname
     ):
-        """Test has_nonempty_requirements_file when requirements.txt has dependencies."""
+        """
+        Test has_nonempty_requirements_file when requirements.txt has dependencies.
+        """
         mock_dirname.return_value = "/parent/dir"
         mock_isfile.return_value = True
 
         result = has_nonempty_requirements_file("/test/dir")
 
         assert result is True
         mock_isfile.assert_called_once_with("/parent/dir/requirements.txt")
-        mock_file.assert_called_once_with("/parent/dir/requirements.txt", "r", encoding="utf-8")
+        mock_file.assert_called_once_with(
+            "/parent/dir/requirements.txt", "r", encoding="utf-8"
+        )
 
     @patch("datacustomcode.deploy.os.path.dirname")
     @patch("datacustomcode.deploy.os.path.isfile")
-    @patch("builtins.open", new_callable=mock_open, read_data="# This is a comment\n\n  # Another comment")
+    @patch(
+        "builtins.open",
+        new_callable=mock_open,
+        read_data="# This is a comment\n\n  # Another comment",
+    )
     def test_has_nonempty_requirements_file_only_comments(
         self, mock_file, mock_isfile, mock_dirname
     ):
-        """Test has_nonempty_requirements_file when requirements.txt has only comments."""
+        """
+        Test has_nonempty_requirements_file when requirements.txt has only comments.
+        """
         mock_dirname.return_value = "/parent/dir"
         mock_isfile.return_value = True
 
         result = has_nonempty_requirements_file("/test/dir")
 
         assert result is False
         mock_isfile.assert_called_once_with("/parent/dir/requirements.txt")
-        mock_file.assert_called_once_with("/parent/dir/requirements.txt", "r", encoding="utf-8")
+        mock_file.assert_called_once_with(
+            "/parent/dir/requirements.txt", "r", encoding="utf-8"
+        )
 
     @patch("datacustomcode.deploy.os.path.dirname")
     @patch("datacustomcode.deploy.os.path.isfile")
@@ -278,13 +311,13 @@ def test_has_nonempty_requirements_file_empty_file(
 
         assert result is False
         mock_isfile.assert_called_once_with("/parent/dir/requirements.txt")
-        mock_file.assert_called_once_with("/parent/dir/requirements.txt", "r", encoding="utf-8")
+        mock_file.assert_called_once_with(
+            "/parent/dir/requirements.txt", "r", encoding="utf-8"
+        )
 
     @patch("datacustomcode.deploy.os.path.dirname")
     @patch("datacustomcode.deploy.os.path.isfile")
-    def test_has_nonempty_requirements_file_not_exists(
-        self, mock_isfile, mock_dirname
-    ):
+    def test_has_nonempty_requirements_file_not_exists(self, mock_isfile, mock_dirname):
         """Test has_nonempty_requirements_file when requirements.txt doesn't exist."""
         mock_dirname.return_value = "/parent/dir"
         mock_isfile.return_value = False
@@ -308,11 +341,17 @@ def test_has_nonempty_requirements_file_permission_error(
 
         assert result is False
         mock_isfile.assert_called_once_with("/parent/dir/requirements.txt")
-        mock_file.assert_called_once_with("/parent/dir/requirements.txt", "r", encoding="utf-8")
+        mock_file.assert_called_once_with(
+            "/parent/dir/requirements.txt", "r", encoding="utf-8"
+        )
 
     @patch("datacustomcode.deploy.os.path.dirname")
     @patch("datacustomcode.deploy.os.path.isfile")
-    @patch("builtins.open", new_callable=mock_open, read_data="numpy==1.21.0\n# Comment\npandas==1.3.0")
+    @patch(
+        "builtins.open",
+        new_callable=mock_open,
+        read_data="numpy==1.21.0\n# Comment\npandas==1.3.0",
+    )
     def test_has_nonempty_requirements_file_mixed_content(
         self, mock_file, mock_isfile, mock_dirname
     ):
@@ -324,7 +363,9 @@ def test_has_nonempty_requirements_file_mixed_content(
 
         assert result is True
         mock_isfile.assert_called_once_with("/parent/dir/requirements.txt")
-        mock_file.assert_called_once_with("/parent/dir/requirements.txt", "r", encoding="utf-8")
+        mock_file.assert_called_once_with(
+            "/parent/dir/requirements.txt", "r", encoding="utf-8"
+        )
 
 
 class TestMakeApiCall: