Merge pull request #20 from openlawlibrary/sbojanic/add-constraints-path-param

feat: add support for --constraints-path flag

Author: n-dusan

CHANGELOG.md

@@ -12,6 +12,10 @@ and this project adheres to a _modified_ form of _[Semantic Versioning][semver]_
 
 ### Changed
 
+- Add support for --constraints-path flag ([#20])
+
+[#20]: https://github.com/openlawlibrary/upgrade-python-package/pull/20
+
 ### Fixed
 
 ### Removed

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
@@ -563,6 +573,11 @@ def try_running_module(wheel, *args, **kwargs):
     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(
@@ -579,6 +594,7 @@ def upgrade_python_package(
     format_output=False,
     update_all=False,
     slack_webhook_url=None,
+    constraints_path=None,
     *vars,
 ):
     success = False
@@ -605,6 +621,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:
@@ -618,6 +635,7 @@ def upgrade_python_package(
                 cloudsmith_url,
                 update_all,
                 slack_webhook_url,
+                constraints_path,
                 *vars,
             )
     except Exception as e:
@@ -648,6 +666,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,
@@ -662,9 +681,11 @@ def main():
         format_output,
         update_all,
         slack_webhook_url,
+        constraints_path,
         *parsed_args.vars,
     )
 
 
 if __name__ == "__main__":
-    main()
+
+    main()

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

@@ -11,12 +11,13 @@
 original_executable = sys.executable
 
 VENV_PATH = Path(__file__).parent / "venv"
-REPOSITORY_WHEELS_PATH = Path(__file__).parent / "repository"
+DATA_PATH = Path(__file__).parent / "data"
+WHEELS_DIR = DATA_PATH / "wheels_dir"
 
 
 @pytest.fixture
 def wheels_dir():
-    return REPOSITORY_WHEELS_PATH
+    return WHEELS_DIR
 
 
 def pytest_configure(config):

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