Update to Python 3.13

Author: virtuald

Makefile

@@ -2,45 +2,50 @@ include ./Mk/pkgdata.mk
 
 DEPS = binutils-symlinks gcc-symlinks g++-symlinks libgcc-s-dev gcov make libreadline-dev openssl-dev libz-dev libsqlite3-dev libexpat-dev libxml2-dev libbz2-dev liblzma-dev libgdbm-dev libffi-dev pkgconfig
 
-BUILD_CMD = CXX=/usr/bin/g++ ./configure --enable-shared --with-system-expat --with-system-ffi --enable-optimizations && make
+CONFIGURE_CMD = TMPDIR=${BUILD_HOME}/tmp CXX=/usr/bin/g++ ./configure --enable-shared --with-system-expat --enable-optimizations
+
+BUILD_CMD = TMPDIR=${BUILD_HOME}/tmp CXX=/usr/bin/g++ make
 
 INSTALL_CMD = make install
 
-GETDATA_TARARGS = --exclude=usr/local/lib/python3.12/site-packages/numpy\* \
-		  --exclude=usr/local/lib/python3.12/test \
-		  --exclude=usr/local/lib/python3.12/config-3.12-arm-linux-gnueabi/libpython3.12.a \
-		  --exclude=usr/local/lib/python3.12/lib-dynload/.debug \
+PATCHES = disable-re-test.patch
+
+GETDATA_TARARGS = --exclude=usr/local/lib/python3.13/site-packages/numpy\* \
+		  --exclude=usr/local/lib/python3.13/ensurepip \
+		  --exclude=usr/local/lib/python3.13/idlelib \
+		  --exclude=usr/local/lib/python3.13/pydoc_data \
+		  --exclude=usr/local/lib/python3.13/test \
+		  --exclude=usr/local/lib/python3.13/tkinter \
+		  --exclude=usr/local/lib/python3.13/config-3.13-arm-linux-gnueabi/libpython3.13.a \
+		  --exclude=usr/local/lib/python3.13/lib-dynload/.debug \
 		  --exclude=\*.py[co] \
 		  --exclude=__pycache__ \
-		  usr/local/include/python3.12/pyconfig.h \
+		  usr/local/include/python3.13/pyconfig.h \
 		  usr/local/lib/libpython3* \
-		  usr/local/bin/*3.12 \
-		  usr/local/bin/2to3 \
-		  usr/local/bin/idle3 \
+		  usr/local/bin/*3.13 \
 		  usr/local/bin/pip3 \
-		  usr/local/bin/pydoc3 \
 		  usr/local/bin/python3 \
 		  usr/local/bin/python3-config \
-		  usr/local/lib/python3.12 \
-		  usr/local/bin/python3.12-config
+		  usr/local/lib/python3.13 \
+		  usr/local/bin/python3.13-config
 
-GETDATA_DEV_TARARGS = --exclude=usr/local/include/python3.12/pyconfig.h \
-		  usr/local/include/python3.12 \
+GETDATA_DEV_TARARGS = --exclude=usr/local/include/python3.13/pyconfig.h \
+		  usr/local/include/python3.13 \
 		  usr/local/lib/pkgconfig/python3.pc \
 		  usr/local/lib/pkgconfig/python3-embed.pc \
-		  usr/local/lib/pkgconfig/python-3.12.pc \
-		  usr/local/lib/pkgconfig/python-3.12-embed.pc \
-		  usr/local/lib/python3.12/config-3.12-arm-linux-gnueabi/libpython3.12.a
+		  usr/local/lib/pkgconfig/python-3.13.pc \
+		  usr/local/lib/pkgconfig/python-3.13-embed.pc \
+		  usr/local/lib/python3.13/config-3.13-arm-linux-gnueabi/libpython3.13.a
 
 GETDATA_DBG_TARARGS = usr/local/bin/.debug/python3.debug \
 		  usr/local/lib/.debug/libpython3* \
-		  usr/local/lib/python3.12/lib-dynload/.debug
+		  usr/local/lib/python3.13/lib-dynload/.debug
 
 EXTRA_CONTROL = postinst prerm
 
-EXES = usr/local/bin/python3.12 \
-       usr/local/lib/libpython3.12.so.1.0 \
-       usr/local/lib/python3.12/lib-dynload/*.so
+EXES = usr/local/bin/python3.13 \
+       usr/local/lib/libpython3.13.so.1.0 \
+       usr/local/lib/python3.13/lib-dynload/*.so
 
 include ./Mk/remote_build.mk
 include ./Mk/ipk.mk

Mk/globals.mk

@@ -6,7 +6,7 @@ ifneq ("$(wildcard $(BUILD_ROOT)/vars)","")
 include ${BUILD_ROOT}/vars
 endif
 
-YEAR = 2024
+YEAR = 2025
 RELEASE = ${YEAR}-dev
 ARCH ?= cortexa9-vfpv3
 

Mk/remote_build.mk

@@ -10,7 +10,7 @@
 # BUILD_DIR - the directory where the TGZ gets extracted to.
 #             defaults to TGZ with .tgz and .tar.gz stripped
 # BUILD_DIR_EXTRA - the directory inside the TGZ that builds should happen in
-# BUILD_WARNING - warning to print before build
+# CONFIGURE_CMD - the build command
 # BUILD_CMD - the build command
 # INSTALL_CMD - the install command
 # GETDATA_TARARGS - the args to use for tar when getting data
@@ -31,7 +31,7 @@ ifndef ROBORIO
 $(error ROBORIO is not set, use 'make ROBORIO=roborio-XXXX-frc.local')
 endif
 
-.PHONY: all init-ssh sync-date install-deps fetch extract build install strip-exes fetch-src getdata getdata-pkg getdata-dev getdata-dbg
+.PHONY: all init-ssh sync-date install-deps fetch extract patch build install strip-exes fetch-src getdata getdata-pkg getdata-dev getdata-dbg
 
 ifdef GETDATA_DEV_TARARGS
 GETDATA_DEV_TARGET=getdata-dev
@@ -43,7 +43,7 @@ endif
 
 ALLTARGETS ?= clean \
 	sync-date install-deps \
-	fetch extract build install strip-exes \
+	fetch extract patch configure build install strip-exes \
 	getdata ipk
 all: ${ALLTARGETS}
 
@@ -67,18 +67,16 @@ ${TGZ}:
 extract: ${TGZ}
 	ssh ${BUILD_USER}@${ROBORIO} 'cd ${BUILD_HOME} && rm -rf ${BUILD_DIR}'
 	cat ${TGZ} | ssh ${BUILD_USER}@${ROBORIO} 'cd ${BUILD_HOME} && mkdir ${BUILD_DIR} && cd ${BUILD_DIR} && tar xzf - --strip-components=1'
+
+patch:
 ifdef PATCHES
 	$(foreach patch, $(PATCHES), ssh ${BUILD_USER}@${ROBORIO} 'cd ${BUILD_HOME} && cd ${BUILD_DIR} && patch -p1' < $(patch))
 endif	
 
+configure:
+	ssh ${BUILD_USER}@${ROBORIO} 'ulimit -s ${STACK_SIZE} && cd ${BUILD_HOME} && cd ${BUILD_DIR}/${BUILD_DIR_EXTRA} && ${CONFIGURE_CMD}'
+
 build:
-ifdef BUILD_WARNING
-	@echo "--------------------------------------------------------------"
-	@echo "${BUILD_WARNING}"
-	@echo "--------------------------------------------------------------"
-	@echo "Press ENTER to continue"
-	@bash -c read
-endif
 	ssh ${BUILD_USER}@${ROBORIO} 'ulimit -s ${STACK_SIZE} && cd ${BUILD_HOME} && cd ${BUILD_DIR}/${BUILD_DIR_EXTRA} && ${BUILD_CMD}'
 
 install:

README.md

@@ -28,6 +28,9 @@ There are several non-automated steps:
 mkdir /media/sda1/bin
 mkdir /media/sda1/include
 mkdir /media/sda1/lib
+mkdir /media/sda1/lib
+
+rmdir /usr/local/lib
 
 ln -s /media/sda1/bin /usr/local/bin
 ln -s /media/sda1/include /usr/local/include

control

@@ -1,13 +1,13 @@
-Package: python312
-Version: 3.12.1-r1
+Package: python313
+Version: 3.13.0-r1
 Description: Python programming language
 Section: devel
 Priority: optional
 Maintainer: RobotPy Developers <[email protected]>
 License: BSD
 Architecture: cortexa9-vfpv3
-OE: python312
+OE: python313
 Homepage: http://www.python.org
 Depends: libc6
 Recommends: libreadline6
-Source: https://www.python.org/ftp/python/3.12.1/Python-3.12.1.tgz
+Source: https://www.python.org/ftp/python/3.13.0/Python-3.13.0.tgz

postinst

@@ -3,30 +3,30 @@ if [ x"$D" = "x" ]; then
 	if [ -x /sbin/ldconfig ]; then /sbin/ldconfig ; fi
 fi
 # compile library files
-/usr/bin/env PYTHONPATH=/usr/local/lib/python3.12 LD_LIBRARY_PATH=/usr/local/lib \
-    /usr/local/bin/python3 -Wi /usr/local/lib/python3.12/compileall.py \
-    -d lib/python3.12 -f -q \
+/usr/bin/env PYTHONPATH=/usr/local/lib/python3.13 LD_LIBRARY_PATH=/usr/local/lib \
+    /usr/local/bin/python3 -Wi /usr/local/lib/python3.13/compileall.py \
+    -d lib/python3.13 -f -q \
     -x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \
-    /usr/local/lib/python3.12
-/usr/bin/env PYTHONPATH=/usr/local/lib/python3.12 LD_LIBRARY_PATH=/usr/local/lib \
-    /usr/local/bin/python3 -Wi -O /usr/local/lib/python3.12/compileall.py \
-    -d lib/python3.12 -f -q \
+    /usr/local/lib/python3.13
+/usr/bin/env PYTHONPATH=/usr/local/lib/python3.13 LD_LIBRARY_PATH=/usr/local/lib \
+    /usr/local/bin/python3 -Wi -O /usr/local/lib/python3.13/compileall.py \
+    -d lib/python3.13 -f -q \
     -x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \
-    /usr/local/lib/python3.12
-/usr/bin/env PYTHONPATH=/usr/local/lib/python3.12 LD_LIBRARY_PATH=/usr/local/lib \
-    /usr/local/bin/python3 -Wi /usr/local/lib/python3.12/compileall.py \
-    -d lib/python3.12/site-packages -f -q \
-    -x badsyntax /usr/local/lib/python3.12/site-packages
-/usr/bin/env PYTHONPATH=/usr/local/lib/python3.12 LD_LIBRARY_PATH=/usr/local/lib \
-    /usr/local/bin/python3 -Wi -O /usr/local/lib/python3.12/compileall.py \
-    -d lib/python3.12/site-packages -f -q \
-    -x badsyntax /usr/local/lib/python3.12/site-packages
+    /usr/local/lib/python3.13
+/usr/bin/env PYTHONPATH=/usr/local/lib/python3.13 LD_LIBRARY_PATH=/usr/local/lib \
+    /usr/local/bin/python3 -Wi /usr/local/lib/python3.13/compileall.py \
+    -d lib/python3.13/site-packages -f -q \
+    -x badsyntax /usr/local/lib/python3.13/site-packages
+/usr/bin/env PYTHONPATH=/usr/local/lib/python3.13 LD_LIBRARY_PATH=/usr/local/lib \
+    /usr/local/bin/python3 -Wi -O /usr/local/lib/python3.13/compileall.py \
+    -d lib/python3.13/site-packages -f -q \
+    -x badsyntax /usr/local/lib/python3.13/site-packages
 
 # Fix pip to not warn when running as root because we don't care
 sed -i 's/def warn_if_run_as_root() -> None:$/def warn_if_run_as_root() -> None: return\ndef _unused():/g' \
-    /usr/local/lib/python3.12/site-packages/pip/_internal/cli/req_command.py
+    /usr/local/lib/python3.13/site-packages/pip/_internal/cli/req_command.py
 
 # Let user program set RT thread priorities by making CAP_SYS_NICE
 # permitted, inheritable, and effective. See "man 7 capabilities"
 # for docs on capabilities and file capability sets.
-setcap cap_sys_nice+eip /usr/local/bin/python3.12
+setcap cap_sys_nice+eip /usr/local/bin/python3.13

prerm

@@ -1,3 +1,3 @@
 #!/bin/sh
 # delete compiled library files
-find /usr/local/lib/python3.12 -name __pycache__ -type d -prune -exec rm -r '{}' ';'
+find /usr/local/lib/python3.13 -name __pycache__ -type d -prune -exec rm -r '{}' ';'