builder: install pydeps and requirements simultaneously (#1157)

Minimal fix for #1135.

A larger fix will come with 3.0.

Author: lengau

charmcraft/charm_builder.py

@@ -25,8 +25,8 @@
 import os
 import pathlib
 import shutil
-import sys
 import subprocess
+import sys
 from typing import List
 
 from charmcraft import instrum
@@ -35,7 +35,6 @@
 from charmcraft.jujuignore import JujuIgnore, default_juju_ignore
 from charmcraft.utils import make_executable
 
-
 # Some constants that are used through the code.
 WORK_DIRNAME = "work_dir"
 VENV_DIRNAME = "venv"
@@ -76,7 +75,7 @@ def __init__(
         binary_python_packages: List[str] = None,
         python_packages: List[str] = None,
         requirements: List[pathlib.Path] = None,
-    ):
+    ) -> None:
         self.builddir = builddir
         self.installdir = installdir
         self.entrypoint = entrypoint
@@ -263,17 +262,15 @@ def _install_dependencies(self, staging_venv_dir):
                 cmd.extend(self.python_packages)  # the python packages to install
                 _process_run(cmd)
 
-            if self.requirement_paths:
-                # install dependencies from requirement files
+            if self.requirement_paths or self.charmlib_deps:
                 cmd = [pip_cmd, "install", "--upgrade", "--no-binary", ":all:"]  # base command
-                for reqspath in self.requirement_paths:
-                    cmd.append("--requirement={}".format(reqspath))  # the dependencies file(s)
-                _process_run(cmd)
 
-            if self.charmlib_deps:
-                # install charmlibs python dependencies
-                cmd = [pip_cmd, "install", "--upgrade", "--no-binary", ":all:"]  # base command
-                cmd.extend(self.charmlib_deps)  # the python packages to install
+                if self.requirement_paths:
+                    # install dependencies from requirement files
+                    cmd.extend(f"--requirement={path}" for path in self.requirement_paths)
+
+                if self.charmlib_deps:
+                    cmd.extend(self.charmlib_deps)
                 _process_run(cmd)
 
     def handle_dependencies(self):

tests/spread/smoketests/pinned-dependencies/task.yaml

@@ -0,0 +1,32 @@
+summary: pack a charm with a specific (old) dependency version
+
+include:
+  - tests/
+
+prepare: |
+  tests.pkgs install unzip
+  charmcraft init --project-dir=charm
+  cd charm
+  echo "ops==2.0.0" > requirements.txt
+  cat <<- EOF >> charmcraft.yaml
+  parts:
+    charm:
+      charm-requirements: [requirements.txt]
+  EOF
+  mkdir -p lib/charms/charm/v0/
+  cat <<- EOF > lib/charms/charm/v0/my_lib.py
+  PYDEPS = ["ops"]
+  LIBID = "my_lib"
+  LIBAPI = 0
+  LIBPATCH = 1
+  EOF
+restore: |
+  pushd charm
+  charmcraft clean
+  popd
+  rm -rf charm
+execute: |
+  cd charm
+  charmcraft pack --verbose
+  test -f charm*.charm
+  unzip -p charm_*.charm venv/ops/version.py | MATCH "version = '2.0.0'"

tests/test_charm_builder.py

@@ -792,9 +792,10 @@ def test_build_dependencies_virtualenv_all(tmp_path, assert_output):
                 ":all:",
                 f"--requirement={reqs_file_1}",
                 f"--requirement={reqs_file_2}",
+                "pkg5",
+                "pkg6",
             ]
         ),
-        call([pip_cmd, "install", "--upgrade", "--no-binary", ":all:", "pkg5", "pkg6"]),
     ]
 
     site_packages_dir = charm_builder._find_venv_site_packages(pathlib.Path(STAGING_VENV_DIRNAME))

tests/test_providers.py

@@ -17,17 +17,16 @@
 import contextlib
 import pathlib
 import sys
-from unittest.mock import Mock, patch, call
+from unittest.mock import Mock, call, patch
 
 import pytest
+from charmcraft import providers
+from charmcraft.config import Base, BasesConfiguration
+from charmcraft.snap import CharmcraftSnapConfiguration
 from craft_cli import CraftError
 from craft_providers import ProviderError, bases, lxd, multipass
 from craft_providers.actions.snap_installer import Snap
 
-from charmcraft.config import Base, BasesConfiguration
-from charmcraft import providers
-from charmcraft.snap import CharmcraftSnapConfiguration
-
 
 @pytest.fixture()
 def mock_provider(mock_instance, fake_provider):