feat: add support for --constraints-path flag

test: add tests for installation of local wheels with constraints
test: generated new wheels for testing

upgrade/scripts/upgrade_python_package.py

@@ -34,6 +34,7 @@ def upgrade_and_run(
     cloudsmith_url=None,
     update_all=False,
     slack_webhook_url=None,
+    constraints_path = None,
     *args,
 ):
     """
@@ -59,6 +60,7 @@ def upgrade_and_run(
             cloudsmith_url,
             update_all,
             slack_webhook_url,
+            constraints_path,
         )
     else:
         logging.info('Trying to upgrade "%s" package.', package_name)
@@ -67,6 +69,7 @@ def upgrade_and_run(
             cloudsmith_url,
             update_all,
             slack_webhook_url,
+            constraints_path,
             *args,
         )
     if not skip_post_install and (was_updated or force):
@@ -201,6 +204,7 @@ def install_wheel(
     version_cmd=None,
     update_all=False,
     slack_webhook_url=None,
+    constraints_path=None,
     *args,
 ):
     """
@@ -265,7 +269,7 @@ def install_wheel(
         resp += pip("check")
     except:
         # try to install with constraints
-        constraints_file_path = get_constraints_file_path(package_name)
+        constraints_file_path = constraints_path or get_constraints_file_path(package_name)
         try:
             resp += install_with_constraints(
                 to_install,
@@ -310,6 +314,7 @@ def upgrade_from_local_wheel(
     wheels_path=None,
     update_all=False,
     version=None,
+    constraints_path=None,
 ):
     resp = ""
     package_name, _ = split_package_name_and_extra(package_install_cmd)
@@ -321,6 +326,7 @@ def upgrade_from_local_wheel(
             wheels_path=wheels_path,
             update_all=update_all,
             version_cmd=version,
+            constraints_path=constraints_path,
         )
     except Exception as e:
         response_err = str(e)
@@ -337,6 +343,7 @@ def attempt_to_install_version(
     cloudsmith_url=None,
     update_all=False,
     slack_webhook_url=None,
+    constraints_path=None,
 ):
     """
     attempt to install a specific version of the given package
@@ -355,6 +362,7 @@ def attempt_to_install_version(
             version,
             update_all,
             slack_webhook_url,
+            constraints_path,
             *args,
         )
     except Exception as e:
@@ -369,6 +377,7 @@ def attempt_upgrade(
     cloudsmith_url=None,
     update_all=False,
     slack_webhook_url=None,
+    constraints_path=None,
     *args,
 ):
     """
@@ -390,6 +399,7 @@ def attempt_upgrade(
         None,
         update_all,
         slack_webhook_url,
+        constraints_path,
         *args,
     )
     was_upgraded = "Requirement already up-to-date" not in resp
@@ -561,6 +571,11 @@ def try_running_module(wheel, cloudsmith_url=None, slack_webhook_url=None, *args
     default=None,
     help="Slack webhook url string for sending slack notifications on failed upgrade",
 )
+parser.add_argument(
+    "--constraints-path",
+    action="store",
+    help="Path to constraints.txt file"
+)
 
 
 def upgrade_python_package(
@@ -577,6 +592,7 @@ def upgrade_python_package(
     format_output=False,
     update_all=False,
     slack_webhook_url=None,
+    constraints_path=None,
     *vars,
 ):
     success = False
@@ -603,6 +619,7 @@ def upgrade_python_package(
                 cloudsmith_url=cloudsmith_url,
                 update_all=update_all,
                 version=version,
+                constraints_path=constraints_path,
                 *vars,
             )
         elif should_run_initial_post_install:
@@ -616,6 +633,7 @@ def upgrade_python_package(
                 cloudsmith_url,
                 update_all,
                 slack_webhook_url,
+                constraints_path,
                 *vars,
             )
     except Exception as e:
@@ -646,6 +664,7 @@ def main():
     format_output = parsed_args.format_output
     update_all = parsed_args.update_all
     slack_webhook_url = parsed_args.slack_webhook_url
+    constraints_path = parsed_args.constraints_path
     upgrade_python_package(
         package,
         wheels_path,
@@ -660,6 +679,7 @@ def main():
         format_output,
         update_all,
         slack_webhook_url,
+        constraints_path,
         *parsed_args.vars,
     )
 

upgrade/scripts/utils.py

@@ -87,7 +87,7 @@ def run(*command, **kwargs):
         options.update(kwargs)
         completed = subprocess.run(command, **options)
     except subprocess.CalledProcessError as err:
-        logging.warning('Error occurred while running command "%s"', *command)
+        logging.warning('Error occurred while running command "%s"', " ".join(command))
         if err.stdout:
             print(err.stdout)
             logging.warning(err.stdout)

upgrade/tests/conftest.py

@@ -12,6 +12,7 @@
 
 VENV_PATH = Path(__file__).parent / "venv"
 REPOSITORY_WHEELS_PATH = Path(__file__).parent / "repository"
+DATA_PATH = Path(__file__).parent / "data"
 
 
 @pytest.fixture

upgrade/tests/data/test_constraints_flag/constraints.txt

@@ -0,0 +1,3 @@
+oll-test-top-level==2.0.2
+oll-dependency1==2.0.0
+oll-dependency2==2.0.0

upgrade/tests/upgrade_package/test_check_upgrade_from_local_wheel.py

@@ -1,4 +1,6 @@
 from upgrade.scripts.upgrade_python_package import upgrade_from_local_wheel
+from ..conftest import DATA_PATH
+from pathlib import Path
 
 
 def test_existing_dependencies_in_vm_when_expected_packages_are_not_installed_expect_false(
@@ -132,3 +134,61 @@ def test_upgrade_top_level_package_from_local_wheel_where_package_name_does_not_
     expected = "Failed to install wheel"
     actual = out
     assert expected in actual
+
+
+def test_upgrade_local_wheel_test_constraints_flag(
+    wheels_dir, use_pip, mocked_constraints_path
+):
+    package = "oll-test-top-level==2.0.2"
+    cut = upgrade_from_local_wheel
+    cut(
+        package,
+        skip_post_install=True,
+        wheels_path=str(wheels_dir),
+        constraints_path=str(Path(DATA_PATH) / "test_constraints_flag/constraints.txt"),
+        version="~=2.0.2",
+    )
+    dependencies_from_venv = use_pip(
+        "list",
+        "--format=freeze",
+        "--exclude-editable",
+    ).splitlines()
+
+    expected_packages = {
+        "oll-test-top-level==2.0.2",
+        "oll-dependency1==2.0.0",
+        "oll-dependency2==2.0.0",
+    }
+    actual_packages = set(dependencies_from_venv)
+
+    expected = True
+    actual = expected_packages.issubset(actual_packages)
+    assert actual == expected
+
+def test_upgrade_local_wheel_test_no_constraints_flag(
+    wheels_dir, use_pip, mocked_constraints_path
+):
+    package = "oll-test-top-level==2.0.2"
+    cut = upgrade_from_local_wheel
+    cut(
+        package,
+        skip_post_install=True,
+        wheels_path=str(wheels_dir),
+        version="~=2.0.2",
+    )
+    dependencies_from_venv = use_pip(
+        "list",
+        "--format=freeze",
+        "--exclude-editable",
+    ).splitlines()
+
+    expected_packages = {
+        "oll-test-top-level==2.0.2",
+        "oll-dependency1==2.0.2",
+        "oll-dependency2==2.0.2",
+    }
+    actual_packages = set(dependencies_from_venv)
+
+    expected = True
+    actual = expected_packages.issubset(actual_packages)
+    assert actual == expected