Replace pip with pip3

Author: fbeitler

.github/pythonpackage.yml

@@ -15,8 +15,8 @@ jobs:
         python-version: '3.x'
     - name: Install dependencies
       run: |
-        python3 -m pip install --upgrade pip
-        pip install setuptools wheel twine
+        python3 -m pip3 install --upgrade pip3
+        pip3 install setuptools wheel twine
     - name: Build and publish
       env:
         TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }}

.github/pythonpublish.yml

@@ -15,8 +15,8 @@ jobs:
         python-version: '3.x'
     - name: Install dependencies
       run: |
-        python -m pip install --upgrade pip
-        pip install setuptools wheel twine
+        python -m pip3 install --upgrade pip3
+        pip3 install setuptools wheel twine
     - name: Build and publish
       env:
         TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }}

.github/workflows/ci.yml

@@ -117,8 +117,8 @@ jobs:
           architecture: '${{ matrix.arch.action }}'
       - name: Install
         run: |
-          pip install --upgrade pip setuptools wheel
-          pip install --upgrade tox
+          pip3 install --upgrade pip3 setuptools wheel
+          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: |
-          pip install --upgrade pip setuptools wheel
-          pip install --upgrade tox
+          pip3 install --upgrade pip3 setuptools wheel
+          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: |
-          pip install --upgrade pip setuptools wheel
-          pip install --upgrade tox
-          pip install --upgrade six
+          pip3 install --upgrade pip3 setuptools wheel
+          pip3 install --upgrade tox
+          pip3 install --upgrade six
       - uses: twisted/python-info-action@v1.0.1
       - name: Download Coverage
         if: matrix.task.download_coverage

Makefile

@@ -25,40 +25,40 @@ install:
 	@test -d "$(VIRTUAL_ENV)" || mkdir -p "$(VIRTUAL_ENV)"
 	@test -x "$(VIRTUAL_ENV)/bin/python" || virtualenv --quiet "$(VIRTUAL_ENV)"
 	@test -x "$(VIRTUAL_ENV)/bin/pip" || easy_install pip
-	@pip install --upgrade --quiet --requirement=requirements.txt
-	@pip uninstall --yes pymodbus &>/dev/null || true
-	@pip install --quiet --no-deps --ignore-installed .
+	@pip3 install --upgrade --quiet --requirement=requirements.txt
+	@pip3 uninstall --yes pymodbus &>/dev/null || true
+	@pip3 install --quiet --no-deps --ignore-installed .
 
 reset:
 	$(MAKE) clean
 	rm -Rf "$(VIRTUAL_ENV)"
 	$(MAKE) install
 
 check: install
-	@pip install --upgrade --quiet --requirement=requirements-checks.txt
+	@pip3 install --upgrade --quiet --requirement=requirements-checks.txt
 	@flake8
 
 
 test: install
-	@pip install --upgrade --quiet --requirement=requirements-tests.txt
+	@pip3 install --upgrade --quiet --requirement=requirements-tests.txt
 
     $(info Running tests on $(PYVER))
-    @pip install --upgrade pip --quiet
+    @pip3 install --upgrade pip3 --quiet
     @pytest --cov=pymodbus/ --cov-report term-missing  test
     @coverage report --fail-under=85 -i
 
 
 tox: install
-	@pip install --upgrade --quiet tox && tox
+	@pip3 install --upgrade --quiet tox && tox
 
 docs: install
-	@pip install --upgrade --quiet --requirement=requirements-docs.txt
+	@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
-	pip install --quiet twine wheel
+	pip3 install --quiet twine wheel
 	python setup.py sdist bdist_wheel
 	twine upload dist/*
 	$(MAKE) clean

README.rst

@@ -136,24 +136,24 @@ For more info on REPL refer  `Pymodbus REPL <https://github.com/riptideio/pymodb
 Installing
 ------------------------------------------------------------
 
-You can install using pip or easy install by issuing the following
+You can install using pip3 or easy install by issuing the following
 commands in a terminal window (make sure you have correct
 permissions or a virtualenv currently running)::
 
     easy_install -U pymodbus
-    pip install  -U pymodbus
+    pip3 install  -U pymodbus
 
 To Install pymodbus with twisted support run::
 
-    pip install -U pymodbus[twisted]
+    pip3 install -U pymodbus[twisted]
 
 To Install pymodbus with tornado support run::
 
-    pip install -U pymodbus[tornado]
+    pip3 install -U pymodbus[tornado]
 
 To Install pymodbus REPL::
 
-    pip install -U pymodbus[repl]
+    pip3 install -U pymodbus[repl]
 
 Otherwise you can pull the trunk source and install from there::
 

doc/INSTALL

@@ -16,9 +16,9 @@ The Windows IOCP reactor requires pywin32 build 205 or later.
 Installation
 -------------
 
-To install the package from pypi, use either easy_install or pip::
+To install the package from pypi, use either easy_install or pip3::
 
-    pip install  -U pymodbus
+    pip3 install  -U pymodbus
     easy_install -U pymodbus
 
 As with other Python packages, the standard way of installing from source

doc/source/library/REPL.md

@@ -6,13 +6,13 @@ Depends on [prompt_toolkit](https://python-prompt-toolkit.readthedocs.io/en/stab
 
 Install dependencies
 ```
-$ pip install click prompt_toolkit --upgrade
+$ pip3 install click prompt_toolkit --upgrade
 ```
 
 Or
 Install pymodbus with repl support
 ```
-$ pip install pymodbus[repl] --upgrade
+$ pip3 install pymodbus[repl] --upgrade
 ```
 
 ## Usage Instructions

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::
-#   pip install futures
+#   pip3 install futures
 try:
     from concurrent.futures import Future
 except ImportError:

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
-    pip install cffi
+    pip3 install cffi
 """
 # -------------------------------------------------------------------------- #
 # import system libraries

examples/tools/test_install.sh

@@ -11,7 +11,7 @@ PACKAGE="pymodbus"
 # preflight tests
 # ------------------------------------------------------------------ #
 if [[ "`which pip`" != "" ]]; then
-    INSTALL="pip install -qU"
+    INSTALL="pip3 install -qU"
 elif [[ "`which easy_install`" != "" ]]; then
     INSTALL="easy_install -qU"
 else