From b0e73d086671291d00a611ab2463a7493a6b4331 Mon Sep 17 00:00:00 2001 From: Jody Klymak Date: Mon, 22 Mar 2021 08:40:00 -0700 Subject: [PATCH] Backport PR #19757: Fixed python -mpip typo --- .appveyor.yml | 4 ++-- .circleci/config.yml | 12 ++++++------ .github/workflows/tests.yml | 18 +++++++++--------- doc/devel/development_setup.rst | 2 +- doc/faq/installing_faq.rst | 2 +- doc/faq/troubleshooting_faq.rst | 2 +- 6 files changed, 20 insertions(+), 20 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index b8b9bdb12b0c..0e8e0a553fd4 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -62,10 +62,10 @@ install: - conda install -c conda-forge pywin32 - echo %PYTHON_VERSION% %TARGET_ARCH% # Install dependencies from PyPI. - - python -mpip install --upgrade -r requirements/testing/all.txt %EXTRAREQS% %PINNEDVERS% + - python -m pip install --upgrade -r requirements/testing/all.txt %EXTRAREQS% %PINNEDVERS% # Install optional dependencies from PyPI. # Sphinx is needed to run sphinxext tests - - python -mpip install --upgrade sphinx + - python -m pip install --upgrade sphinx # Show the installed packages + versions - conda list diff --git a/.circleci/config.yml b/.circleci/config.yml index 1b9dc2a36852..838e11c84b37 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -54,9 +54,9 @@ commands: - run: name: Upgrade pip, setuptools, wheel command: | - python -mpip install --upgrade --user pip - python -mpip install --upgrade --user wheel - python -mpip install --upgrade --user setuptools + python -m pip install --upgrade --user pip + python -m pip install --upgrade --user wheel + python -m pip install --upgrade --user setuptools deps-install: parameters: @@ -67,14 +67,14 @@ commands: - run: name: Install Python dependencies command: | - python -mpip install --user numpy<< parameters.numpy_version >> codecov coverage - python -mpip install --user -r requirements/doc/doc-requirements.txt + python -m pip install --user numpy<< parameters.numpy_version >> codecov coverage + python -m pip install --user -r requirements/doc/doc-requirements.txt mpl-install: steps: - run: name: Install Matplotlib - command: python -mpip install --user -ve . + command: python -m pip install --user -ve . doc-build: steps: diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 155c8a5965ef..e5d7e064f55e 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -137,17 +137,17 @@ jobs: run: | # Upgrade pip and setuptools and wheel to get as clean an install as # possible. - python -mpip install --upgrade pip setuptools wheel + python -m pip install --upgrade pip setuptools wheel # Install dependencies from PyPI. - python -mpip install --upgrade $PRE \ + python -m pip install --upgrade $PRE \ cycler kiwisolver numpy pillow pyparsing python-dateutil \ -r requirements/testing/all.txt \ ${{ matrix.extra-requirements }} # Install optional dependencies from PyPI. # Sphinx is needed to run sphinxext tests - python -mpip install --upgrade sphinx + python -m pip install --upgrade sphinx # GUI toolkits are pip-installable only for some versions of Python # so don't fail if we can't install them. Make it easier to check @@ -160,8 +160,8 @@ jobs: # pycairo 1.20+ requires a new version of Cairo, unavailable on # Ubuntu 16.04, so PyGObject must be installed without build # isolation in order to pick up the lower pre-installed version. - python -mpip install --upgrade 'pycairo<1.20.0' 'cairocffi>=0.8' && - python -mpip install --upgrade --no-build-isolation PyGObject && + python -m pip install --upgrade 'pycairo<1.20.0' 'cairocffi>=0.8' && + python -m pip install --upgrade --no-build-isolation PyGObject && python -c 'import gi; gi.require_version("Gtk", "3.0"); from gi.repository import Gtk' && echo 'PyGObject is available' || echo 'PyGObject is not available' @@ -170,16 +170,16 @@ jobs: # Sept 2020) for either pyqt5 (there are only wheels for 10.13+) or # pyside2 (the latest version (5.13.2) with 10.12 wheels has a # fatal to us bug, it was fixed in 5.14.0 which has 10.13 wheels) - python -mpip install --upgrade pyqt5${{ matrix.pyqt5-ver }} && + python -m pip install --upgrade pyqt5${{ matrix.pyqt5-ver }} && python -c 'import PyQt5.QtCore' && echo 'PyQt5 is available' || echo 'PyQt5 is not available' - python -mpip install --upgrade pyside2 && + python -m pip install --upgrade pyside2 && python -c 'import PySide2.QtCore' && echo 'PySide2 is available' || echo 'PySide2 is not available' fi - python -mpip install --upgrade \ + python -m pip install --upgrade \ -f https://extras.wxpython.org/wxPython4/extras/linux/gtk3/ubuntu-16.04 \ wxPython && python -c 'import wx' && @@ -199,7 +199,7 @@ jobs: # All dependencies must have been pre-installed, so that the minver # constraints are held. - python -mpip install --no-deps -e . + python -m pip install --no-deps -e . if [[ "${{ runner.os }}" != 'macOS' ]]; then unset CPPFLAGS diff --git a/doc/devel/development_setup.rst b/doc/devel/development_setup.rst index 62184c2e66b7..d926f401c757 100644 --- a/doc/devel/development_setup.rst +++ b/doc/devel/development_setup.rst @@ -58,7 +58,7 @@ development source directory. This allows you to import your modified version of Matplotlib without re-installing after every change. Note that this is only true for ``*.py`` files. If you change the C-extension source (which might also happen if you change branches) you will have to re-run -``python -mpip install -ve .`` +``python -m pip install -ve .`` .. _test-dependencies: diff --git a/doc/faq/installing_faq.rst b/doc/faq/installing_faq.rst index dfcc5937cf0e..e1b97a505840 100644 --- a/doc/faq/installing_faq.rst +++ b/doc/faq/installing_faq.rst @@ -56,7 +56,7 @@ dependencies will be installed as well. If, for some reason, you cannot use the package manager, you may use the wheels available on PyPI:: - python -mpip install matplotlib + python -m pip install matplotlib or :ref:`build Matplotlib from source `. diff --git a/doc/faq/troubleshooting_faq.rst b/doc/faq/troubleshooting_faq.rst index c53b83108c25..f0644003201b 100644 --- a/doc/faq/troubleshooting_faq.rst +++ b/doc/faq/troubleshooting_faq.rst @@ -161,7 +161,7 @@ mode:: rm -rf /path/to/site-packages/matplotlib* git clean -xdf git pull - python -mpip install -v . > build.out + python -m pip install -v . > build.out python -c "from pylab import *; set_loglevel('debug'); plot(); show()" > run.out and post :file:`build.out` and :file:`run.out` to the `matplotlib-devel