Skip to content
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.

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

build: Python 3.11 #873

Open
wants to merge 20 commits into
base: grpcio-1-62-2
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 14 commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
1021049
Update python to 3.11 and rename python build script to 3.11
mpozniak95 Apr 11, 2023
dd24298
Use make altinstall to install python3
mpozniak95 Apr 12, 2023
90f396f
Use LDFLAGS when building python 3.11
mpozniak95 Apr 13, 2023
f5b3061
Update pyinstaller version, link python3.11 to python3 in prepare-stage
mpozniak95 Apr 13, 2023
96392c8
Use one command RUN
mpozniak95 Apr 14, 2023
a5bcd95
Merge remote-tracking branch 'origin/master' into update_python311
mpozniak95 Apr 21, 2023
1a8ef75
Change reference to granulate-utils
mpozniak95 Apr 21, 2023
4d3b58e
Change reference of granulate-utils to commit mpozniak95 fork to chec…
mpozniak95 Apr 27, 2023
1f19205
Change reference to fork
mpozniak95 Apr 27, 2023
b9c14c8
Use latest commit of branch update_grpcio in granulate_utils
mpozniak95 May 4, 2023
64c36a5
Change granulate-utils submodule back to granulate/granulate-utils
mpozniak95 Jun 7, 2023
22d7508
Checkout upgrade-grpcio branch that upgrades grpcio to 1.54.2
mpozniak95 Jun 7, 2023
2f3e4e3
Merge remote-tracking branch 'origin/master' into update_python311
mpozniak95 Jun 7, 2023
89fe43f
Merge remote-tracking branch 'origin/master' into python-3.11
Jongy Jan 4, 2024
5afc0fc
Merge branch 'grpcio-1-62-2' into python-3.11
slicklash Jul 8, 2024
0bc1f97
up
slicklash Jul 8, 2024
0ab1249
up
slicklash Jul 8, 2024
e47b6e5
up
slicklash Jul 8, 2024
47b3e2e
fix segfault when building with staticx 0.14.1
slicklash Jul 9, 2024
2a28657
update staticx version for aarch64
slicklash Jul 12, 2024
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
2 changes: 1 addition & 1 deletion exe-requirements.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# requirements for the standalone executable
pyinstaller==4.6; platform.machine == "x86_64"
pyinstaller==5.6; platform.machine == "x86_64"
# aarch64 requires a later version due to the use of a newer centos version.
# see https://github.com/pyinstaller/pyinstaller/issues/5540
pyinstaller==4.10; platform.machine == "aarch64" or sys.platform == "win32"
Expand Down
9 changes: 5 additions & 4 deletions executable.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ RUN yum install -y epel-release && \
yum install -y libmodulemd && \
yum clean all

# python 3.10 installation
# python 3.11 installation
WORKDIR /python
RUN yum install -y \
bzip2-devel \
Expand All @@ -164,8 +164,9 @@ RUN yum install -y \
yum clean all
COPY ./scripts/openssl_build.sh .
RUN ./openssl_build.sh
COPY ./scripts/python310_build.sh .
RUN ./python310_build.sh
COPY ./scripts/python311_build.sh .
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove trailing ws

RUN ./python311_build.sh && \
ln -s /usr/bin/python3.11 /usr/bin/python3

# gProfiler part

Expand All @@ -186,7 +187,7 @@ RUN set -e; \
# needed for aarch64, scons & wheel are needed to build staticx
RUN set -e; \
if [ "$(uname -m)" = "aarch64" ]; then \
ln -s /usr/lib64/python3.10/lib-dynload /usr/lib/python3.10/lib-dynload; \
ln -s /usr/lib64/python3.11/lib-dynload /usr/lib/python3.11/lib-dynload; \
fi
RUN set -e; \
if [ "$(uname -m)" = "aarch64" ]; then \
Expand Down
2 changes: 1 addition & 1 deletion granulate-utils
12 changes: 0 additions & 12 deletions scripts/python310_build.sh

This file was deleted.

12 changes: 12 additions & 0 deletions scripts/python311_build.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
#!/usr/bin/env bash
#
# Copyright (c) Granulate. All rights reserved.
# Licensed under the AGPL3 License. See LICENSE.md in the project root for license information.
#
set -euo pipefail

wget https://www.python.org/ftp/python/3.11.3/Python-3.11.3.tgz
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Upgrade to latest patchlevel

tar -xzf Python-3.11.3.tgz
cd Python-3.11.3
./configure --enable-shared --prefix=/usr LDFLAGS="-Wl,-rpath /usr/lib"
make -j "$(nproc)" && make -j "$(nproc)" altinstall