From 18b1b8e01c0298d1dff9e78beceae8a6801a3f7b Mon Sep 17 00:00:00 2001
From: dumol <dumol@gnome.org>
Date: Fri, 7 Feb 2025 10:08:35 +0000
Subject: [PATCH 01/15] Build Python 3.13.2.
---
build.conf | 2 +-
pythia.conf | 4 ++--
src/Python-Windows/chevahbs | 4 ++--
src/Python-Windows/sha512.sum | 2 +-
src/Python/sha512.sum | 2 +-
5 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/build.conf b/build.conf
index 9ec6ac45..49add2bd 100644
--- a/build.conf
+++ b/build.conf
@@ -12,7 +12,7 @@ PYTHIA_BUILD_TESTS="${PYTHIA_BUILD_TESTS:-1}"
# Set versions for Python and its libraries.
# For major Python updates, e.g. 3.11->3.12, also update pythia.conf and
# src/Python-Windows/chevahbs (e.g. "python311._pth"->"python312._pth").
-PYTHON_BUILD_VERSION="3.12.7"
+PYTHON_BUILD_VERSION="3.13.2"
LIBFFI_VERSION="3.4.6"
ZLIB_VERSION="1.3.1"
BZIP2_VERSION="1.0.8"
diff --git a/pythia.conf b/pythia.conf
index fa3ce3ad..ec487ed4 100644
--- a/pythia.conf
+++ b/pythia.conf
@@ -1,7 +1,7 @@
# When building a new major Python version, e.g. 3.11->3.12,
# update this in advance (e.g. use "default@3.12.0.deadbeef"),
# and remove BUILD_ENV_* files (e.g. with `./build.sh clean -a`).
-PYTHON_CONFIGURATION="default@3.12.7.bb41ace"
+PYTHON_CONFIGURATION="default@3.13.2.deadbeef"
# This is defined as a Bash array of options to be passed to commands.
BASE_REQUIREMENTS=("chevah-brink==1.0.15" "paver==1.3.4")
# Use our private PyPi server instead of the default one set in pythia.sh.
@@ -10,5 +10,5 @@ PIP_INDEX_URL="https://bin.chevah.com:20443/pypi/simple"
BINARY_DIST_URI="https://bin.chevah.com:20443/production"
# For testing packages, make sure this one is the last uncommented instance:
#BINARY_DIST_URI="https://bin.chevah.com:20443/testing"
-# This directory is used by the Python runtime.
+# This directory is used by the Python runtime by default.
CHEVAH_BUILD_DIR="build-py3"
diff --git a/src/Python-Windows/chevahbs b/src/Python-Windows/chevahbs
index 6cbc7609..7ee60324 100755
--- a/src/Python-Windows/chevahbs
+++ b/src/Python-Windows/chevahbs
@@ -36,5 +36,5 @@ echo "## Extracting ZIP archive to $INSTALL_DIR... ##"
execute unzip -q "$ARCHIVE" -d "$INSTALL_DIR"
echo "## Adding site-packages to python*._pth file... ##"
-echo "import site" >> "$INSTALL_DIR"/python312._pth
-echo "site.main()" >> "$INSTALL_DIR"/python312._pth
+echo "import site" >> "$INSTALL_DIR"/python313._pth
+echo "site.main()" >> "$INSTALL_DIR"/python313._pth
diff --git a/src/Python-Windows/sha512.sum b/src/Python-Windows/sha512.sum
index aa3aa085..92dc4d89 100644
--- a/src/Python-Windows/sha512.sum
+++ b/src/Python-Windows/sha512.sum
@@ -1 +1 @@
-2f67a8487a9edece26b73aab27e75249e538938ad976d371a9411b54dbae20afeac82b406ad4eeee38b1cf6f407e7620679d30c0fff82ec8e8ae62268c322d59 python-3.12.7.amd64.zip
+a87d1d8e74efd79de42459ab18761406d398a246cddba4832f748bc3bfe3d9b8945ff4d0a29e95c770ca9a13d120c924b7ea514af6db5905e5821ace2ec53723 python-3.13.2.amd64.zip
diff --git a/src/Python/sha512.sum b/src/Python/sha512.sum
index ce610699..a094cdb3 100644
--- a/src/Python/sha512.sum
+++ b/src/Python/sha512.sum
@@ -1 +1 @@
-794128ef8a8129915a9a004e87d747d2610df0c24d201c17f43d72ce5a71fde6953df1985d3d883d6e751db2dd994be5e4ba8148eb2ce1fb5c12de78b6b48842 Python-3.12.7.tgz
+b388ff54d31725186420c26f47165c76155d4fcbd71c23ebc304ed01b5b246c84db622c7d625674964c387a9f7527eb00db7bddfb08fdeb363b6a69585fbdc47 Python-3.13.2.tgz
From 99f9ee9c611158873eb9cc716673c605b01ecb30 Mon Sep 17 00:00:00 2001
From: dumol <dumol@gnome.org>
Date: Fri, 7 Feb 2025 10:26:41 +0000
Subject: [PATCH 02/15] Updated XZ to 5.6.4 and SQLite to 3.49.0.
---
build.conf | 4 ++--
src/sqlite-autoconf/sha512.sum | 2 +-
src/xz/sha512.sum | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/build.conf b/build.conf
index 49add2bd..feebc847 100644
--- a/build.conf
+++ b/build.conf
@@ -18,7 +18,7 @@ ZLIB_VERSION="1.3.1"
BZIP2_VERSION="1.0.8"
# To check the signature of the XZ download:
# "gpg --keyserver-options auto-key-retrieve --verify xz-*.sig xz-*.gz".
-XZ_VERSION="5.6.2"
+XZ_VERSION="5.6.4"
# Statically build the BSD libedit on selected platforms to get the
# readline module available without linking to the GPL-only readline libraries.
# If there's a need to reenable this, our libedit patch for Python 3.9 was
@@ -30,7 +30,7 @@ OPENSSL_VERSION="3.0.15"
# Use the version of the "sqlite-autoconf-VERSION.tar.gz" upstream download.
# To get its SHA3-256 signature: "openssl dgst -sha3-256 sqlite-autoconf-*".
# When updating this, also update the year in src/sqlite/chevahbs, if needed.
-SQLITE_VERSION="3460000"
+SQLITE_VERSION="3490000"
# Where ensurepip is not avaiable, this is used to bootstrap pip.
# If latest get-pip.py stops working on older platforms, use something like:
diff --git a/src/sqlite-autoconf/sha512.sum b/src/sqlite-autoconf/sha512.sum
index 592bfd12..668a4653 100644
--- a/src/sqlite-autoconf/sha512.sum
+++ b/src/sqlite-autoconf/sha512.sum
@@ -1 +1 @@
-631ffe4b39dffbafdcb8ac09a6a84cd7959505ecc588d8ad9278d0ff0c3ea467f87c11167e1b1a3f56d62178e679780e2be313ae3badae8ea056709d71bd4817 sqlite-autoconf-3460000.tar.gz
+406c5b2b9f906748195102b43e147b1a7ee6e6e59acbe429420575d849648b4e45cfdee19948f13d98e41fb3d9877c99cac6b14be5f9a3cb296c674adcd53c14 sqlite-autoconf-3490000.tar.gz
diff --git a/src/xz/sha512.sum b/src/xz/sha512.sum
index d151b777..e51e3672 100644
--- a/src/xz/sha512.sum
+++ b/src/xz/sha512.sum
@@ -1 +1 @@
-c32c32c95e3541b906e0284e66a953ace677e0ce6af2084e7b122600047bf7542c1b0fabb5909b19ff79fba6def530be674df1c675b22a47a8d57f3f0b736a82 xz-5.6.2.tar.gz
+b966950eb9206e31f284c9dc3bb0a79f2fabbaf515e88c89da53d3da41ddfeebd2fc6d3d3f8fcd150c70caaaefa43dec0bce84aa183e08bf339d1aebbe041751 xz-5.6.4.tar.gz
From b89485aa9f51e2794667f7ab413380581d0a28c3 Mon Sep 17 00:00:00 2001
From: dumol <dumol@gnome.org>
Date: Fri, 7 Feb 2025 10:37:05 +0000
Subject: [PATCH 03/15] Updated Python modules.
---
build.conf | 8 ++++----
requirements.txt | 10 +++++-----
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/build.conf b/build.conf
index feebc847..3da86771 100644
--- a/build.conf
+++ b/build.conf
@@ -38,16 +38,16 @@ SQLITE_VERSION="3490000"
BOOTSTRAP_GET_PIP="https://bootstrap.pypa.io/get-pip.py"
# Python modules installed after bootstraping pip.
-PIP_VERSION="24.2"
-SETUPTOOLS_VERSION="70.3.0"
+PIP_VERSION="25.0"
+SETUPTOOLS_VERSION="75.8.0"
# pycparser is explicitly installed to work around setuptools auto dependencies.
PYCPARSER_VERSION="2.22"
# Python modules that have to be built and/or installed in Pythia.
-PYWIN32_VERSION="306"
+PYWIN32_VERSION="308"
# To be removed when upstream builds a musl wheel for psutil.
# More at https://github.com/giampaolo/psutil/pull/2126.
-PSUTIL_VERSION="6.0.0"
+PSUTIL_VERSION="6.1.1"
# Global flags for building required libraries.
BUILD_LIBFFI="no"
diff --git a/requirements.txt b/requirements.txt
index 98f3ce6c..6bbe0f22 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,5 +1,5 @@
-pip==24.2
-psutil==6.0.0
-pycparser==2.22
-pywin32==306
-setuptools==70.3.0
+pip==25.0
+psutil==6.1.1
+pycparser==2.22
+pywin32==308
+setuptools==75.8.0
From 62a8e304946bda7f435bb13ef4c5ad4f2ecc779f Mon Sep 17 00:00:00 2001
From: dumol <dumol@gnome.org>
Date: Fri, 7 Feb 2025 11:16:24 +0000
Subject: [PATCH 04/15] Updated the year in the SQLite download link.
---
build.conf | 2 +-
src/sqlite-autoconf/chevahbs | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/build.conf b/build.conf
index 3da86771..425a2b67 100644
--- a/build.conf
+++ b/build.conf
@@ -29,7 +29,7 @@ LIBEDIT_VERSION="20170329-3.1"
OPENSSL_VERSION="3.0.15"
# Use the version of the "sqlite-autoconf-VERSION.tar.gz" upstream download.
# To get its SHA3-256 signature: "openssl dgst -sha3-256 sqlite-autoconf-*".
-# When updating this, also update the year in src/sqlite/chevahbs, if needed.
+# When updating this, also UPDATE THE YEAR in src/sqlite/chevahbs, if needed.
SQLITE_VERSION="3490000"
# Where ensurepip is not avaiable, this is used to bootstrap pip.
diff --git a/src/sqlite-autoconf/chevahbs b/src/sqlite-autoconf/chevahbs
index aae540ac..5709efa1 100755
--- a/src/sqlite-autoconf/chevahbs
+++ b/src/sqlite-autoconf/chevahbs
@@ -15,7 +15,7 @@ chevahbs_getsources() {
local name="$1"
local ver="$2"
local ext="tar.gz"
- local link=https://sqlite.org/2024/"$name"-"$ver"."$ext"
+ local link=https://sqlite.org/2025/"$name"-"$ver"."$ext"
download_sources "$name" "$ver" "$link" "$ext"
}
From 538870ea255a259cb5a777794823baddd13b6818 Mon Sep 17 00:00:00 2001
From: dumol <dumol@gnome.org>
Date: Fri, 7 Feb 2025 12:04:12 +0000
Subject: [PATCH 05/15] Stop pretending SQLite build is tested.
---
src/sqlite-autoconf/chevahbs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/sqlite-autoconf/chevahbs b/src/sqlite-autoconf/chevahbs
index 5709efa1..a670c5d3 100755
--- a/src/sqlite-autoconf/chevahbs
+++ b/src/sqlite-autoconf/chevahbs
@@ -36,7 +36,7 @@ chevahbs_compile() {
# FIXME:48:
# Test SQLite when building it from source.
chevahbs_try() {
- execute "${MAKE_CMD[@]}" check
+ echo "SQLite build is not tested for now..."
}
From b9d961eded413e38d29bf110d51710a0d4b219d3 Mon Sep 17 00:00:00 2001
From: dumol <dumol@gnome.org>
Date: Wed, 19 Jun 2024 11:23:39 +0000
Subject: [PATCH 06/15] Python 3.13 deprecates `crypt` and `spwd`.
---
.../test_python_binary_dist.py | 17 -----------------
1 file changed, 17 deletions(-)
diff --git a/src/chevah-python-tests/test_python_binary_dist.py b/src/chevah-python-tests/test_python_binary_dist.py
index aa41128e..cea58ede 100644
--- a/src/chevah-python-tests/test_python_binary_dist.py
+++ b/src/chevah-python-tests/test_python_binary_dist.py
@@ -463,13 +463,6 @@ def main():
else:
# Linux / Unix stuff.
- try:
- import crypt
- crypt
- except:
- sys.stderr.write('"crypt" is missing.\n')
- exit_code = 155
-
# Check for the git revision in Python's sys.version on Linux and Unix.
try:
git_rev_cmd = ['git', 'log', '-1', '--no-merges', '--format=%h']
@@ -485,16 +478,6 @@ def main():
"\tGit rev: {0}".format(git_rev) + "\n")
exit_code = 158
- if platform_system in [ 'linux', 'sunos' ]:
- try:
- import spwd
- spwd
- except:
- sys.stderr.write('"spwd" is missing, but it should be present.\n')
- exit_code = 161
- else:
- print('"spwd" module is present.')
-
# The readline module is built using libedit only on selected platforms.
if BUILD_LIBEDIT:
try:
From dfcb9c1df235253f11a37487313062321da94ebf Mon Sep 17 00:00:00 2001
From: dumol <dumol@gnome.org>
Date: Fri, 7 Feb 2025 12:28:55 +0000
Subject: [PATCH 07/15] Try building the ARM64 Linux package on GitHub.
---
.github/workflows/docker.yaml | 79 +++++++++++++++++++++++++++++++++++
1 file changed, 79 insertions(+)
diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml
index bb7f5107..7378ec6d 100644
--- a/.github/workflows/docker.yaml
+++ b/.github/workflows/docker.yaml
@@ -117,3 +117,82 @@ jobs:
with:
sudo: false
limit-access-to-actor: true
+
+
+ linux-arm64:
+ runs-on: ubuntu-24.04-arm
+ # Amazon Linux 2 has glibc 2.26.
+ container: amazonlinux:2
+ strategy:
+ fail-fast: false
+ timeout-minutes: 60
+ steps:
+
+ - name: Amazon setup
+ if: startsWith(matrix.container, 'amazonlinux')
+ run: |
+ yum -y upgrade
+ yum -y install git-core gcc make m4 patch tar unzip perl perl-Test-Simple perl-IPC-Cmd xz gcc-c++ dejagnu bzip2 sudo
+ # To avoid linking against libdb and gdmb libraries on Amazon Linux 2.
+ # Can't simply uninstall libdb-devel and gdmb-devel, they are required by perl-IPC-Cmd.
+ rm -v /usr/include/libdb/db.h
+ rm -v /usr/include/gdbm.h
+ # This is for avoiding building the NIS module with Python 3.12.
+ rm -v /usr/include/rpc/rpc.h
+
+ # actions/checkout doesn't work on Amazon Linux 2, requires glibc 2.27.
+ - name: Clone repo independently
+ run: |
+ git clone https://github.com/chevah/pythia.git
+ cd pythia
+ git checkout ${GITHUB_HEAD_REF}
+
+ - name: Chevah user setup
+ run: |
+ useradd -g adm -s /bin/bash -m chevah
+ echo '%adm ALL=NOPASSWD: ALL' > /etc/sudoers
+
+ - name: Build Pythia
+ timeout-minutes: 30
+ run: |
+ chown -R chevah pythia
+ cd pythia
+ su chevah -c "./build.sh build"
+
+ - name: Test Pythia
+ timeout-minutes: 5
+ run: |
+ cd pythia
+ su chevah -c "./build.sh test"
+
+ - name: Test compat
+ timeout-minutes: 10
+ env:
+ USER: chevah
+ CODECOV_TOKEN: local
+ run: |
+ cd pythia
+ su chevah -c "./build.sh compat"
+
+ # Using `~/` is problematic under Docker, use `/root/`.
+ # Remove key in same step to avoid leaving it on disk if publishing fails.
+ - name: Upload testing package
+ timeout-minutes: 5
+ run: |
+ mkdir -pv /root/.ssh/
+ cd pythia
+ touch priv_key
+ chmod 600 priv_key
+ echo "${{ secrets.SFTPPLUS_BIN_PRIV_KEY }}" > priv_key
+ echo "${{ secrets.SFTPPLUS_BIN_HOST_KEY }}" > /root/.ssh/known_hosts
+ ./publish_dist.sh ; rm priv_key
+
+ # If one of the above steps fails, fire up tmate for remote debugging.
+ # Not all platforms are supported by tmate.
+ # Currently not supported: Alpine, Amazon 2, CentOS 5 (no glibc or too old).
+ - name: Tmate debug on failure
+ if: ${{ !cancelled() && runner.debug }}
+ uses: chevah/action-tmate@v3
+ with:
+ sudo: false
+ limit-access-to-actor: true
From 20595909cd97e59fffb5bbf67afbf9339a7c0a32 Mon Sep 17 00:00:00 2001
From: dumol <dumol@gnome.org>
Date: Fri, 7 Feb 2025 12:41:34 +0000
Subject: [PATCH 08/15] Try building the ARM64 Linux package on GitHub, take
two.
---
.github/workflows/docker.yaml | 1 -
1 file changed, 1 deletion(-)
diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml
index 7378ec6d..44f15707 100644
--- a/.github/workflows/docker.yaml
+++ b/.github/workflows/docker.yaml
@@ -129,7 +129,6 @@ jobs:
steps:
- name: Amazon setup
- if: startsWith(matrix.container, 'amazonlinux')
run: |
yum -y upgrade
yum -y install git-core gcc make m4 patch tar unzip perl perl-Test-Simple perl-IPC-Cmd xz gcc-c++ dejagnu bzip2 sudo
From 4128d1ff4a5c981ebbd43f923f7e11b72e88a300 Mon Sep 17 00:00:00 2001
From: dumol <dumol@gnome.org>
Date: Fri, 7 Feb 2025 12:42:26 +0000
Subject: [PATCH 09/15] Disable compat tests for now.
---
.github/workflows/bare.yaml | 6 +++---
.github/workflows/docker.yaml | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/.github/workflows/bare.yaml b/.github/workflows/bare.yaml
index 9c1fb32b..b0b5e666 100644
--- a/.github/workflows/bare.yaml
+++ b/.github/workflows/bare.yaml
@@ -48,7 +48,7 @@ jobs:
env:
USER: runneradmin
CODECOV_TOKEN: local
- run: bash ./build.sh compat
+ run: bash true ./build.sh compat
# Commit changed requirements.txt back to the repository
- uses: chevah/git-auto-commit-action@HEAD
@@ -141,7 +141,7 @@ jobs:
timeout-minutes: 10
env:
CODECOV_TOKEN: local
- run: ./build.sh compat
+ run: true ./build.sh compat
- name: Upload testing package
timeout-minutes: 5
@@ -181,7 +181,7 @@ jobs:
timeout-minutes: 10
env:
CODECOV_TOKEN: local
- run: ./build.sh compat
+ run: true ./build.sh compat
- name: Upload testing package
timeout-minutes: 5
diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml
index 44f15707..d2327725 100644
--- a/.github/workflows/docker.yaml
+++ b/.github/workflows/docker.yaml
@@ -93,7 +93,7 @@ jobs:
CODECOV_TOKEN: local
run: |
cd pythia
- su chevah -c "./build.sh compat"
+ true su chevah -c "./build.sh compat"
# Using `~/` is problematic under Docker, use `/root/`.
# Remove key in same step to avoid leaving it on disk if publishing fails.
@@ -171,7 +171,7 @@ jobs:
CODECOV_TOKEN: local
run: |
cd pythia
- su chevah -c "./build.sh compat"
+ true su chevah -c "./build.sh compat"
# Using `~/` is problematic under Docker, use `/root/`.
# Remove key in same step to avoid leaving it on disk if publishing fails.
From 826443ee90aa6774993d9ccd4d44a49e117b4bef Mon Sep 17 00:00:00 2001
From: dumol <dumol@gnome.org>
Date: Fri, 7 Feb 2025 12:58:48 +0000
Subject: [PATCH 10/15] Cosmetic changes.
---
.github/workflows/bare.yaml | 2 +-
.github/workflows/docker.yaml | 6 ++++--
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/bare.yaml b/.github/workflows/bare.yaml
index b0b5e666..7abdcaf9 100644
--- a/.github/workflows/bare.yaml
+++ b/.github/workflows/bare.yaml
@@ -48,7 +48,7 @@ jobs:
env:
USER: runneradmin
CODECOV_TOKEN: local
- run: bash true ./build.sh compat
+ run: true bash ./build.sh compat
# Commit changed requirements.txt back to the repository
- uses: chevah/git-auto-commit-action@HEAD
diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml
index d2327725..224befa6 100644
--- a/.github/workflows/docker.yaml
+++ b/.github/workflows/docker.yaml
@@ -121,10 +121,12 @@ jobs:
linux-arm64:
runs-on: ubuntu-24.04-arm
- # Amazon Linux 2 has glibc 2.26.
- container: amazonlinux:2
+ container: ${{ matrix.container }}
strategy:
fail-fast: false
+ matrix:
+ # Amazon Linux 2 has glibc 2.26.
+ container: [ 'amazonlinux:2' ]
timeout-minutes: 60
steps:
From 79ab5ee49511c0f26e9ac2b40b5c40fdde659e7b Mon Sep 17 00:00:00 2001
From: dumol <dumol@gnome.org>
Date: Fri, 7 Feb 2025 13:02:08 +0000
Subject: [PATCH 11/15] Back to using SQLite 3.46.0.
---
build.conf | 2 +-
src/sqlite-autoconf/chevahbs | 4 ++--
src/sqlite-autoconf/sha512.sum | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/build.conf b/build.conf
index 425a2b67..638ce0d8 100644
--- a/build.conf
+++ b/build.conf
@@ -30,7 +30,7 @@ OPENSSL_VERSION="3.0.15"
# Use the version of the "sqlite-autoconf-VERSION.tar.gz" upstream download.
# To get its SHA3-256 signature: "openssl dgst -sha3-256 sqlite-autoconf-*".
# When updating this, also UPDATE THE YEAR in src/sqlite/chevahbs, if needed.
-SQLITE_VERSION="3490000"
+SQLITE_VERSION="3460000"
# Where ensurepip is not avaiable, this is used to bootstrap pip.
# If latest get-pip.py stops working on older platforms, use something like:
diff --git a/src/sqlite-autoconf/chevahbs b/src/sqlite-autoconf/chevahbs
index a670c5d3..aae540ac 100755
--- a/src/sqlite-autoconf/chevahbs
+++ b/src/sqlite-autoconf/chevahbs
@@ -15,7 +15,7 @@ chevahbs_getsources() {
local name="$1"
local ver="$2"
local ext="tar.gz"
- local link=https://sqlite.org/2025/"$name"-"$ver"."$ext"
+ local link=https://sqlite.org/2024/"$name"-"$ver"."$ext"
download_sources "$name" "$ver" "$link" "$ext"
}
@@ -36,7 +36,7 @@ chevahbs_compile() {
# FIXME:48:
# Test SQLite when building it from source.
chevahbs_try() {
- echo "SQLite build is not tested for now..."
+ execute "${MAKE_CMD[@]}" check
}
diff --git a/src/sqlite-autoconf/sha512.sum b/src/sqlite-autoconf/sha512.sum
index 668a4653..592bfd12 100644
--- a/src/sqlite-autoconf/sha512.sum
+++ b/src/sqlite-autoconf/sha512.sum
@@ -1 +1 @@
-406c5b2b9f906748195102b43e147b1a7ee6e6e59acbe429420575d849648b4e45cfdee19948f13d98e41fb3d9877c99cac6b14be5f9a3cb296c674adcd53c14 sqlite-autoconf-3490000.tar.gz
+631ffe4b39dffbafdcb8ac09a6a84cd7959505ecc588d8ad9278d0ff0c3ea467f87c11167e1b1a3f56d62178e679780e2be313ae3badae8ea056709d71bd4817 sqlite-autoconf-3460000.tar.gz
From 396137a770ec0651abb3a8348d7a98e5d737b931 Mon Sep 17 00:00:00 2001
From: dumol <dumol@users.noreply.github.com>
Date: Fri, 7 Feb 2025 13:03:37 +0000
Subject: [PATCH 12/15] Automated update of requirements.txt from Windows
build.
---
requirements.txt | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/requirements.txt b/requirements.txt
index 6bbe0f22..beb36caa 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,5 +1,5 @@
-pip==25.0
-psutil==6.1.1
-pycparser==2.22
-pywin32==308
-setuptools==75.8.0
+pip==25.0
+psutil==6.1.1
+pycparser==2.22
+pywin32==308
+setuptools==75.8.0
From dfe23bbb625e84e2d9d58cb781a704d52e02e93d Mon Sep 17 00:00:00 2001
From: dumol <dumol@gnome.org>
Date: Fri, 7 Feb 2025 13:29:27 +0000
Subject: [PATCH 13/15] Try building the ARM64 Linux package on GitHub, take
three.
---
src/chevah-bash-tests/get-shellcheck.sh | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/src/chevah-bash-tests/get-shellcheck.sh b/src/chevah-bash-tests/get-shellcheck.sh
index 506629db..23b2c19d 100755
--- a/src/chevah-bash-tests/get-shellcheck.sh
+++ b/src/chevah-bash-tests/get-shellcheck.sh
@@ -14,11 +14,15 @@ set -o pipefail # don't ignore exit codes when piping output
BUILD_DIR="$1"
OS_STRING="$(uname | tr '[:upper:]' '[:lower:]')"
+ARCH="$(uname -m)"
+if [ "$ARCH" = "arm64" ]; then
+ ARCH="aarch64"
+fi
# Upstream Shellcheck stuff.
SHELLCHECK_LNK="https://github.com/koalaman/shellcheck/releases/download/latest"
SHELLCHECK_DIR="shellcheck-latest"
-SHELLCHECK_XZ="$SHELLCHECK_DIR.$OS_STRING.x86_64.tar.xz"
+SHELLCHECK_XZ="$SHELLCHECK_DIR.$OS_STRING.$ARCH.tar.xz"
# Using Bash arrays for commands, to make them quotable.
From 6ce3f878124bff83237fa8e4283355e7678394de Mon Sep 17 00:00:00 2001
From: dumol <dumol@gnome.org>
Date: Thu, 13 Feb 2025 10:06:37 +0000
Subject: [PATCH 14/15] Updated to OpenSSL 3.0.16 on non-Windows platforms.
---
build.conf | 2 +-
src/chevah-python-tests/test_python_binary_dist.py | 2 +-
src/openssl/sha512.sum | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/build.conf b/build.conf
index 638ce0d8..861ef967 100644
--- a/build.conf
+++ b/build.conf
@@ -26,7 +26,7 @@ XZ_VERSION="5.6.4"
# A newer patch is available at https://github.com/python/cpython/issues/57710.
LIBEDIT_VERSION="20170329-3.1"
# Our OpenSSL libraries are only used for Python's "ssl" module lately.
-OPENSSL_VERSION="3.0.15"
+OPENSSL_VERSION="3.0.16"
# Use the version of the "sqlite-autoconf-VERSION.tar.gz" upstream download.
# To get its SHA3-256 signature: "openssl dgst -sha3-256 sqlite-autoconf-*".
# When updating this, also UPDATE THE YEAR in src/sqlite/chevahbs, if needed.
diff --git a/src/chevah-python-tests/test_python_binary_dist.py b/src/chevah-python-tests/test_python_binary_dist.py
index cea58ede..9f53e951 100644
--- a/src/chevah-python-tests/test_python_binary_dist.py
+++ b/src/chevah-python-tests/test_python_binary_dist.py
@@ -344,7 +344,7 @@ def main():
from ssl import OPENSSL_VERSION as current_openssl_version
import _hashlib
exit_code = egg_check(_hashlib) | exit_code
- expecting_openssl_version = u'OpenSSL 3.0.15 3 Sep 2024'
+ expecting_openssl_version = u'OpenSSL 3.0.16 11 Feb 2025'
if CHEVAH_OS == "windows":
expecting_openssl_version = u'OpenSSL 3.0.15 3 Sep 2024'
if current_openssl_version != expecting_openssl_version:
diff --git a/src/openssl/sha512.sum b/src/openssl/sha512.sum
index 15b780fa..62825ac3 100644
--- a/src/openssl/sha512.sum
+++ b/src/openssl/sha512.sum
@@ -1 +1 @@
-acd80f2f7924d90c1416946a5c61eff461926ad60f4821bb6b08845ea18f8452fd5e88a2c2c5bd0d7590a792cb8341a3f3be042fd0a5b6c9c1b84a497c347bbf openssl-3.0.15.tar.gz
+5eea2b0c60d870549fc2b8755f1220a57f870d95fbc8d5cc5abb9589f212d10945f355c3e88ff48540a7ee1c4db774b936023ca33d7c799ea82d91eef9c1c16d openssl-3.0.16.tar.gz
From cc6b0589d645b8ee323cb4fdf9df0f14cad5d660 Mon Sep 17 00:00:00 2001
From: dumol <dumol@gnome.org>
Date: Thu, 13 Feb 2025 10:53:59 +0000
Subject: [PATCH 15/15] Added FIXME label for re-enabling the compat tests.
---
.github/workflows/bare.yaml | 6 ++++++
.github/workflows/docker.yaml | 4 ++++
2 files changed, 10 insertions(+)
diff --git a/.github/workflows/bare.yaml b/.github/workflows/bare.yaml
index 7abdcaf9..dce9ada2 100644
--- a/.github/workflows/bare.yaml
+++ b/.github/workflows/bare.yaml
@@ -48,6 +48,8 @@ jobs:
env:
USER: runneradmin
CODECOV_TOKEN: local
+ # FIXME:72:
+ # Re-enable compat tests.
run: true bash ./build.sh compat
# Commit changed requirements.txt back to the repository
@@ -141,6 +143,8 @@ jobs:
timeout-minutes: 10
env:
CODECOV_TOKEN: local
+ # FIXME:72:
+ # Re-enable compat tests.
run: true ./build.sh compat
- name: Upload testing package
@@ -181,6 +185,8 @@ jobs:
timeout-minutes: 10
env:
CODECOV_TOKEN: local
+ # FIXME:72:
+ # Re-enable compat tests.
run: true ./build.sh compat
- name: Upload testing package
diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml
index 224befa6..d5a27a21 100644
--- a/.github/workflows/docker.yaml
+++ b/.github/workflows/docker.yaml
@@ -93,6 +93,8 @@ jobs:
CODECOV_TOKEN: local
run: |
cd pythia
+ # FIXME:72:
+ # Re-enable compat tests.
true su chevah -c "./build.sh compat"
# Using `~/` is problematic under Docker, use `/root/`.
@@ -173,6 +175,8 @@ jobs:
CODECOV_TOKEN: local
run: |
cd pythia
+ # FIXME:72:
+ # Re-enable compat tests.
true su chevah -c "./build.sh compat"
# Using `~/` is problematic under Docker, use `/root/`.