From 37134305c4c60fbecff1c7bdf19f8455d8bfce61 Mon Sep 17 00:00:00 2001
From: n-dusan <nikolic.dusan.dey@gmail.com>
Date: Sun, 29 Oct 2023 21:39:11 +0100
Subject: [PATCH] fix(tests): get tests working for linux

---
 setup.cfg                                 |  2 +-
 upgrade/scripts/manage_venv.py            |  6 +++---
 upgrade/scripts/slack.py                  |  2 +-
 upgrade/scripts/upgrade_python_package.py |  8 +++++---
 upgrade/scripts/utils.py                  |  2 +-
 upgrade/tests/manage_venv/conftest.py     | 14 ++++++++------
 6 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index 3bbd5d5..e797283 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -33,7 +33,7 @@ include_package_data = True
 package_dir =
     upgrade = upgrade
 test_suite = tests
-setup_requires = setuptools_scm < 7.0.0;
+setup_requires = setuptools_scm
 
 [options.extras_require]
 dev =
diff --git a/upgrade/scripts/manage_venv.py b/upgrade/scripts/manage_venv.py
index 6572f19..0e29870 100644
--- a/upgrade/scripts/manage_venv.py
+++ b/upgrade/scripts/manage_venv.py
@@ -34,7 +34,7 @@ def ensure_pip(venv_executable, *args, **kwargs):
     try:
         return run(*((venv_executable, "-m", "ensurepip") + args), **kwargs)
     except subprocess.CalledProcessError as e:
-        logging.error("Error occurred while running pip in venv %s", str(e))
+        logging.error(f"Error occurred while running pip in venv {str(e)}")
         raise e
 
 
@@ -42,7 +42,7 @@ def venv(*args, **kwargs):
     try:
         return run(*((sys.executable, "-m", "venv", "--without-pip") + args), **kwargs)
     except subprocess.CalledProcessError as e:
-        logging.error("Error occurred while creating venv %s", str(e))
+        logging.error(f"Error occurred while creating venv {str(e)}" )
         raise e
 
 
@@ -130,7 +130,7 @@ def upgrade_venv(
             if update_from_local_wheels:
                 upgrade_args.append("--update-from-local-wheels")
 
-            result += run(*(upgrade_args))
+            result += run(*(upgrade_args), check=False)
 
         return result
     except Exception as e:
diff --git a/upgrade/scripts/slack.py b/upgrade/scripts/slack.py
index ab08187..1eb7375 100644
--- a/upgrade/scripts/slack.py
+++ b/upgrade/scripts/slack.py
@@ -1,6 +1,6 @@
 import os
 
-import pip._vendor.requests as requests
+import requests
 
 from .exceptions import SlackError
 
diff --git a/upgrade/scripts/upgrade_python_package.py b/upgrade/scripts/upgrade_python_package.py
index 4d6b142..5e88c8f 100644
--- a/upgrade/scripts/upgrade_python_package.py
+++ b/upgrade/scripts/upgrade_python_package.py
@@ -201,8 +201,10 @@ def install_wheel(
     package_name, extra = split_package_name_and_extra(package_name)
     if local:
         try:
-            wheel_paths = glob.glob(
-                f'{wheels_path}/{package_name.replace("-", "_").replace("==","-")}*.whl'
+            wheel_paths = sorted(
+                glob.glob(
+                    f'{wheels_path}/{package_name.replace("-", "_").replace("==","-")}*.whl'
+                )
             )
             wheel_names = [Path(path).name for path in wheel_paths]
             parsed_wheel_versions = [
@@ -506,7 +508,7 @@ def run(*command, **kwargs):
         options = dict(
             stdout=subprocess.PIPE,
             stderr=subprocess.STDOUT,
-            check=True,
+            check=kwargs.pop("check", True),
             universal_newlines=True,
         )
         options.update(kwargs)
diff --git a/upgrade/scripts/utils.py b/upgrade/scripts/utils.py
index 78d16c9..7db074c 100644
--- a/upgrade/scripts/utils.py
+++ b/upgrade/scripts/utils.py
@@ -19,7 +19,7 @@ def get_venv_executable(venv_path: str) -> str:
     if is_windows():
         return str(Path(venv_path, "Scripts", "python.exe").absolute())
     else:
-        return str(Path(venv_path, "bin", "python").absolute())
+        return str(Path(venv_path, "bin", "python3").absolute())
 
 
 def is_windows() -> bool:
diff --git a/upgrade/tests/manage_venv/conftest.py b/upgrade/tests/manage_venv/conftest.py
index c8a8a46..c4654bf 100644
--- a/upgrade/tests/manage_venv/conftest.py
+++ b/upgrade/tests/manage_venv/conftest.py
@@ -120,10 +120,12 @@ def mock_package_index_html():
 
 def install_upgrade_python_package(venv_executable, upgrade_python_package_version):
     run(
-        venv_executable,
-        "-m",
-        "pip",
-        "install",
-        "-e",
-        f"{str(UPGRADE_PYTHON_PACKAGE_REPOSITORY_PATH)}",
+        *([
+            venv_executable,
+            "-m",
+            "pip",
+            "install",
+            "-e",
+            f"{str(UPGRADE_PYTHON_PACKAGE_REPOSITORY_PATH)}",
+        ])
     )