From 21b00f3eb082e5de6eccd47992d8f170c6d3881f Mon Sep 17 00:00:00 2001 From: Tyler R Rindels <36929500+trindels@users.noreply.github.com> Date: Sat, 11 Jan 2025 12:57:43 -0600 Subject: [PATCH 1/2] Update numpy to 2.2.1 --- packages.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages.toml b/packages.toml index c8a21f1..2e39028 100644 --- a/packages.toml +++ b/packages.toml @@ -33,7 +33,7 @@ version = "1.8.7" # NPY_DISABLE_SVML = "1" [packages.numpy] -version = "2.1.3" +version = "2.2.1" #mod_version = "1.25.2+r2" build_pip_requirements = ["Cython>=3.0.6", "meson-python>=0.15.0", "ninja", "pkgconf"] cross_pip_requirements = ["robotpy-openblas-dev"] From dfa51cf62f90a408ef29c8b550afb53edfd88c51 Mon Sep 17 00:00:00 2001 From: Dustin Spicuzza Date: Sat, 11 Jan 2025 20:24:45 -0500 Subject: [PATCH 2/2] Update compile versions --- meson-cross-roborio.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/meson-cross-roborio.txt b/meson-cross-roborio.txt index afe7dc5..d7251e8 100644 --- a/meson-cross-roborio.txt +++ b/meson-cross-roborio.txt @@ -1,11 +1,11 @@ # TODO: probably should just ship this in the cross-compilation docker container? [binaries] -c = 'arm-frc2024-linux-gnueabi-gcc' -cpp = 'arm-frc2024-linux-gnueabi-g++' -ar = 'arm-frc2024-linux-gnueabi-ar' -strip = 'arm-frc2024-linux-gnueabi-strip' -gfortran = 'arm-frc2024-linux-gnueabi-gfortran' +c = 'arm-frc2025-linux-gnueabi-gcc' +cpp = 'arm-frc2025-linux-gnueabi-g++' +ar = 'arm-frc2025-linux-gnueabi-ar' +strip = 'arm-frc2025-linux-gnueabi-strip' +gfortran = 'arm-frc2025-linux-gnueabi-gfortran' # requires pkgconf to be installed in build-pip pkg-config = '/build/venv/build/bin/pkgconf'