From patchwork Mon Jan 15 17:33:49 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: auh@yoctoproject.org X-Patchwork-Id: 37845 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id EE5CCC48BF1 for ; Mon, 15 Jan 2024 17:34:00 +0000 (UTC) Received: from a27-191.smtp-out.us-west-2.amazonses.com (a27-191.smtp-out.us-west-2.amazonses.com [54.240.27.191]) by mx.groups.io with SMTP id smtpd.web11.88283.1705340030137066893 for ; Mon, 15 Jan 2024 09:33:50 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@yoctoproject.org header.s=lvjh2tk576v2ro5mi6k4dt3mc6wpqbky header.b=Mfnd8mBX; dkim=pass header.i=@amazonses.com header.s=hsbnp7p3ensaochzwyq5wwmceodymuwv header.b=fjW4YUwc; spf=pass (domain: us-west-2.amazonses.com, ip: 54.240.27.191, mailfrom: 0101018d0e2fca36-9ec8eaa7-bb21-4be7-8d02-8ec7849ce84c-000000@us-west-2.amazonses.com) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=lvjh2tk576v2ro5mi6k4dt3mc6wpqbky; d=yoctoproject.org; t=1705340029; h=Content-Type:MIME-Version:From:To:Cc:Subject:Message-Id:Date; bh=AcYAjNRy2/jLE+nYGP54uyf/P0ODI/2RC/PPj6E4r3k=; b=Mfnd8mBXAKWuRS+dJao1HhUkxxQPFsF8liTObwjVOVCmCwQZdSe5xefpJ3skvgvr c9cmWjQCoDPk54GEG77xZ6TI3E6/7O4sZxhA0OLAAWXARqAOn7DziNs41qGqBPgzM6F GJlKGhXrThA2rDxpeWKgD32kmtw0EKTn6pupSsbo= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=hsbnp7p3ensaochzwyq5wwmceodymuwv; d=amazonses.com; t=1705340029; h=Content-Type:MIME-Version:From:To:Cc:Subject:Message-Id:Date:Feedback-ID; bh=AcYAjNRy2/jLE+nYGP54uyf/P0ODI/2RC/PPj6E4r3k=; b=fjW4YUwcT0JGsrhObytsuLn2XVpjaGviKGte/pSz23jpk2fWugpaNtUr5b5w5QGG OAyz0ayhF1GiJKlK+Pg6YCz2YinO7zK1wNj6uA6RKVgWqju4nX5PxIhM/LRgqpUtTlv MEESJynW8bLYksnpezL4smWt5aHDAbVxXNqaLp0k= MIME-Version: 1.0 From: auh@yoctoproject.org To: Trevor Gamblin Cc: openembedded-core@lists.openembedded.org Subject: [AUH] python3-numpy: upgrading to 1.26.3 SUCCEEDED Message-ID: <0101018d0e2fca36-9ec8eaa7-bb21-4be7-8d02-8ec7849ce84c-000000@us-west-2.amazonses.com> Date: Mon, 15 Jan 2024 17:33:49 +0000 Feedback-ID: 1.us-west-2.9np3MYPs3fEaOBysGKSlUD4KtcmPijcmS9Az2Hwf7iQ=:AmazonSES X-SES-Outgoing: 2024.01.15-54.240.27.191 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Mon, 15 Jan 2024 17:34:00 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/193726 Hello, this email is a notification from the Auto Upgrade Helper that the automatic attempt to upgrade the recipe *python3-numpy* to *1.26.3* has Succeeded. Next steps: - apply the patch: git am 0001-python3-numpy-upgrade-1.26.2-1.26.3.patch - check the changes to upstream patches and summarize them in the commit message, - compile an image that contains the package - perform some basic sanity tests - amend the patch and sign it off: git commit -s --reset-author --amend - send it to the appropriate mailing list Alternatively, if you believe the recipe should not be upgraded at this time, you can fill RECIPE_NO_UPDATE_REASON in respective recipe file so that automatic upgrades would no longer be attempted. Please review the attached files for further information and build/update failures. Any problem please file a bug at https://bugzilla.yoctoproject.org/enter_bug.cgi?product=Automated%20Update%20Handler Regards, The Upgrade Helper -- >8 -- From 14b6473143aa5449eeda14d5d4f4fccde9886153 Mon Sep 17 00:00:00 2001 From: Upgrade Helper Date: Mon, 15 Jan 2024 07:48:37 +0000 Subject: [PATCH] python3-numpy: upgrade 1.26.2 -> 1.26.3 --- ...-and-so-on-for-libraries-by-default-.patch | 10 ++++----- ...1-numpy-core-Define-RISCV-32-support.patch | 8 +++---- .../python3-numpy/fix_reproducibility.patch | 22 +++++++++++++------ ...umpy_1.26.2.bb => python3-numpy_1.26.3.bb} | 2 +- 4 files changed, 23 insertions(+), 19 deletions(-) rename meta/recipes-devtools/python/{python3-numpy_1.26.2.bb => python3-numpy_1.26.3.bb} (96%) diff --git a/meta/recipes-devtools/python/python3-numpy/0001-Don-t-search-usr-and-so-on-for-libraries-by-default-.patch b/meta/recipes-devtools/python/python3-numpy/0001-Don-t-search-usr-and-so-on-for-libraries-by-default-.patch index 9f5f25f9b5..7f40eb13cc 100644 --- a/meta/recipes-devtools/python/python3-numpy/0001-Don-t-search-usr-and-so-on-for-libraries-by-default-.patch +++ b/meta/recipes-devtools/python/python3-numpy/0001-Don-t-search-usr-and-so-on-for-libraries-by-default-.patch @@ -1,4 +1,4 @@ -From 27f6687e49bf555fc494d2f14bae6ecd0fa30f14 Mon Sep 17 00:00:00 2001 +From fa527d4a79e604062a1a53e531544812ba776eb6 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Thu, 10 Dec 2015 13:20:30 +0200 Subject: [PATCH] Don't search /usr and so on for libraries by default to @@ -8,15 +8,16 @@ Subject: [PATCH] Don't search /usr and so on for libraries by default to Upstream-Status: Inappropriate (As the code stands, this is a hack) Signed-off-by: Ross Burton Signed-off-by: Alexander Kanavin + --- numpy/distutils/system_info.py | 42 +++++----------------------------- 1 file changed, 6 insertions(+), 36 deletions(-) diff --git a/numpy/distutils/system_info.py b/numpy/distutils/system_info.py -index 82e864a..135246d 100644 +index feb28f6..a48d6d1 100644 --- a/numpy/distutils/system_info.py +++ b/numpy/distutils/system_info.py -@@ -323,44 +323,14 @@ if sys.platform == 'win32': +@@ -327,44 +327,14 @@ def add_system_root(library_root): add_system_root(os.path.join(conda_dir, 'Library')) else: @@ -67,6 +68,3 @@ index 82e864a..135246d 100644 if os.path.join(sys.prefix, 'lib') not in default_lib_dirs: default_lib_dirs.insert(0, os.path.join(sys.prefix, 'lib')) --- -2.25.1 - diff --git a/meta/recipes-devtools/python/python3-numpy/0001-numpy-core-Define-RISCV-32-support.patch b/meta/recipes-devtools/python/python3-numpy/0001-numpy-core-Define-RISCV-32-support.patch index 676bdbb3af..b2a0dc3f66 100644 --- a/meta/recipes-devtools/python/python3-numpy/0001-numpy-core-Define-RISCV-32-support.patch +++ b/meta/recipes-devtools/python/python3-numpy/0001-numpy-core-Define-RISCV-32-support.patch @@ -1,4 +1,4 @@ -From eb6d6579150bf4684603ce377c51e90ad3bb8109 Mon Sep 17 00:00:00 2001 +From fa40e92c68b99bf2c7028413fe01e7055b2147e4 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sun, 15 Nov 2020 15:32:39 -0800 Subject: [PATCH] numpy/core: Define RISCV-32 support @@ -7,13 +7,14 @@ Helps compile on riscv32 Upstream-Status: Submitted [https://github.com/numpy/numpy/pull/17780] Signed-off-by: Khem Raj + --- numpy/core/include/numpy/npy_cpu.h | 3 +++ numpy/core/include/numpy/npy_endian.h | 1 + 2 files changed, 4 insertions(+) diff --git a/numpy/core/include/numpy/npy_cpu.h b/numpy/core/include/numpy/npy_cpu.h -index 78d229e..04be511 100644 +index a19f8e6..d824d4e 100644 --- a/numpy/core/include/numpy/npy_cpu.h +++ b/numpy/core/include/numpy/npy_cpu.h @@ -19,6 +19,7 @@ @@ -45,6 +46,3 @@ index 5e58a7f..0926212 100644 || defined(NPY_CPU_LOONGARCH) \ || defined(NPY_CPU_WASM) #define NPY_BYTE_ORDER NPY_LITTLE_ENDIAN --- -2.20.1 - diff --git a/meta/recipes-devtools/python/python3-numpy/fix_reproducibility.patch b/meta/recipes-devtools/python/python3-numpy/fix_reproducibility.patch index d952aed00c..917ab916f4 100644 --- a/meta/recipes-devtools/python/python3-numpy/fix_reproducibility.patch +++ b/meta/recipes-devtools/python/python3-numpy/fix_reproducibility.patch @@ -1,7 +1,11 @@ -This regex decides whether to use O3 opimisation on numpy or not. +From b1abe7e7889f35be21008a3b51135040354031f4 Mon Sep 17 00:00:00 2001 +From: Richard Purdie +Date: Fri, 29 Sep 2023 22:53:24 +0100 +Subject: [PATCH] This regex decides whether to use O3 opimisation on numpy or + not. It includes "od", which happens to be a substring of "reproducible" -but not "qemux86-world". +but not "qemux86-world". The regex will run against all compiler options including things like: @@ -18,11 +22,15 @@ reproducible target ran first and won the race to populate sstate. Upstream-Status: Inappropriate [upstream have dropped distutils and switched to meson] Signed-off-by: Richard Purdie -Index: numpy-1.26.0/numpy/distutils/ccompiler_opt.py -=================================================================== ---- numpy-1.26.0.orig/numpy/distutils/ccompiler_opt.py -+++ numpy-1.26.0/numpy/distutils/ccompiler_opt.py -@@ -990,7 +990,7 @@ class _CCompiler: +--- + numpy/distutils/ccompiler_opt.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/numpy/distutils/ccompiler_opt.py b/numpy/distutils/ccompiler_opt.py +index 37a5368..19d7538 100644 +--- a/numpy/distutils/ccompiler_opt.py ++++ b/numpy/distutils/ccompiler_opt.py +@@ -991,7 +991,7 @@ def __init__(self): ("cc_is_nocc", "", ""), ) detect_args = ( diff --git a/meta/recipes-devtools/python/python3-numpy_1.26.2.bb b/meta/recipes-devtools/python/python3-numpy_1.26.3.bb similarity index 96% rename from meta/recipes-devtools/python/python3-numpy_1.26.2.bb rename to meta/recipes-devtools/python/python3-numpy_1.26.3.bb index 253b334367..023d40a9b2 100644 --- a/meta/recipes-devtools/python/python3-numpy_1.26.2.bb +++ b/meta/recipes-devtools/python/python3-numpy_1.26.3.bb @@ -13,7 +13,7 @@ SRC_URI = "${GITHUB_BASE_URI}/download/v${PV}/${SRCNAME}-${PV}.tar.gz \ file://fix_reproducibility.patch \ file://run-ptest \ " -SRC_URI[sha256sum] = "f65738447676ab5777f11e6bbbdb8ce11b785e105f690bc45966574816b6d3ea" +SRC_URI[sha256sum] = "697df43e2b6310ecc9d95f05d5ef20eacc09c7c4ecc9da3f235d39e71b7da1e4" GITHUB_BASE_URI = "https://github.com/numpy/numpy/releases" UPSTREAM_CHECK_REGEX = "releases/tag/v?(?P\d+(\.\d+)+)$"