Skip to content

Commit c0d12b0

Browse files
test 3.3 bundle; test with python 3.9; fixes in the requirements
create and run venv in the beginning of the pipeline move cmake to the requirements remove venv separate install steps for 22 and 24 separate tests running for 22 and 24 move venv creation after python3-tarantool installation installer v.3 last change for this force installation of python3-tarantool on 24 add folder to path try to add to path by another way debug prints move debug prints to the separate folder turn back old ubuntu to build
1 parent 3704614 commit c0d12b0

File tree

3 files changed

+35
-7
lines changed

3 files changed

+35
-7
lines changed

.github/workflows/packing.yml

+30-4
Original file line numberDiff line numberDiff line change
@@ -506,7 +506,8 @@ jobs:
506506
path: deb_dist
507507

508508
- name: Install the package from deb artifacts
509-
run: apt install -y `pwd`/deb_dist/python3-tarantool_*.deb
509+
run: |
510+
apt install -y `pwd`/deb_dist/python3-tarantool_*.deb
510511
env:
511512
DEBIAN_FRONTEND: noninteractive
512513

@@ -515,24 +516,49 @@ jobs:
515516
apt install -y python3-venv
516517
python3 -m venv .venv
517518
519+
- name: Install test requirements
520+
run: |
521+
pip3 install -r requirements-test.txt
522+
if: matrix.target.dist != 'bookworm' && matrix.target.dist != 'noble'
523+
518524
- name: Install test requirements
519525
run: |
520526
. .venv/bin/activate
521527
pip3 install -r requirements-test.txt
528+
if: matrix.target.dist == 'bookworm' || matrix.target.dist == 'noble'
522529

523530
- name: Install the crud module for testing purposes
524531
run: |
525-
. .venv/bin/activate
526532
curl -L https://tarantool.io/release/2/installer.sh | bash
527533
apt install -y tt
528-
pip3 install cmake==3.15.3
529534
tt rocks install crud
535+
if: matrix.target.dist != 'bookworm' && matrix.target.dist != 'noble'
536+
537+
- name: Install the crud module for testing purposes
538+
run: |
539+
. .venv/bin/activate
540+
curl -L https://tarantool.io/release/3/installer.sh | bash
541+
apt install -y tt
542+
tt rocks install crud
543+
if: matrix.target.dist == 'bookworm' || matrix.target.dist == 'noble'
544+
545+
- name: Check content of the folder
546+
run: |
547+
apt install tree
548+
tree
549+
cat tarantool/version.py
550+
551+
- name: Run tests
552+
run: |
553+
make test-pure-install
554+
if: matrix.target.dist != 'bookworm' && matrix.target.dist != 'noble'
530555

531556
- name: Run tests
532557
run: |
533558
. .venv/bin/activate
534-
pip3 install pyyaml
559+
export PYTHONPATH=$PYTHONPATH:.:./
535560
make test-pure-install
561+
if: matrix.target.dist == 'bookworm' || matrix.target.dist == 'noble'
536562

537563
publish_deb:
538564
if: startsWith(github.ref, 'refs/tags')

.github/workflows/testing.yml

+3-1
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,9 @@ jobs:
150150
tarantool:
151151
- bundle: 'sdk-gc64-2.11.0-0-r563.linux.x86_64'
152152
path: 'release/linux/x86_64/2.11/'
153-
python: ['3.11']
153+
- bundle: 'sdk-gc64-3.3.1-0-r55.linux.x86_64'
154+
path: 'release/linux/x86_64/3.3/'
155+
python: ['3.9', '3.11']
154156

155157
steps:
156158
- name: Clone the connector

requirements-test.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
git+https://github.com/baztian/dbapi-compliance.git@ea7cb1b4#egg=dbapi-compliance
2-
pyyaml == 6.0.2
2+
pyyaml >= 6.0.2
33
importlib-metadata >= 1.0 ; python_version < '3.8'
44
pylint == 3.3.0 ; python_version >= '3.9'
55
pylint == 3.2.7 ; python_version == '3.8'
@@ -9,4 +9,4 @@ flake8 == 5.0.4 ; python_version < '3.8'
99
codespell == 2.3.0 ; python_version >= '3.8'
1010
codespell == 2.2.5 ; python_version < '3.8'
1111
setuptools >= 75.3.2
12-
tarantool >= 1.2.0
12+
cmake == 3.15.3

0 commit comments

Comments
 (0)