|
16 | 16 | )
|
17 | 17 | from ci_tools.build import cleanup_build_artifacts, create_package
|
18 | 18 | from ci_tools.parsing import ParsedSetup, parse_require
|
19 |
| -from ci_tools.functions import get_package_from_repo, find_whl, get_pip_list_output, pytest |
| 19 | +from ci_tools.functions import get_package_from_repo_or_folder, find_whl, get_pip_list_output, pytest |
20 | 20 | from .managed_virtual_env import ManagedVirtualEnv
|
21 | 21 |
|
22 | 22 |
|
@@ -71,6 +71,8 @@ def create_package_and_install(
|
71 | 71 | setup_py_path, distribution_directory, target_setup, package_type, force_create
|
72 | 72 | )
|
73 | 73 |
|
| 74 | + target_package = ParsedSetup.from_path(setup_py_path) |
| 75 | + |
74 | 76 | if skip_install:
|
75 | 77 | logging.info("Flag to skip install whl is passed. Skipping package installation")
|
76 | 78 | else:
|
@@ -116,6 +118,7 @@ def create_package_and_install(
|
116 | 118 | addition_necessary = True
|
117 | 119 | # get all installed packages
|
118 | 120 | installed_pkgs = get_pip_list_output(python_exe)
|
| 121 | + logging.info("Installed packages: {}".format(installed_pkgs)) |
119 | 122 |
|
120 | 123 | # parse the specifier
|
121 | 124 | req_name, req_specifier = parse_require(req)
|
@@ -150,7 +153,12 @@ def create_package_and_install(
|
150 | 153 |
|
151 | 154 | additional_downloaded_reqs = [
|
152 | 155 | os.path.abspath(os.path.join(tmp_dl_folder, pth)) for pth in os.listdir(tmp_dl_folder)
|
153 |
| - ] + [get_package_from_repo(relative_req).folder for relative_req in non_present_reqs] |
| 156 | + ] + [ |
| 157 | + get_package_from_repo_or_folder( |
| 158 | + package_name, os.path.join(target_package.folder, ".tmp_whl_dir") |
| 159 | + ) |
| 160 | + for package_name in non_present_reqs |
| 161 | + ] |
154 | 162 |
|
155 | 163 | commands = [python_exe, "-m", "pip", "install", built_pkg_path]
|
156 | 164 | commands.extend(additional_downloaded_reqs)
|
@@ -343,7 +351,9 @@ def prepare_and_test_optional(mapped_args: argparse.Namespace) -> int:
|
343 | 351 |
|
344 | 352 | if mapped_args.optional:
|
345 | 353 | if env_name != mapped_args.optional:
|
346 |
| - logging.info(f"{env_name} does not match targeted environment {mapped_args.optional}, skipping this environment.") |
| 354 | + logging.info( |
| 355 | + f"{env_name} does not match targeted environment {mapped_args.optional}, skipping this environment." |
| 356 | + ) |
347 | 357 | continue
|
348 | 358 |
|
349 | 359 | environment_exe = prepare_environment(mapped_args.target, mapped_args.temp_dir, env_name)
|
|
0 commit comments