Skip to content

Commit 3e25e2f

Browse files
DifferentialOrangeDifferentialOrange
committed
python: use explicit binaries version
Specify explicit Python 3 python3 and pip3 binaries everywhere to make commands more portable. Part of #198
1 parent ade910c commit 3e25e2f

File tree

5 files changed

+26
-26
lines changed

5 files changed

+26
-26
lines changed

Diff for: ‎.github/workflows/reusable_testing.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@ jobs:
3434
python-version: 3.7
3535

3636
- name: Install connector requirements
37-
run: pip install -r requirements.txt
37+
run: pip3 install -r requirements.txt
3838

3939
- name: Install test requirements
40-
run: pip install -r requirements-test.txt
40+
run: pip3 install -r requirements-test.txt
4141

4242
- run: make test

Diff for: ‎.github/workflows/testing.yml

+13-13
Original file line numberDiff line numberDiff line change
@@ -76,14 +76,14 @@ jobs:
7676
# install of the newer msgpack package by overwriting it with sed.
7777
if: matrix.msgpack-deps != ''
7878
run: |
79-
pip install ${{ matrix.msgpack-deps }}
79+
pip3 install ${{ matrix.msgpack-deps }}
8080
sed -i -e "s/^msgpack.*$/${{ matrix.msgpack-deps }}/" requirements.txt
8181
8282
- name: Install package requirements
83-
run: pip install -r requirements.txt
83+
run: pip3 install -r requirements.txt
8484

8585
- name: Install test requirements
86-
run: pip install -r requirements-test.txt
86+
run: pip3 install -r requirements-test.txt
8787

8888
- name: Run tests
8989
run: make test
@@ -136,10 +136,10 @@ jobs:
136136
python-version: ${{ matrix.python }}
137137

138138
- name: Install package requirements
139-
run: pip install -r requirements.txt
139+
run: pip3 install -r requirements.txt
140140

141141
- name: Install test requirements
142-
run: pip install -r requirements-test.txt
142+
run: pip3 install -r requirements-test.txt
143143

144144
- name: Run tests
145145
run: |
@@ -191,13 +191,13 @@ jobs:
191191
python-version: ${{ matrix.python }}
192192

193193
- name: Install the package with pip
194-
run: pip install git+$GITHUB_SERVER_URL/$GITHUB_REPOSITORY@$GITHUB_REF_NAME
194+
run: pip3 install git+$GITHUB_SERVER_URL/$GITHUB_REPOSITORY@$GITHUB_REF_NAME
195195

196196
- name: Install test requirements
197-
run: pip install -r requirements-test.txt
197+
run: pip3 install -r requirements-test.txt
198198

199199
- name: Run tests
200-
run: python -m unittest discover -v
200+
run: python3 -m unittest discover -v
201201
env:
202202
TEST_PURE_INSTALL: true
203203

@@ -235,10 +235,10 @@ jobs:
235235
python-version: ${{ matrix.python }}
236236

237237
- name: Install connector requirements
238-
run: pip install -r requirements.txt
238+
run: pip3 install -r requirements.txt
239239

240240
- name: Install test requirements
241-
run: pip install -r requirements-test.txt
241+
run: pip3 install -r requirements-test.txt
242242

243243
- name: Setup WSL for tarantool
244244
uses: Vampire/setup-wsl@v1
@@ -322,10 +322,10 @@ jobs:
322322
python-version: ${{ matrix.python }}
323323

324324
- name: Install the package with pip
325-
run: pip install git+$env:GITHUB_SERVER_URL/$env:GITHUB_REPOSITORY@$env:GITHUB_REF_NAME
325+
run: pip3 install git+$env:GITHUB_SERVER_URL/$env:GITHUB_REPOSITORY@$env:GITHUB_REF_NAME
326326

327327
- name: Install test requirements
328-
run: pip install -r requirements-test.txt
328+
run: pip3 install -r requirements-test.txt
329329

330330
- name: Setup WSL for tarantool
331331
uses: Vampire/setup-wsl@v1
@@ -351,7 +351,7 @@ jobs:
351351
REMOTE_TARANTOOL_HOST: localhost
352352
REMOTE_TARANTOOL_CONSOLE_PORT: 3302
353353
TEST_PURE_INSTALL: true
354-
run: python -m unittest discover -v
354+
run: python3 -m unittest discover -v
355355

356356
- name: Stop test tarantool instance
357357
if: ${{ always() }}

Diff for: ‎Makefile

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
.PHONY: install test docs
22
install:
3-
pip install --editable .
3+
pip3 install --editable .
44
test:
5-
python setup.py test
5+
python3 setup.py test
66
testdata:
77
cd ./test/data/; ./generate.sh
88
coverage:
9-
python -m coverage run -p --source=. setup.py test
9+
python3 -m coverage run -p --source=. setup.py test
1010
cov-html:
11-
python -m coverage html -i
11+
python3 -m coverage html -i
1212
cov-report:
13-
python -m coverage report
13+
python3 -m coverage report
1414
docs:
15-
python setup.py build_sphinx
15+
python3 setup.py build_sphinx

Diff for: ‎README.rst

+4-4
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ The recommended way to install the ``tarantool`` package is using ``pip``.
2424

2525
.. code-block:: bash
2626
27-
$ pip install tarantool
27+
$ pip3 install tarantool
2828
2929
ZIP archive
3030
^^^^^^^^^^^
@@ -42,7 +42,7 @@ You can also install the development version of the package using ``pip``.
4242

4343
.. code-block:: bash
4444
45-
$ pip install git+https://github.com/tarantool/tarantool-python.git@master
45+
$ pip3 install git+https://github.com/tarantool/tarantool-python.git@master
4646
4747
--------------------------------------------------------------------------------
4848

@@ -112,7 +112,7 @@ To build documentation, first you must install its build requirements:
112112

113113
.. code-block:: bash
114114
115-
$ pip install -r docs/requirements.txt
115+
$ pip3 install -r docs/requirements.txt
116116
117117
Then run
118118

@@ -124,7 +124,7 @@ You may host local documentation server with
124124

125125
.. code-block:: bash
126126
127-
$ python -m http.server --directory build/sphinx/html
127+
$ python3 -m http.server --directory build/sphinx/html
128128
129129
Open ``localhost:8000`` in your browser to read the docs.
130130

Diff for: ‎docs/source/index.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ Install Tarantool Python connector with ``pip`` (`PyPI`_ page):
1212

1313
.. code-block:: bash
1414
15-
$ pip install tarantool
15+
$ pip3 install tarantool
1616
1717
Source code is available on `GitHub`_.
1818

0 commit comments

Comments
 (0)