Skip to content

Package everything #248

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 18 commits into from
Nov 9, 2022
Merged

Package everything #248

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
ad6afab
make: remove obsolete build commands
DifferentialOrange Oct 31, 2022
8604fbb
python: use explicit binaries version
DifferentialOrange Nov 7, 2022
2424c82
make: separate phony for each target
DifferentialOrange Nov 7, 2022
5615211
ci: remove source code with script
DifferentialOrange Oct 19, 2022
aae6682
make: target for test pure install
DifferentialOrange Nov 7, 2022
790823b
setup: update description
DifferentialOrange Nov 8, 2022
7569ce0
setup: remove msgpack version dependency
DifferentialOrange Oct 28, 2022
8aecca6
cd: pack pip package
DifferentialOrange Oct 20, 2022
8cb948d
ci: run tests with pip package
DifferentialOrange Oct 20, 2022
5d604be
cd: publish pip package
DifferentialOrange Nov 7, 2022
9a32866
cd: pack RPM package
DifferentialOrange Nov 8, 2022
af4c956
test: make host more portable
DifferentialOrange Nov 8, 2022
2ebb83e
ci: run tests with RPM package
DifferentialOrange Nov 8, 2022
2b10313
cd: publish RPM package
DifferentialOrange Nov 8, 2022
c983db6
cd: pack deb package
DifferentialOrange Nov 8, 2022
e360e61
fix: timezone offset with old pytz and pandas
DifferentialOrange Nov 8, 2022
c6a2081
ci: run tests with deb package
DifferentialOrange Nov 8, 2022
b23193a
cd: publish deb package
DifferentialOrange Nov 8, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
python: use explicit binaries version 
Specify explicit Python 3 python3 and pip3 binaries everywhere to make
commands more portable.

Part of #198
  • Loading branch information
@DifferentialOrange
DifferentialOrange committed Nov 8, 2022
commit 8604fbb7b5341f8e8930342f609a2175d2cb2616
4 changes: 2 additions & 2 deletions .github/workflows/reusable_testing.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,9 @@ jobs:
python-version: 3.7

- name: Install connector requirements
run: pip install -r requirements.txt
run: pip3 install -r requirements.txt

- name: Install test requirements
run: pip install -r requirements-test.txt
run: pip3 install -r requirements-test.txt

- run: make test
26 changes: 13 additions & 13 deletions .github/workflows/testing.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,14 +76,14 @@ jobs:
# install of the newer msgpack package by overwriting it with sed.
if: matrix.msgpack-deps != ''
run: |
pip install ${{ matrix.msgpack-deps }}
pip3 install ${{ matrix.msgpack-deps }}
sed -i -e "s/^msgpack.*$/${{ matrix.msgpack-deps }}/" requirements.txt

- name: Install package requirements
run: pip install -r requirements.txt
run: pip3 install -r requirements.txt

- name: Install test requirements
run: pip install -r requirements-test.txt
run: pip3 install -r requirements-test.txt

- name: Run tests
run: make test
Expand Down Expand Up @@ -136,10 +136,10 @@ jobs:
python-version: ${{ matrix.python }}

- name: Install package requirements
run: pip install -r requirements.txt
run: pip3 install -r requirements.txt

- name: Install test requirements
run: pip install -r requirements-test.txt
run: pip3 install -r requirements-test.txt

- name: Run tests
run: |
Expand Down Expand Up @@ -191,13 +191,13 @@ jobs:
python-version: ${{ matrix.python }}

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

- name: Install test requirements
run: pip install -r requirements-test.txt
run: pip3 install -r requirements-test.txt

- name: Run tests
run: python -m unittest discover -v
run: python3 -m unittest discover -v
env:
TEST_PURE_INSTALL: true

Expand Down Expand Up @@ -235,10 +235,10 @@ jobs:
python-version: ${{ matrix.python }}

- name: Install connector requirements
run: pip install -r requirements.txt
run: pip3 install -r requirements.txt

- name: Install test requirements
run: pip install -r requirements-test.txt
run: pip3 install -r requirements-test.txt

- name: Setup WSL for tarantool
uses: Vampire/setup-wsl@v1
Expand Down Expand Up @@ -322,10 +322,10 @@ jobs:
python-version: ${{ matrix.python }}

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

- name: Install test requirements
run: pip install -r requirements-test.txt
run: pip3 install -r requirements-test.txt

- name: Setup WSL for tarantool
uses: Vampire/setup-wsl@v1
Expand All @@ -351,7 +351,7 @@ jobs:
REMOTE_TARANTOOL_HOST: localhost
REMOTE_TARANTOOL_CONSOLE_PORT: 3302
TEST_PURE_INSTALL: true
run: python -m unittest discover -v
run: python3 -m unittest discover -v

- name: Stop test tarantool instance
if: ${{ always() }}
Expand Down
12 changes: 6 additions & 6 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
.PHONY: install test docs
install:
pip install --editable .
pip3 install --editable .
test:
python setup.py test
python3 setup.py test
testdata:
cd ./test/data/; ./generate.sh
coverage:
python -m coverage run -p --source=. setup.py test
python3 -m coverage run -p --source=. setup.py test
cov-html:
python -m coverage html -i
python3 -m coverage html -i
cov-report:
python -m coverage report
python3 -m coverage report
docs:
python setup.py build_sphinx
python3 setup.py build_sphinx
8 changes: 4 additions & 4 deletions README.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ The recommended way to install the ``tarantool`` package is using ``pip``.

.. code-block:: bash

$ pip install tarantool
$ pip3 install tarantool

ZIP archive
^^^^^^^^^^^
Expand All @@ -42,7 +42,7 @@ You can also install the development version of the package using ``pip``.

.. code-block:: bash

$ pip install git+https://github.com/tarantool/tarantool-python.git@master
$ pip3 install git+https://github.com/tarantool/tarantool-python.git@master

--------------------------------------------------------------------------------

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

.. code-block:: bash

$ pip install -r docs/requirements.txt
$ pip3 install -r docs/requirements.txt

Then run

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

.. code-block:: bash

$ python -m http.server --directory build/sphinx/html
$ python3 -m http.server --directory build/sphinx/html

Open ``localhost:8000`` in your browser to read the docs.

Expand Down
2 changes: 1 addition & 1 deletion docs/source/index.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Install Tarantool Python connector with ``pip`` (`PyPI`_ page):

.. code-block:: bash

$ pip install tarantool
$ pip3 install tarantool

Source code is available on `GitHub`_.

Expand Down