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.

Sign up for GitHub

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

extra: Switch over to Python 3.13 #1565

Merged
merged 3 commits into from
Jan 3, 2025
Merged

extra: Switch over to Python 3.13 #1565

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
30ecfd9
mod_wsgi - update from 5.0.0 to 5.0.2
citrus-it Jan 3, 2025
2e6b979
qemu: fix build with python 3.13
citrus-it Jan 3, 2025
a6b0ae6
Switch over to python 3.13
citrus-it Jan 3, 2025
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
4 changes: 2 additions & 2 deletions build/mod_wsgi/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@
# }}}

# Copyright 2023 Carsten Grzemba
# Copyright 2024 OmniOS Community Edition (OmniOSce) Association.
# Copyright 2025 OmniOS Community Edition (OmniOSce) Association.

. ../../lib/build.sh

PROG=mod_wsgi
VER=5.0.0
VER=5.0.2
# Hard-coded here for now. If we ship more than one apache version, this will
# need restructuring.
PKG=ooce/server/apache-24/modules/wsgi
Expand Down
22 changes: 16 additions & 6 deletions build/qemu/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,7 @@ SUMMARY="$PROG"
DESC="A generic and open source machine emulator and virtualizer"

LIBSLIRPVER=4.8.0
SPHINXVER=8.1.3
SPHINXRTDVER=3.0.2
IMGHDRVER=3.13.0

OPREFIX=$PREFIX
PREFIX+=/$PROG
Expand Down Expand Up @@ -61,14 +60,25 @@ LDFLAGS[amd64]+=" -L$DEPROOT$PREFIX/lib/amd64"

addpath PKG_CONFIG_PATH[amd64] $DEPROOT$PREFIX/lib/amd64/pkgconfig

pyvenv_install sphinx $SPHINXVER $TMPDIR/sphinx
pyvenv_install sphinx-rtd-theme $SPHINXRTDVER $TMPDIR/sphinx
PATH+=":$TMPDIR/sphinx/bin"

#########################################################################

note -n "-- Building $PROG"

post_patch() {
typeset dir="$1"

# PEP 594 removed several modules ("dead batteries") starting in Python
# 3.13. Since sphinx depends on imghdr, we need to explicitly re-add the
# standard module to the temporary virtual environment until this is fixed
# upstream.
((PYTHONPKGVER >= 313)) || return

echo "standard-imghdr==$IMGHDRVER" >> $dir/docs/requirements.txt
$SED -i "/sphinx_rtd_theme/a\\
standard-imghdr = { installed = \"$IMGHDRVER\" }
" $dir/pythondeps.toml || logerr "sphinx imghdr insertion failed"
}

# POSIX sigwait(2) plus strnlen visibility
set_standard POSIX+EXTENSIONS CFLAGS

Expand Down
2 changes: 1 addition & 1 deletion doc/packages.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@
| ooce/security/swtpm | 0.10.0 | https://github.com/stefanberger/swtpm/releases | [omniosorg](https://github.com/omniosorg)
| ooce/server/apache-24 | 2.4.62 | https://downloads.apache.org/httpd/ | [omniosorg](https://github.com/omniosorg)
| ooce/server/apache-24/modules/fcgid | 2.3.9 | https://downloads.apache.org/httpd/mod_fcgid/ | [omniosorg](https://github.com/omniosorg)
| ooce/server/apache-24/modules/wsgi | 5.0.0 | https://github.com/GrahamDumpleton/mod_wsgi/tags/ | [cgrzemba](https://github.com/cgrzemba)
| ooce/server/apache-24/modules/wsgi | 5.0.2 | https://github.com/GrahamDumpleton/mod_wsgi/tags/ | [cgrzemba](https://github.com/cgrzemba)
| ooce/server/caddy | 2.8.4 | https://github.com/caddyserver/caddy/releases | [gkoh](https://github.com/gkoh)
| ooce/server/freeradius | 3.2.6 | https://github.com/FreeRADIUS/freeradius-server/releases https://freeradius.org/releases | [omniosorg](https://github.com/omniosorg)
| ooce/server/haproxy | 3.0.5 | https://www.haproxy.org/ | [omniosorg](https://github.com/omniosorg)
Expand Down
3 changes: 2 additions & 1 deletion lib/config.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -390,7 +390,8 @@ case $RELVER in
151040) PYTHON3VER=3.9 ;;
15104[1-4]) PYTHON3VER=3.10 ;;
15104[5-8]) PYTHON3VER=3.11 ;;
151049|15105[0-9]) PYTHON3VER=3.12 ;;
151049|15105[0-2]) PYTHON3VER=3.12 ;;
15105[3-9]) PYTHON3VER=3.13 ;;
*) PYTHON3VER=3.5 ;;
esac
# Specify default Python version for building packages
Expand Down
Loading