Skip to content

Commit 1153f75

Browse files
fixes for ununtu 24.04 and debian 12
force `xz` compression type
1 parent 3704614 commit 1153f75

File tree

5 files changed

+35
-10
lines changed

5 files changed

+35
-10
lines changed

Diff for: .github/workflows/packing.yml

+25-6
Original file line numberDiff line numberDiff line change
@@ -408,7 +408,7 @@ jobs:
408408
if: (github.event_name == 'push') ||
409409
(github.event_name == 'pull_request' &&
410410
github.event.pull_request.head.repo.full_name != github.repository)
411-
runs-on: ubuntu-22.04
411+
runs-on: ubuntu-24.04
412412

413413
strategy:
414414
fail-fast: false
@@ -424,6 +424,7 @@ jobs:
424424
run: |
425425
sudo apt update
426426
sudo apt install -y devscripts equivs
427+
sudo apt install python3-setuptools python3-stdeb dh-python
427428
428429
- name: Make changelog entry for non-release build
429430
if: startsWith(github.ref, 'refs/tags') != true
@@ -467,8 +468,8 @@ jobs:
467468

468469
matrix:
469470
target:
470-
# - os: debian
471-
# dist: bullseye # 11
471+
- os: debian
472+
dist: bullseye # 11
472473
- os: debian
473474
dist: bookworm # 12
474475
- os: ubuntu
@@ -515,24 +516,42 @@ jobs:
515516
apt install -y python3-venv
516517
python3 -m venv .venv
517518
519+
- name: Install test requirements
520+
run: pip3 install -r requirements-test.txt
521+
if: matrix.target.dist != 'bookworm' && matrix.target.dist != 'noble'
522+
518523
- name: Install test requirements
519524
run: |
520525
. .venv/bin/activate
521526
pip3 install -r requirements-test.txt
527+
if: matrix.target.dist == 'bookworm' || matrix.target.dist == 'noble'
522528

523529
- name: Install the crud module for testing purposes
524530
run: |
525-
. .venv/bin/activate
526531
curl -L https://tarantool.io/release/2/installer.sh | bash
527532
apt install -y tt
528-
pip3 install cmake==3.15.3
529533
tt rocks install crud
534+
if: matrix.target.dist != 'bookworm' && matrix.target.dist != 'noble'
535+
536+
- name: Install the crud module for testing purposes
537+
run: |
538+
. .venv/bin/activate
539+
curl -L https://tarantool.io/release/3/installer.sh | bash
540+
apt install -y tt
541+
tt rocks install crud
542+
if: matrix.target.dist == 'bookworm' || matrix.target.dist == 'noble'
543+
544+
- name: Run tests
545+
run: make test-pure-install
546+
if: matrix.target.dist != 'bookworm' && matrix.target.dist != 'noble'
530547

531548
- name: Run tests
532549
run: |
533550
. .venv/bin/activate
534-
pip3 install pyyaml
551+
export PYTHONPATH=$PYTHONPATH:/usr/lib/python3.11:/usr/lib/python3.12:/usr/bin:/usr/lib/python3/dist-packages
552+
export PATH=$PATH:/usr/lib/python3/dist-packages
535553
make test-pure-install
554+
if: matrix.target.dist == 'bookworm' || matrix.target.dist == 'noble'
536555

537556
publish_deb:
538557
if: startsWith(github.ref, 'refs/tags')

Diff for: .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

Diff for: debian/control

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Section: python
44
Priority: optional
55
# See https://github.com/astraw/stdeb/issues/175 for dependencies
66
Build-Depends: python3, python3-dev, python3-pip, python3-setuptools,
7-
python3-distutils, python3-wheel, python3-stdeb, dh-python,
7+
python3-wheel, python3-stdeb, dh-python,
88
debhelper (>= 10)
99
Standards-Version: 3.9.1
1010
Homepage: https://github.com/tarantool/tarantool-python

Diff for: debian/rules

+4
Original file line numberDiff line numberDiff line change
@@ -18,3 +18,7 @@ override_dh_auto_install:
1818

1919
override_dh_python2:
2020
dh_python2 --no-guessing-versions
21+
22+
override_dh_builddeb:
23+
# Force `xz` compression for older system with dpkg version < 1.15.6
24+
dh_builddeb -- -Zxz

Diff for: 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)