From 091ce8a1249a5e4675e4cde6b51e9e551956f299 Mon Sep 17 00:00:00 2001 From: Angus Gratton Date: Thu, 4 Jun 2020 18:39:20 +1000 Subject: [PATCH] msys2: Remove python version consideration in pacman commands --- tools/check_python_dependencies.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/check_python_dependencies.py b/tools/check_python_dependencies.py index b402ee0d2..4a66af600 100755 --- a/tools/check_python_dependencies.py +++ b/tools/check_python_dependencies.py @@ -80,7 +80,7 @@ if __name__ == "__main__": elif sys.platform == "win32" and os.environ.get("MSYSTEM", None) == "MINGW32" and "/mingw32/bin/python" in sys.executable: print("The recommended way to install a packages is via \"pacman\". Please run \"pacman -Ss \" for" " searching the package database and if found then " - "\"pacman -S mingw-w64-i686-python{}-\" for installing it.".format(sys.version_info[0],)) + "\"pacman -S mingw-w64-i686-python-\" for installing it.") print("NOTE: You may need to run \"pacman -Syu\" if your package database is older and run twice if the " "previous run updated \"pacman\" itself.") print("Please read https://github.com/msys2/msys2/wiki/Using-packages for further information about using " @@ -95,7 +95,7 @@ if __name__ == "__main__": continue elif requirement.startswith('setuptools'): print("Please run the following command to install MSYS2's MINGW Python setuptools package:") - print("pacman -S mingw-w64-i686-python{}-setuptools".format(sys.version_info[0],)) + print("pacman -S mingw-w64-i686-python-setuptools") continue else: print('Please follow the instructions found in the "Set up the tools" section of '