Add python3 prefix before pip3

fbeitler · fbeitler · commit c5e8c162bfb8 · 2022-02-02T16:03:55.000+01:00
diff --git a/.github/pythonpackage.yml b/.github/pythonpackage.yml
@@ -15,8 +15,8 @@ jobs:
         python-version: '3.x'
     - name: Install dependencies
       run: |
-        python3 -m pip3 install --upgrade pip3
-        pip3 install setuptools wheel twine
+        python3 -m pip3  install --upgrade pip3
+        python3 -m pip3  install setuptools wheel twine
     - name: Build and publish
       env:
         TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }}
diff --git a/.github/pythonpublish.yml b/.github/pythonpublish.yml
@@ -16,7 +16,7 @@ jobs:
     - name: Install dependencies
       run: |
         python3 -m pip3 install --upgrade pip3
-        pip3 install setuptools wheel twine
+        python3 -m pip3  install setuptools wheel twine
     - name: Build and publish
       env:
         TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }}
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -117,8 +117,8 @@ jobs:
           architecture: '${{ matrix.arch.action }}'
       - name: Install
         run: |
-          pip3 install --upgrade pip3 setuptools wheel
-          pip3 install --upgrade tox
+          python3 -m pip3  install --upgrade pip3 setuptools wheel
+          python3 -m pip3  install --upgrade tox
       - uses: twisted/python-info-action@v1.0.1
       - name: Add PyPy Externals
         if: ${{ matrix.os.matrix == 'windows' && matrix.python.implementation == 'pypy'}}
@@ -204,8 +204,8 @@ jobs:
           fetch-depth: 0
       - name: Install
         run: |
-          pip3 install --upgrade pip3 setuptools wheel
-          pip3 install --upgrade tox
+          python3 -m pip3  install --upgrade pip3 setuptools wheel
+          python3 -m pip3  install --upgrade tox
       - uses: twisted/python-info-action@v1.0.1
       - name: Test
         continue-on-error: ${{ matrix.task.continue_on_error == true }}
@@ -251,9 +251,9 @@ jobs:
           fetch-depth: 0
       - name: Install
         run: |
-          pip3 install --upgrade pip3 setuptools wheel
-          pip3 install --upgrade tox
-          pip3 install --upgrade six
+          python3 -m pip3  install --upgrade pip3 setuptools wheel
+          python3 -m pip3  install --upgrade tox
+          python3 -m pip3  install --upgrade six
       - uses: twisted/python-info-action@v1.0.1
       - name: Download Coverage
         if: matrix.task.download_coverage
diff --git a/Makefile b/Makefile
@@ -25,40 +25,40 @@ install:
 	@test -d "$(VIRTUAL_ENV)" || mkdir -p "$(VIRTUAL_ENV)"
 	@test -x "$(VIRTUAL_ENV)/bin/python3" || virtualenv --quiet "$(VIRTUAL_ENV)"
 	@test -x "$(VIRTUAL_ENV)/bin/pip3" || easy_install pip
-	@pip3 install --upgrade --quiet --requirement=requirements.txt
-	@pip3 uninstall --yes pymodbus &>/dev/null || true
-	@pip3 install --quiet --no-deps --ignore-installed .
+	@python3 -m pip3  install --upgrade --quiet --requirement=requirements.txt
+	@python3 -m pip3  uninstall --yes pymodbus &>/dev/null || true
+	@python3 -m pip3  install --quiet --no-deps --ignore-installed .
 
 reset:
 	$(MAKE) clean
 	rm -Rf "$(VIRTUAL_ENV)"
 	$(MAKE) install
 
 check: install
-	@pip3 install --upgrade --quiet --requirement=requirements-checks.txt
+	@python3 -m pip3  install --upgrade --quiet --requirement=requirements-checks.txt
 	@flake8
 
 
 test: install
-	@pip3 install --upgrade --quiet --requirement=requirements-tests.txt
+	@python3 -m pip3  install --upgrade --quiet --requirement=requirements-tests.txt
 
     $(info Running tests on $(PYVER))
-    @pip3 install --upgrade pip3 --quiet
+    @python3 -m pip3  install --upgrade pip3 --quiet
     @pytest --cov=pymodbus/ --cov-report term-missing  test
     @coverage report --fail-under=85 -i
 
 
 tox: install
-	@pip3 install --upgrade --quiet tox && tox
+	@python3 -m pip3  install --upgrade --quiet tox && tox
 
 docs: install
-	@pip3 install --upgrade --quiet --requirement=requirements-docs.txt
+	@python3 -m pip3  install --upgrade --quiet --requirement=requirements-docs.txt
 	@cd doc && make clean && make html
 
 publish: install
 	git push origin && git push --tags origin
 	$(MAKE) clean
-	pip3 install --quiet twine wheel
+	python3 -m pip3  install --quiet twine wheel
 	python3 setup.py sdist bdist_wheel
 	twine upload dist/*
 	$(MAKE) clean
diff --git a/README.rst b/README.rst
@@ -141,19 +141,19 @@ commands in a terminal window (make sure you have correct
 permissions or a virtualenv currently running)::
 
     easy_install -U pymodbus
-    pip3 install  -U pymodbus
+    python3 -m pip3  install  -U pymodbus
 
 To Install pymodbus with twisted support run::
 
-    pip3 install -U pymodbus[twisted]
+    python3 -m pip3  install -U pymodbus[twisted]
 
 To Install pymodbus with tornado support run::
 
-    pip3 install -U pymodbus[tornado]
+    python3 -m pip3  install -U pymodbus[tornado]
 
 To Install pymodbus REPL::
 
-    pip3 install -U pymodbus[repl]
+    python3 -m pip3  install -U pymodbus[repl]
 
 Otherwise you can pull the trunk source and install from there::
 
diff --git a/doc/INSTALL b/doc/INSTALL
@@ -18,7 +18,7 @@ Installation
 
 To install the package from pypi, use either easy_install or pip3::
 
-    pip3 install  -U pymodbus
+    python3 -m pip3  install  -U pymodbus
     easy_install -U pymodbus
 
 As with other Python packages, the standard way of installing from source
diff --git a/doc/source/library/REPL.md b/doc/source/library/REPL.md
@@ -6,13 +6,13 @@ Depends on [prompt_toolkit](https://python-prompt-toolkit.readthedocs.io/en/stab
 
 Install dependencies
 ```
-$ pip3 install click prompt_toolkit --upgrade
+$ python3 -m pip3  install click prompt_toolkit --upgrade
 ```
 
 Or
 Install pymodbus with repl support
 ```
-$ pip3 install pymodbus[repl] --upgrade
+$ python3 -m pip3  install pymodbus[repl] --upgrade
 ```
 
 ## Usage Instructions
diff --git a/examples/contrib/concurrent_client.py b/examples/contrib/concurrent_client.py
@@ -17,7 +17,7 @@
 
 # we are using the future from the concurrent.futures released with
 # python3. Alternatively we will try the backported library::
-#   pip3 install futures
+#   python3 -m pip3  install futures
 try:
     from concurrent.futures import Future
 except ImportError:
diff --git a/examples/contrib/libmodbus_client.py b/examples/contrib/libmodbus_client.py
@@ -22,7 +22,7 @@
 For these to work, you must have `cffi` and `libmodbus-dev` installed:
 
     sudo apt-get install libmodbus-dev
-    pip3 install cffi
+    python3 -m pip3  install cffi
 """
 # -------------------------------------------------------------------------- #
 # import system libraries
diff --git a/examples/tools/test_install.sh b/examples/tools/test_install.sh
@@ -11,7 +11,7 @@ PACKAGE="pymodbus"
 # preflight tests
 # ------------------------------------------------------------------ #
 if [[ "`which pip`" != "" ]]; then
-    INSTALL="pip3 install -qU"
+    INSTALL="python3 -m pip3  install -qU"
 elif [[ "`which easy_install`" != "" ]]; then
     INSTALL="easy_install -qU"
 else
diff --git a/pymodbus/client/asynchronous/factory/serial.py b/pymodbus/client/asynchronous/factory/serial.py
@@ -102,7 +102,7 @@ def async_io_factory(port=None, framer=None, **kwargs):
         from serial_asyncio import create_serial_connection
     except ImportError:
         LOGGER.critical("pyserial-asyncio is not installed, "
-                        "install with 'pip3 install pyserial-asyncio")
+                        "install with 'python3 -m pip3  install pyserial-asyncio")
         import sys
         sys.exit(1)
 
diff --git a/pymodbus/repl/README.md b/pymodbus/repl/README.md
@@ -6,13 +6,13 @@ Depends on [prompt_toolkit](https://python-prompt-toolkit.readthedocs.io/en/stab
 
 Install dependencies
 ```
-$ pip3 install click prompt_toolkit --upgrade
+$ python3 -m pip3  install click prompt_toolkit --upgrade
 ```
 
 Or
 Install pymodbus with repl support
 ```
-$ pip3 install pymodbus[repl] --upgrade
+$ python3 -m pip3  install pymodbus[repl] --upgrade
 ```
 
 ## Usage Instructions
diff --git a/pymodbus/repl/client/main.py b/pymodbus/repl/client/main.py
@@ -8,13 +8,13 @@
 try:
     import click
 except ImportError:
-    print("click not installed!! Install with 'pip3 install click'")
+    print("click not installed!! Install with 'python3 -m pip3  install click'")
     exit(1)
 try:
     from prompt_toolkit import PromptSession, print_formatted_text
 except ImportError:
     print("prompt toolkit is not installed!! "
-          "Install with 'pip3 install prompt_toolkit --upgrade'")
+          "Install with 'python3 -m pip3  install prompt_toolkit --upgrade'")
     exit(1)
 
 from prompt_toolkit.lexers import PygmentsLexer
diff --git a/pymodbus/server/reactive/main.py b/pymodbus/server/reactive/main.py
@@ -18,7 +18,7 @@
     from aiohttp import web
 except ImportError as e:
     print("Reactive server requires aiohttp. "
-          "Please install with 'pip3 install aiohttp' and try again.")
+          "Please install with 'python3 -m pip3  install aiohttp' and try again.")
     exit(1)
 
 from pymodbus.server.async_io import (ModbusTcpServer,
diff --git a/tox.ini b/tox.ini
@@ -1,6 +1,6 @@
 # Tox (http://tox.testrun.org/) is a tool for running tests in multiple
 # virtualenvs. This configuration file will run the test suite on all supported
-# python versions. To use it, "pip3 install tox" and then run "tox" from this
+# python versions. To use it, "python3 -m pip3  install tox" and then run "tox" from this
 # directory.
 
 [tox]
