Skip to content

Commit 520f282

Browse files
try to build deb on 24.04
force installation before test for 12/24.04 check install folder additionally update PYTHONPATH update test requirements reinstall python3 and check add /usr/bin to PYTHONPATH add /usr/lib/python3.11 to pythonpath fixes remove venv last chance for python install package after venv fix pathes remove debug prints
1 parent c0d12b0 commit 520f282

File tree

2 files changed

+5
-9
lines changed

2 files changed

+5
-9
lines changed

.github/workflows/packing.yml

+4-8
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
@@ -542,12 +543,6 @@ jobs:
542543
tt rocks install crud
543544
if: matrix.target.dist == 'bookworm' || matrix.target.dist == 'noble'
544545

545-
- name: Check content of the folder
546-
run: |
547-
apt install tree
548-
tree
549-
cat tarantool/version.py
550-
551546
- name: Run tests
552547
run: |
553548
make test-pure-install
@@ -556,7 +551,8 @@ jobs:
556551
- name: Run tests
557552
run: |
558553
. .venv/bin/activate
559-
export PYTHONPATH=$PYTHONPATH:.:./
554+
export PYTHONPATH=$PYTHONPATH:/usr/lib/python3.11:/usr/lib/python3.12:/usr/bin:/usr/lib/python3/dist-packages:/usr/lib/python3/dist-packages/tarantool
555+
export PATH=$PATH:/usr/lib/python3/dist-packages
560556
make test-pure-install
561557
if: matrix.target.dist == 'bookworm' || matrix.target.dist == 'noble'
562558

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

0 commit comments

Comments
 (0)