From 14f4c196c0e2721b954156f4a0ca00dc1bee83f6 Mon Sep 17 00:00:00 2001 From: Angus Gratton Date: Thu, 4 Jun 2020 18:39:20 +1000 Subject: [PATCH] windows: Update other MSYS2 package names to all be Python 3 --- docs/README.md | 2 +- docs/en/contribute/documenting-code.rst | 4 ++-- tools/check_python_dependencies.py | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/README.md b/docs/README.md index 89a0db0a9..b0a4e5c2d 100644 --- a/docs/README.md +++ b/docs/README.md @@ -25,7 +25,7 @@ The above URLs are all for the master branch latest version. Click the drop-down If using Windows and the MSYS2 MINGW32 terminal, run this command before running "make html" the first time: ``` -pacman -S doxygen mingw-w64-i686-python2-pillow +pacman -S doxygen mingw-w64-i686-python-pillow ``` Note: Currently it is not possible to build docs on Windows without using a Unix-on-Windows layer such as MSYS2 MINGW32. diff --git a/docs/en/contribute/documenting-code.rst b/docs/en/contribute/documenting-code.rst index 990665dd6..f76f2201c 100644 --- a/docs/en/contribute/documenting-code.rst +++ b/docs/en/contribute/documenting-code.rst @@ -291,9 +291,9 @@ Installation of Doxygen is OS dependent: :: - $ pacman -S mingw32/mingw-w64-i686-python2-pillow + $ pacman -S mingw32/mingw-w64-i686-python-pillow - Check the log on the screen that ``mingw-w64-i686-python2-pillow-4.3.0-1`` is installed. Previous versions of *pillow* will not work. + Check the log on the screen that ``mingw-w64-i686-python-pillow-4.3.0-1`` is installed. Previous versions of *pillow* will not work. A downside of Windows installation is that fonts of the `blockdiag pictures ` do not render correctly, you will see some random characters instead. Until this issue is fixed, you can use the `interactive shell`_ to see how the complete picture looks like. diff --git a/tools/check_python_dependencies.py b/tools/check_python_dependencies.py index c04c4dbd8..eab74e884 100755 --- a/tools/check_python_dependencies.py +++ b/tools/check_python_dependencies.py @@ -67,7 +67,7 @@ if __name__ == "__main__": if 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 " @@ -82,7 +82,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 refer to the Get Started section of the ESP-IDF Programming Guide for setting up the required'