Skip to content

Commit c9c4768

Browse files
author
fbeitler
committed
Replace normal python commands with python3
1 parent 4c11299 commit c9c4768

File tree

9 files changed

+18
-18
lines changed

9 files changed

+18
-18
lines changed

.github/pythonpublish.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@ jobs:
1515
python-version: '3.x'
1616
- name: Install dependencies
1717
run: |
18-
python -m pip3 install --upgrade pip3
18+
python3 -m pip3 install --upgrade pip3
1919
pip3 install setuptools wheel twine
2020
- name: Build and publish
2121
env:
2222
TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }}
2323
TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
2424
run: |
25-
python setup.py sdist bdist_wheel
25+
python3 setup.py sdist bdist_wheel
2626
twine upload dist/*

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ jobs:
130130
mkdir --parents $(dirname $PYPY_EXTERNALS_PATH)
131131
hg clone https://foss.heptapod.net/pypy/externals/ $PYPY_EXTERNALS_PATH
132132
dir $PYPY_EXTERNALS_PATH
133-
cd $PYPY_EXTERNALS_PATH && hg update win$(python -c 'import struct; print(struct.calcsize("P") * 8)')_14x
133+
cd $PYPY_EXTERNALS_PATH && hg update win$(python3 -c 'import struct; print(struct.calcsize("P") * 8)')_14x
134134
echo "INCLUDE=$PYPY_EXTERNALS_PATH/include;$INCLUDE" >> $GITHUB_ENV
135135
echo "LIB=$PYPY_EXTERNALS_PATH/lib;$LIB" >> $GITHUB_ENV
136136
# echo "CL=${{ matrix.PYTHON.CL_FLAGS }}" >> $GITHUB_ENV

Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ default:
2323

2424
install:
2525
@test -d "$(VIRTUAL_ENV)" || mkdir -p "$(VIRTUAL_ENV)"
26-
@test -x "$(VIRTUAL_ENV)/bin/python" || virtualenv --quiet "$(VIRTUAL_ENV)"
27-
@test -x "$(VIRTUAL_ENV)/bin/pip" || easy_install pip
26+
@test -x "$(VIRTUAL_ENV)/bin/python3" || virtualenv --quiet "$(VIRTUAL_ENV)"
27+
@test -x "$(VIRTUAL_ENV)/bin/pip3" || easy_install pip
2828
@pip3 install --upgrade --quiet --requirement=requirements.txt
2929
@pip3 uninstall --yes pymodbus &>/dev/null || true
3030
@pip3 install --quiet --no-deps --ignore-installed .
@@ -59,7 +59,7 @@ publish: install
5959
git push origin && git push --tags origin
6060
$(MAKE) clean
6161
pip3 install --quiet twine wheel
62-
python setup.py sdist bdist_wheel
62+
python3 setup.py sdist bdist_wheel
6363
twine upload dist/*
6464
$(MAKE) clean
6565

README.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ Otherwise you can pull the trunk source and install from there::
159159

160160
git clone git://github.com/bashwork/pymodbus.git
161161
cd pymodbus
162-
python setup.py install
162+
python3 setup.py install
163163

164164
Either method will install all the required dependencies
165165
(at their appropriate versions) for your current python distribution.

doc/INSTALL

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ To install the package from pypi, use either easy_install or pip3::
2424
As with other Python packages, the standard way of installing from source
2525
is (as root or administrator)::
2626

27-
python setup.py install
27+
python3 setup.py install
2828

2929

3030
Running Tests
@@ -34,7 +34,7 @@ The tests can be run with the built in unittest module, however, it is
3434
much easier to run with the nose package. With that installed, you can
3535
use either of the following::
3636

37-
python setup.py test
37+
python3 setup.py test
3838
pytest
3939

4040

@@ -44,7 +44,7 @@ Building Documentation
4444
The documentation is written in restructured text using the sphinx module.
4545
Building it is as simple as::
4646

47-
python setup build_sphinx
47+
python3 setup build_sphinx
4848

4949
The API documents can be generated using one of four programs:
5050

@@ -56,7 +56,7 @@ The API documents can be generated using one of four programs:
5656
To bulid these, simply run the following command and the available
5757
packages will sipmly be built::
5858

59-
python setup.py build_apidocs
59+
python3 setup.py build_apidocs
6060

6161

6262
Quality Tests
@@ -65,7 +65,7 @@ Quality Tests
6565
There are a number of quality tests that can be run against the code base
6666
aside from unit tests::
6767

68-
python setup.py scan_2to3 # run a python3 compatability test
69-
python setup.py pep8 # run a pop8 standards test
70-
python setup.py lint # run a lint test
68+
python3 setup.py scan_2to3 # run a python3 compatability test
69+
python3 setup.py pep8 # run a pop8 standards test
70+
python3 setup.py lint # run a lint test
7171

examples/tools/reindent.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/usr/bin/python
1+
#!/usr/bin/python3
22
"""reindent [-d][-r][-v] path ...
33
44
-d Dry run. Analyze, but don't make any changes to, files.

examples/tools/test_install.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ fi
5353
# library test
5454
# ------------------------------------------------------------------ #
5555
echo -n "Testing python version..."
56-
python -c "import pymodbus;print pymodbus.version.version"
56+
python3 -c "import pymodbus;print pymodbus.version.version"
5757
if [[ "$?" == "0" ]]; then
5858
echo -e "\E[32mPassed\E[0m"
5959
else

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
Installs pymodbus using setuptools
44
55
Run:
6-
python setup.py install
6+
python3 setup.py install
77
to install the package from the source archive.
88
99
For information about setuptools

setup_commands.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ def run(self):
3131
directories = (d for d in os.listdir('./doc/api') if not d.startswith('.'))
3232
for entry in directories:
3333
os.chdir('./doc/api/%s' % entry)
34-
os.system('python build.py')
34+
os.system('python3 build.py')
3535
os.chdir(old_cwd)
3636

3737

0 commit comments

Comments
 (0)