Skip to content

Commit d1a90aa

Browse files
olethanhhoh
authored andcommitted
Create an intermediate venv with the proper setup tools version
1 parent 346325f commit d1a90aa

File tree

3 files changed

+6
-5
lines changed

3 files changed

+6
-5
lines changed

packaging/Makefile

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,12 @@ debian-package-code:
1515
cp ../examples/instance_message_from_aleph.json ./aleph-vm/opt/aleph-vm/examples/instance_message_from_aleph.json
1616
cp -r ../examples/data ./aleph-vm/opt/aleph-vm/examples/data
1717
mkdir -p ./aleph-vm/opt/aleph-vm/examples/volumes
18+
# Making a venv to build the wheel. to work arround a strange problem while building the wheel
19+
python3 -m venv build_venv
20+
build_venv/bin/pip install --progress-bar off --upgrade pip setuptools wheel
1821
# Fixing this protobuf dependency version to avoid getting CI errors as version 5.29.0 have this compilation issue
19-
pip3 install -U setuptools setuptools_scm wheel
20-
pip3 install --progress-bar off --target ./aleph-vm/opt/aleph-vm/ setuptools setuptools_scm wheel
21-
pip3 install --progress-bar off --target ./aleph-vm/opt/aleph-vm/ 'setuptools>=61' 'aleph-message==0.6' 'eth-account==0.10' 'sentry-sdk==1.31.0' 'qmp==1.1.0' 'aleph-superfluid~=0.2.1' 'sqlalchemy[asyncio]>=2.0' 'aiosqlite==0.19.0' 'alembic==1.13.1' 'aiohttp_cors==0.7.0' 'pyroute2==0.7.12' 'python-cpuid==0.1.0' 'solathon==1.0.2' 'protobuf==5.28.3'
22-
python3 -m compileall ./aleph-vm/opt/aleph-vm/
22+
build_venv/bin/pip install --no-cache-dir --progress-bar off --target ./aleph-vm/opt/aleph-vm/ 'aleph-message==0.6' 'eth-account==0.10' 'sentry-sdk==1.31.0' 'qmp==1.1.0' 'aleph-superfluid~=0.2.1' 'sqlalchemy[asyncio]>=2.0' 'aiosqlite==0.19.0' 'alembic==1.13.1' 'aiohttp_cors==0.7.0' 'pyroute2==0.7.12' 'python-cpuid==0.1.0' 'solathon==1.0.2' 'protobuf==5.28.3'
23+
build_venv/bin/python3 -m compileall ./aleph-vm/opt/aleph-vm/
2324

2425
debian-package-resources: firecracker-bins vmlinux download-ipfs-kubo target/bin/sevctl
2526
rm -fr ./aleph-vm/opt/firecracker

packaging/ubuntu-22.04.dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ RUN apt-get update && apt-get -y upgrade && apt-get install -y \
66
curl \
77
sudo \
88
python3-pip \
9+
python3-venv \
910
cargo \
1011
&& rm -rf /var/lib/apt/lists/*
1112

pyproject.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@ dependencies = [
5757
"schedule==1.2.1",
5858
"sentry-sdk==1.31",
5959
"setproctitle==1.3.3",
60-
"setuptools>=61",
6160
"solathon==1.0.2",
6261
"sqlalchemy[asyncio]>=2",
6362
"systemd-python==235",

0 commit comments

Comments
 (0)