Remove extra pip install, and create archives folder if needed

Author: markdlv-sf

src/datacustomcode/deploy.py

@@ -164,11 +164,11 @@ def prepare_dependency_archive(directory: str) -> None:
         cmd = (
             f"{PLATFORM_ENV_VAR} docker run --rm "
             f"-v {temp_dir}:/workspace "
-            f"{DOCKER_IMAGE_NAME} "
-            f'/bin/bash -c "./build_native_dependencies.sh"'
+            f"{DOCKER_IMAGE_NAME}"
         )
         cmd_output(cmd)
         archives_temp_path = os.path.join(temp_dir, DEPENDENCIES_ARCHIVE_FULL_NAME)
+        os.makedirs(os.path.dirname(DEPENDENCIES_ARCHIVE_PATH), exist_ok=True)
         shutil.copy(archives_temp_path, DEPENDENCIES_ARCHIVE_PATH)
 
         logger.info(f"Dependencies archived to {DEPENDENCIES_ARCHIVE_PATH}")

src/datacustomcode/templates/build_native_dependencies.sh

@@ -2,8 +2,6 @@
 
 # Description: build native dependencies
 
-pip3.11 install venv-pack
-
 python3.11 -m venv --copies .venv
 source .venv/bin/activate
 pip install -r requirements.txt

tests/test_deploy.py

@@ -46,16 +46,16 @@ class TestPrepareDependencyArchive:
     EXPECTED_DOCKER_RUN_CMD = (
         "DOCKER_DEFAULT_PLATFORM=linux/amd64 docker run --rm "
         "-v /tmp/test_dir:/workspace "
-        "datacloud-custom-code-dependency-builder "
-        '/bin/bash -c "./build_native_dependencies.sh"'
+        "datacloud-custom-code-dependency-builder"
     )
 
     @patch("datacustomcode.deploy.cmd_output")
     @patch("datacustomcode.deploy.shutil.copy")
     @patch("datacustomcode.deploy.tempfile.TemporaryDirectory")
     @patch("datacustomcode.deploy.os.path.join")
+    @patch("datacustomcode.deploy.os.makedirs")
     def test_prepare_dependency_archive_image_exists(
-        self, mock_join, mock_temp_dir, mock_copy, mock_cmd_output
+        self, mock_makedirs, mock_join, mock_temp_dir, mock_copy, mock_cmd_output
     ):
         """Test prepare_dependency_archive when Docker image already exists."""
         # Mock the temporary directory context manager
@@ -85,15 +85,19 @@ def test_prepare_dependency_archive_image_exists(
         # Verify docker run command was called
         mock_cmd_output.assert_any_call(self.EXPECTED_DOCKER_RUN_CMD)
 
+        # Verify archives directory was created
+        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")
 
     @patch("datacustomcode.deploy.cmd_output")
     @patch("datacustomcode.deploy.shutil.copy")
     @patch("datacustomcode.deploy.tempfile.TemporaryDirectory")
     @patch("datacustomcode.deploy.os.path.join")
+    @patch("datacustomcode.deploy.os.makedirs")
     def test_prepare_dependency_archive_build_image(
-        self, mock_join, mock_temp_dir, mock_copy, mock_cmd_output
+        self, mock_makedirs, mock_join, mock_temp_dir, mock_copy, mock_cmd_output
     ):
         """Test prepare_dependency_archive when Docker image needs to be built."""
         # Mock the temporary directory context manager
@@ -124,15 +128,19 @@ def test_prepare_dependency_archive_build_image(
         # Verify docker run command was called
         mock_cmd_output.assert_any_call(self.EXPECTED_DOCKER_RUN_CMD)
 
+        # Verify archives directory was created
+        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")
 
     @patch("datacustomcode.deploy.cmd_output")
     @patch("datacustomcode.deploy.shutil.copy")
     @patch("datacustomcode.deploy.tempfile.TemporaryDirectory")
     @patch("datacustomcode.deploy.os.path.join")
+    @patch("datacustomcode.deploy.os.makedirs")
     def test_prepare_dependency_archive_docker_build_failure(
-        self, mock_join, mock_temp_dir, mock_copy, mock_cmd_output
+        self, mock_makedirs, mock_join, mock_temp_dir, mock_copy, mock_cmd_output
     ):
         """Test prepare_dependency_archive when Docker build fails."""
         # Mock the temporary directory context manager
@@ -161,8 +169,9 @@ def test_prepare_dependency_archive_docker_build_failure(
     @patch("datacustomcode.deploy.shutil.copy")
     @patch("datacustomcode.deploy.tempfile.TemporaryDirectory")
     @patch("datacustomcode.deploy.os.path.join")
+    @patch("datacustomcode.deploy.os.makedirs")
     def test_prepare_dependency_archive_docker_run_failure(
-        self, mock_join, mock_temp_dir, mock_copy, mock_cmd_output
+        self, mock_makedirs, mock_join, mock_temp_dir, mock_copy, mock_cmd_output
     ):
         """Test prepare_dependency_archive when Docker run fails."""
         # Mock the temporary directory context manager
@@ -195,8 +204,9 @@ def test_prepare_dependency_archive_docker_run_failure(
     @patch("datacustomcode.deploy.shutil.copy")
     @patch("datacustomcode.deploy.tempfile.TemporaryDirectory")
     @patch("datacustomcode.deploy.os.path.join")
+    @patch("datacustomcode.deploy.os.makedirs")
     def test_prepare_dependency_archive_file_copy_failure(
-        self, mock_join, mock_temp_dir, mock_copy, mock_cmd_output
+        self, mock_makedirs, mock_join, mock_temp_dir, mock_copy, mock_cmd_output
     ):
         """Test prepare_dependency_archive when file copy fails."""
         # Mock the temporary directory context manager