diff --git a/exe-requirements.txt b/exe-requirements.txt index 7dc7c3fee..85376159c 100644 --- a/exe-requirements.txt +++ b/exe-requirements.txt @@ -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" diff --git a/granulate-utils b/granulate-utils index 414c2585a..2898e70e0 160000 --- a/granulate-utils +++ b/granulate-utils @@ -1 +1 @@ -Subproject commit 414c2585a8b646788e6d3cf715b638ab1a2f846c +Subproject commit 2898e70e0f77dbcc35ffecc90145256d0986d502 diff --git a/pyi.Dockerfile b/pyi.Dockerfile index 44c7af4a1..338b778fd 100644 --- a/pyi.Dockerfile +++ b/pyi.Dockerfile @@ -145,7 +145,7 @@ RUN if grep -q "CentOS Linux 8" /etc/os-release ; then \ ./fix_centos8.sh; \ fi -# python 3.10 installation +# python 3.11 installation WORKDIR /python RUN yum install -y \ bzip2-devel \ @@ -159,8 +159,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 . +RUN ./python311_build.sh && \ + ln -s /usr/bin/python3.11 /usr/bin/python3 # gProfiler part @@ -181,7 +182,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 \ diff --git a/scripts/python310_build.sh b/scripts/python310_build.sh deleted file mode 100755 index b37ca7da5..000000000 --- a/scripts/python310_build.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/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.10.8/Python-3.10.8.tgz -tar -xzf Python-3.10.8.tgz -cd Python-3.10.8 -./configure --enable-optimizations --enable-shared --prefix=/usr LDFLAGS="-Wl,-rpath /usr/lib" --with-openssl=/usr --with-lto -make python install -j "$(nproc)" diff --git a/scripts/python311_build.sh b/scripts/python311_build.sh new file mode 100755 index 000000000..a8188826d --- /dev/null +++ b/scripts/python311_build.sh @@ -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 +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