From patchwork Sun May 18 17:33:06 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 63160 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 B58CBC3ABDD for ; Sun, 18 May 2025 17:33:16 +0000 (UTC) Received: from mail-pf1-f172.google.com (mail-pf1-f172.google.com [209.85.210.172]) by mx.groups.io with SMTP id smtpd.web10.34326.1747589592621359817 for ; Sun, 18 May 2025 10:33:12 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=GWZxrZHe; spf=pass (domain: gmail.com, ip: 209.85.210.172, mailfrom: raj.khem@gmail.com) Received: by mail-pf1-f172.google.com with SMTP id d2e1a72fcca58-742caef5896so261491b3a.3 for ; Sun, 18 May 2025 10:33:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1747589592; x=1748194392; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=opbjN+gkfgtlirG9nckK3EEpcZI0OTur7664sVJte+U=; b=GWZxrZHe9hh711SoiPSG9ct7hEeYcwKW1bRaktb3Kf4UzjFKw1MtweLINAnCsTJfXk 4AReiZS64Qj/d5RiPK6GPQrYVumg98QZODfMXYD+wcfo4N6FZX43gn/yzk5xkys7RjZa FINhfYdyIBNrfTt9vvW1UYPC4z4v72KhMNMjjo9EfyOa1zZ7I03/tCSzITjeEE8Dro60 RkgzW8PmdMA44TH5eponWjqht6BtObWXmhXpiJEe3ftrK3NjQiXoQtbaT36w+jpulhJW n3Xiik69vfpIxj4vXAG1sGjrsJbDQuUQI3af08Mw/AXhudsb/NEh8mlxm6I591DXEgeB KFKg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747589592; x=1748194392; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=opbjN+gkfgtlirG9nckK3EEpcZI0OTur7664sVJte+U=; b=Tup6ao2PPt0X18zSpv/OVA8MnxBSdadRQNkG/cNkRDyi8v5W0kS62X7DfubYawdYBH QOEnzMYfzNxQH41DltsMD0+QV96NmlfJ76dNYxiUWgAhjRwNh5T3/ZPaWF/rzsiXg1VN lAhQCrURl/ur+eypd6Z6E6xoMWOfLiYsoyLJnCEX81RUfLSqWQqRoZEwv7t9DCdiUtAT cs+k/emWq1nTz2ETUNFxX8Hb3OcsRhUt3IoeyZ6Dp9SRlOnr0hf3U5hHRdWLsG8HA8zg tyxHWzYbjfebEM/7rA+9HF0rt9ohBMR8TyvLwFnEgqVGl3cdfiOc2k9Dy502aNxu5wKZ CjCQ== X-Gm-Message-State: AOJu0Yz2QalzPBEzlg3zl4/Tp6XFbh9MOAd8Hy3yZKwwiOa4pcBe5Jw9 uJVvhmEUnOe1FOa8X0rbU9x6BNshAclXBxW2CxrnkewQHe1ViaeKCljYV05No7zv X-Gm-Gg: ASbGncuX5X4KmT3t1XtfJFeGweFUHPn7MHyHfb0l/k30mIv1Iir8qHYaR1Xcgn+CCWd S0zycP/4q1Dp4AzlwEd139iENcO8eRbXGYdWtS5eCJFSENx8gVW71HhjzG3Wvyl/fF0NvcPdxH0 DkOE0RLjcSfMgG2uwxFbFEyyHCjb2WhRE49tFS7OiAtMLSF26ysgXq+uw3twS/jvlYyjEOsDqQS VA6By0VNyGgJ6eAhQSGvdqMa5V7XdkgDhN4Y9Hvq2DnyBK4xTQMjBsCBO1EorknRRYLddllhlGb NPvQ1ovIJfQBNXia7OJksF8RfRRjm3zRUnzB7qbnIKc= X-Google-Smtp-Source: AGHT+IE8cDuZ4VoLtkuo2QWI9t+6vX8uJXZb7Hjum0f0Nnm+GX9r30n6yB5D2hCSHiuf8UzPB63m9Q== X-Received: by 2002:a05:6a00:4614:b0:740:b3d9:551 with SMTP id d2e1a72fcca58-742a98c8aebmr13939849b3a.22.1747589591659; Sun, 18 May 2025 10:33:11 -0700 (PDT) Received: from apollo.localdomain ([2601:646:8201:fd20::5209]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-742a970bb2fsm4890177b3a.53.2025.05.18.10.33.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 18 May 2025 10:33:11 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-python][PATCH 1/4] python3-pandas: Upgrade to 2.2.3 Date: Sun, 18 May 2025 10:33:06 -0700 Message-ID: <20250518173309.3600728-1-raj.khem@gmail.com> X-Mailer: git-send-email 2.49.0 MIME-Version: 1.0 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 ; Sun, 18 May 2025 17:33:16 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/117456 Fixes build with cython >=3.1 Drop patch to pin numpy to 1.x Signed-off-by: Khem Raj --- ...ion-to-specify-numpy-header-location.patch | 5 ---- ...Downgrade-numpy-version-needs-to-1.x.patch | 27 ------------------- ...t.toml-don-t-pin-dependency-versions.patch | 11 +++----- ...andas_2.2.2.bb => python3-pandas_2.2.3.bb} | 3 +-- 4 files changed, 4 insertions(+), 42 deletions(-) delete mode 100644 meta-python/recipes-devtools/python/python3-pandas/0001-pyproject.toml-Downgrade-numpy-version-needs-to-1.x.patch rename meta-python/recipes-devtools/python/{python3-pandas_2.2.2.bb => python3-pandas_2.2.3.bb} (87%) diff --git a/meta-python/recipes-devtools/python/python3-pandas/0001-BLD-add-option-to-specify-numpy-header-location.patch b/meta-python/recipes-devtools/python/python3-pandas/0001-BLD-add-option-to-specify-numpy-header-location.patch index 87023a24ec..e83576eb62 100644 --- a/meta-python/recipes-devtools/python/python3-pandas/0001-BLD-add-option-to-specify-numpy-header-location.patch +++ b/meta-python/recipes-devtools/python/python3-pandas/0001-BLD-add-option-to-specify-numpy-header-location.patch @@ -25,15 +25,10 @@ Signed-off-by: Gyorgy Sarvari 2 files changed, 11 insertions(+), 3 deletions(-) create mode 100644 meson.options -diff --git a/meson.options b/meson.options -new file mode 100644 -index 0000000000..3d3a18d145 --- /dev/null +++ b/meson.options @@ -0,0 +1 @@ +option('numpy_inc_dir', type : 'string', description : 'The absolute path to the numpy headers') -diff --git a/pandas/meson.build b/pandas/meson.build -index 435103a..a08c77a 100644 --- a/pandas/meson.build +++ b/pandas/meson.build @@ -3,17 +3,24 @@ incdir_numpy = run_command(py, diff --git a/meta-python/recipes-devtools/python/python3-pandas/0001-pyproject.toml-Downgrade-numpy-version-needs-to-1.x.patch b/meta-python/recipes-devtools/python/python3-pandas/0001-pyproject.toml-Downgrade-numpy-version-needs-to-1.x.patch deleted file mode 100644 index b0ef8ce00c..0000000000 --- a/meta-python/recipes-devtools/python/python3-pandas/0001-pyproject.toml-Downgrade-numpy-version-needs-to-1.x.patch +++ /dev/null @@ -1,27 +0,0 @@ -From d81d95274d84ac51fc02e0fa91affc7f3cbefccb Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sat, 24 Aug 2024 10:21:43 -0700 -Subject: [PATCH] pyproject.toml: Downgrade numpy version needs to 1.x - -Drop it when numpy is upgraded to 2.x or newer in core - -Upstream-Status: Inappropriate [OE workaround] - -Signed-off-by: Khem Raj ---- - pyproject.toml | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/pyproject.toml b/pyproject.toml -index 5158d60..d3daa78 100644 ---- a/pyproject.toml -+++ b/pyproject.toml -@@ -8,7 +8,7 @@ requires = [ - "Cython>=3.0.5", # Note: sync with setup.py, environment.yml and asv.conf.json - # Force numpy higher than 2.0rc1, so that built wheels are compatible - # with both numpy 1 and 2 -- "numpy>=2.0.0rc1", -+ "numpy>=1.24.0", - "versioneer[toml]" - ] - diff --git a/meta-python/recipes-devtools/python/python3-pandas/0001-pyproject.toml-don-t-pin-dependency-versions.patch b/meta-python/recipes-devtools/python/python3-pandas/0001-pyproject.toml-don-t-pin-dependency-versions.patch index f60f43a5b0..950f25303f 100644 --- a/meta-python/recipes-devtools/python/python3-pandas/0001-pyproject.toml-don-t-pin-dependency-versions.patch +++ b/meta-python/recipes-devtools/python/python3-pandas/0001-pyproject.toml-don-t-pin-dependency-versions.patch @@ -14,8 +14,6 @@ Signed-off-by: Trevor Gamblin pyproject.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -diff --git a/pyproject.toml b/pyproject.toml -index db9f055799..5158d60f59 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -2,10 +2,10 @@ @@ -27,11 +25,8 @@ index db9f055799..5158d60f59 100644 + "meson-python>=0.13.1", + "meson>=1.2.1", "wheel", -- "Cython==3.0.5", # Note: sync with setup.py, environment.yml and asv.conf.json +- "Cython~=3.0.5", # Note: sync with setup.py, environment.yml and asv.conf.json + "Cython>=3.0.5", # Note: sync with setup.py, environment.yml and asv.conf.json - # Force numpy higher than 2.0rc1, so that built wheels are compatible + # Force numpy higher than 2.0, so that built wheels are compatible # with both numpy 1 and 2 - "numpy>=2.0.0rc1", --- -2.39.2 - + "numpy>=2.0", diff --git a/meta-python/recipes-devtools/python/python3-pandas_2.2.2.bb b/meta-python/recipes-devtools/python/python3-pandas_2.2.3.bb similarity index 87% rename from meta-python/recipes-devtools/python/python3-pandas_2.2.2.bb rename to meta-python/recipes-devtools/python/python3-pandas_2.2.3.bb index b956f5ca2f..3e41e4aa6f 100644 --- a/meta-python/recipes-devtools/python/python3-pandas_2.2.2.bb +++ b/meta-python/recipes-devtools/python/python3-pandas_2.2.3.bb @@ -8,12 +8,11 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=cb819092901ddb13a7d0a4f5e05f098a" SRC_URI += " \ file://0001-pyproject.toml-don-t-pin-dependency-versions.patch \ - file://0001-pyproject.toml-Downgrade-numpy-version-needs-to-1.x.patch \ " SRC_URI:append:class-target = " file://0001-BLD-add-option-to-specify-numpy-header-location.patch " -SRC_URI[sha256sum] = "9e79019aba43cb4fda9e4d983f8e88ca0373adbb697ae9c6c43093218de28b54" +SRC_URI[sha256sum] = "4f18ba62b61d7e192368b84517265a99b4d7ee8912f8708660fb4a366cc82667" inherit pkgconfig pypi python_mesonpy cython From patchwork Sun May 18 17:33:07 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 63159 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 C41D9C54795 for ; Sun, 18 May 2025 17:33:16 +0000 (UTC) Received: from mail-pf1-f169.google.com (mail-pf1-f169.google.com [209.85.210.169]) by mx.groups.io with SMTP id smtpd.web10.34327.1747589593528490490 for ; Sun, 18 May 2025 10:33:13 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=lw99OCs2; spf=pass (domain: gmail.com, ip: 209.85.210.169, mailfrom: raj.khem@gmail.com) Received: by mail-pf1-f169.google.com with SMTP id d2e1a72fcca58-7370a2d1981so2901720b3a.2 for ; Sun, 18 May 2025 10:33:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1747589593; x=1748194393; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=kd93sYILRkmlX7gsHyafgeGt3LOK4x+wQ+Wqmp6uQ4A=; b=lw99OCs2nEF/rbfNhenMr2xfBgu+kIu2XFv6q+JWXviJHVKpYf4oj6dJggaO+tq+R4 YjcKR5gwOMDFXW7YbiIqFHlQ/GzsVMGirZDdNkaAiAhUpJ8Y3LbG4M/hhTvcW7vAaDNV fvXIqUW1iEIBeRWDl710kxBkLHFnAeRNm0MzgWbO2+6Tmf0ttLJuV2OW9MLWajH749Qg p+prSXKizoEZ0UHCqH/GV4R3HD3bpdaTxZ1K78trc5xgLoIgDsUd6T2z5DI+WGcx4sVH ZjhF0bdEKtDPOrbeNy51L3yadjULgUapg8vNQQh8fzrr3Z++QMCeSjGamGTfHlptIIX+ Ov9Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747589593; x=1748194393; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=kd93sYILRkmlX7gsHyafgeGt3LOK4x+wQ+Wqmp6uQ4A=; b=VuRrLeR4qFkXQiiL4u2hGCG6k3Ybonb3vcesh/x1GU82GTTZtCRAZfp8F+NVZ0e+7F 0JESJC2ze3DdwD5Cei8S95RUHvR7jjW8GXrTxNgzqx7h1K/mpGlcdwoXXFo/s+QUHkFw UU1gTHyd7HrtzFRxdJbLIh8sYDVJK4Jcm5Ip4lQrw448iWB9sxGXOLJrxPVsnT4IOIqi 8rwT54WhQhiqodDjn9PpFL7hSw8hgfbCFHV2mgD/ZZ+EGzgq5BpF6AsP4Ny/+qjtqsHI X+S7X+ymPbcT0ySpTuUDfGjvpbqzfwFvPElIMRxyQb4vkrcTR9mi69xHsRAbs7/sAZ6f mIVA== X-Gm-Message-State: AOJu0YwxISVLOhZzDSXh4D7Nh+6NmzjbZjbfgNUYm9IARAEb0wjE7Vgu WWeV/h/VVoAXgLRTm0NlFoe+zVgWRyNUwx5Q50jSC7M1Sddo6RwYG2yUsRya4V6N X-Gm-Gg: ASbGncveki1ls25Y77vvu4CPeB+GBs4VJtmd9+tldRYPzy2cuDPhHzOyy7iPBePYA0p K2oWYRfTZQuyiW1pterULN2CMy1vhamPXP5YzMKnG3TuHOzrly7nuq5iz68CayhL0MO5Op6XaW1 GcPwW5PP5WcLgTff5wicWwVQl541Ik7ainA667GqAmsx9D7i3tKQfS+pKaZl5QQ4OnTphgSYni1 6gugzqFIWq/aV09ciWtU4qLXJ3msCukwG6pz/6dwmdvtGk9gy2KkwHIjcHxe6YPQyaY7L9Haqt4 eQ3qwXI4wnBMzio3y/p1SM+KXVUDYqrzcNMvFXgVvl8= X-Google-Smtp-Source: AGHT+IFFUIX6lu2K2xZkjPO9w8Tm4RZK7Gxs2hgq38qjkG4eQ/7iHAB/hR6PEhcko6phE0ao/9r48g== X-Received: by 2002:a05:6a00:9094:b0:736:57cb:f2b6 with SMTP id d2e1a72fcca58-742acce138dmr13390298b3a.12.1747589592600; Sun, 18 May 2025 10:33:12 -0700 (PDT) Received: from apollo.localdomain ([2601:646:8201:fd20::5209]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-742a970bb2fsm4890177b3a.53.2025.05.18.10.33.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 18 May 2025 10:33:12 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-python][PATCH 2/4] python3-kivy: Fix build with cython 3.1 Date: Sun, 18 May 2025 10:33:07 -0700 Message-ID: <20250518173309.3600728-2-raj.khem@gmail.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250518173309.3600728-1-raj.khem@gmail.com> References: <20250518173309.3600728-1-raj.khem@gmail.com> MIME-Version: 1.0 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 ; Sun, 18 May 2025 17:33:16 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/117457 Backport needed patch from upstream top of tree branch Signed-off-by: Khem Raj --- ...n-2-long-from-Cython-files-fixes-bui.patch | 63 +++++++++++++++++++ .../python/python3-kivy_2.3.1.bb | 1 + 2 files changed, 64 insertions(+) create mode 100644 meta-python/recipes-devtools/python/python3-kivy/0001-Remove-old-Python-2-long-from-Cython-files-fixes-bui.patch diff --git a/meta-python/recipes-devtools/python/python3-kivy/0001-Remove-old-Python-2-long-from-Cython-files-fixes-bui.patch b/meta-python/recipes-devtools/python/python3-kivy/0001-Remove-old-Python-2-long-from-Cython-files-fixes-bui.patch new file mode 100644 index 0000000000..c68e227482 --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-kivy/0001-Remove-old-Python-2-long-from-Cython-files-fixes-bui.patch @@ -0,0 +1,63 @@ +From 288e3d5ecff1bc5e7de29d9daddb83d697280004 Mon Sep 17 00:00:00 2001 +From: Mirko Galimberti +Date: Sun, 18 May 2025 09:38:14 +0200 +Subject: [PATCH] Remove old Python 2 long from Cython files, fixes build with + Cython `3.1.x` (#9056) + +Upstream-Status: Backport [https://github.com/kivy/kivy/commit/5a1b27d7d3bdee6cedb55440bfae9c4e66fb3c68] +Signed-off-by: Khem Raj +--- + kivy/graphics/context_instructions.pyx | 2 +- + kivy/graphics/opengl.pyx | 4 ++-- + kivy/weakproxy.pyx | 3 --- + 3 files changed, 3 insertions(+), 6 deletions(-) + +diff --git a/kivy/graphics/context_instructions.pyx b/kivy/graphics/context_instructions.pyx +index 0d4b8f548..1c23c0e1c 100644 +--- a/kivy/graphics/context_instructions.pyx ++++ b/kivy/graphics/context_instructions.pyx +@@ -86,7 +86,7 @@ cdef tuple rgb_to_hsv(float r, float g, float b): + + cdef tuple hsv_to_rgb(float h, float s, float v): + if s == 0.0: return v, v, v +- cdef long i = long(h * 6.0) ++ cdef long i = (h * 6.0) + cdef float f = (h * 6.0) - i + cdef float p = v * (1.0 - s) + cdef float q = v * (1.0 - s * f) +diff --git a/kivy/graphics/opengl.pyx b/kivy/graphics/opengl.pyx +index bcca70842..f535c62a6 100644 +--- a/kivy/graphics/opengl.pyx ++++ b/kivy/graphics/opengl.pyx +@@ -689,7 +689,7 @@ def glDrawElements(GLenum mode, GLsizei count, GLenum type, indices): + cdef void *ptr = NULL + if isinstance(indices, bytes): + ptr = ((indices)) +- elif isinstance(indices, (long, int)): ++ elif isinstance(indices, int): + ptr = (indices) + else: + raise TypeError("Argument 'indices' has incorrect type (expected bytes or int).") +@@ -1539,7 +1539,7 @@ def glVertexAttribPointer(GLuint index, GLint size, GLenum type, GLboolean norma + cdef void *ptr = NULL + if isinstance(data, bytes): + ptr = ((data)) +- elif isinstance(data, (long, int)): ++ elif isinstance(data, int): + ptr = (data) + else: + raise TypeError("Argument 'data' has incorrect type (expected bytes or int).") +diff --git a/kivy/weakproxy.pyx b/kivy/weakproxy.pyx +index cac4fe66b..e8e1c0b77 100644 +--- a/kivy/weakproxy.pyx ++++ b/kivy/weakproxy.pyx +@@ -253,9 +253,6 @@ cdef class WeakProxy(object): + def __int__(self): + return int(self.__ref__()) + +- def __long__(self): +- return long(self.__ref__()) +- + def __float__(self): + return float(self.__ref__()) + diff --git a/meta-python/recipes-devtools/python/python3-kivy_2.3.1.bb b/meta-python/recipes-devtools/python/python3-kivy_2.3.1.bb index dd60ea43d5..83dc97955c 100644 --- a/meta-python/recipes-devtools/python/python3-kivy_2.3.1.bb +++ b/meta-python/recipes-devtools/python/python3-kivy_2.3.1.bb @@ -12,6 +12,7 @@ inherit setuptools3 pkgconfig features_check cython # Also, if using SDL2 as backend, SDL2 needs to be configured with gles SRC_URI = "git://github.com/kivy/kivy.git;protocol=https;branch=stable \ file://0001-add-support-for-glesv2.patch \ + file://0001-Remove-old-Python-2-long-from-Cython-files-fixes-bui.patch \ " SRCREV = "20d74dcd30f143abbd1aa94c76bafc5bd934d5bd" From patchwork Sun May 18 17:33:08 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 63157 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 B3C95C3ABD8 for ; Sun, 18 May 2025 17:33:16 +0000 (UTC) Received: from mail-pf1-f176.google.com (mail-pf1-f176.google.com [209.85.210.176]) by mx.groups.io with SMTP id smtpd.web11.34297.1747589594446071729 for ; Sun, 18 May 2025 10:33:14 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=RYzbnGIG; spf=pass (domain: gmail.com, ip: 209.85.210.176, mailfrom: raj.khem@gmail.com) Received: by mail-pf1-f176.google.com with SMTP id d2e1a72fcca58-742c96af71dso650093b3a.0 for ; Sun, 18 May 2025 10:33:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1747589593; x=1748194393; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=AZgzLQTiOtM36rGyAuBmrBd19mICcZA5uX+u/yNbbjg=; b=RYzbnGIG4/wEzEV/HqUkX7xUXQ0VfbR6v2a32h5N+NXglqgOjsFWL+lGF6qDuP0vTm 4s38Sbyu2+BLSTqiC++S0L15BkTk082iY7X3Z7E5bmEPHmAzH3HAzRJyCbNx8mEDUWV8 t4yeH+Uumkk8ZZ4PxUjdZ3DELeWQmDP8+7hkDbPupsQSuhj6urZXgsY1XyL2XM4D9W1d lE2VYjiXlg8qLjhgMLl4I/9SEEaB0Bu+emyJHFwwiEFF6IynzLBy6AlUt8LHWZoReqKq ImA+ak7cdxemAMByc9h5EMIeich/I85GUN9d8/u6IPaPhpE8xiYuvBi+fei5mgSpmf48 8+Gw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747589593; x=1748194393; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=AZgzLQTiOtM36rGyAuBmrBd19mICcZA5uX+u/yNbbjg=; b=UyLnr3FOUOEa0t0r4lN95mGGib3c7HPXLuwxnoo3Vngjd8B0YI5/WC02C7pUTws24x P52X5X30dbZMcqh+V4xZKDmQNLsUxrRf81T5ehn/c2r6SgXgCrIAnJo/oRIQLc3sCCYw Wee3KdINwk76PPwCvM8kq4U8ZCZJ+r+idleuWCan2bXxU2RmLxDEqfkyVqNVMiuaQh0C xi3/e0dx1FzxlPljEJG+g4rjO0Nm0Deb8FCkJhXNT192O1EDoeW7TPCTzhwZI/PRyFTX eG0aIRZPGznWofMazTqrn/IwX8yQd2fPQitc5qovpnuQtEiqHuUx7HT9Dg37PZtz8+h9 B/hg== X-Gm-Message-State: AOJu0Yxh304gYwkDJLYRVSUplsH5m/PFK1+mnpdI4MOtGd4dt0CYvqU9 zP5gphZPyxGwsFBGprawsOk+TgcJdxqYCuyUtARCVdnwUHMLXHvYFumK/XwxrnNY X-Gm-Gg: ASbGncvkzjviU9wJ4SB34INY0ixDxIqcKq3pwd4wwAv8/mK/QuIU8lIxLExwhvoT+Ps RkB71XBKN3sGQJ3C2ByGpSoelORbFplDOkemMgiyGw+qzqR9Y5BuQotlDRGn7x09VznvcpvKHIc 9Kw7k4s1exAM0U9jax1po55Xh+50PemM1y9fVCLUDhxHuoVgXluiI16YMSXF1xbjB9P6WmTc5Wr jSf8FbZhAQtIsu1sWkOUVbdreUgpkW8sZdBtcPPkUQTcy4Vbm0OiXlsRqUE/TLlhyjMmGs/kB+V q3ZusjxcGNwWprjwzqezq4cksxWuxGo5A6OiYUCequE= X-Google-Smtp-Source: AGHT+IEMySufQwoW0uwYnSbWe5EVkWuzLiJsCteU4UGsessDeOoxUbnTE2+jYLYGCyOxLBZ1Rqn5nQ== X-Received: by 2002:aa7:9307:0:b0:73e:30dc:bb9b with SMTP id d2e1a72fcca58-742a978948dmr14767825b3a.2.1747589593529; Sun, 18 May 2025 10:33:13 -0700 (PDT) Received: from apollo.localdomain ([2601:646:8201:fd20::5209]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-742a970bb2fsm4890177b3a.53.2025.05.18.10.33.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 18 May 2025 10:33:13 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-python][PATCH 3/4] python3-dbus-fast: Fix build with cython 3.1 Date: Sun, 18 May 2025 10:33:08 -0700 Message-ID: <20250518173309.3600728-3-raj.khem@gmail.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250518173309.3600728-1-raj.khem@gmail.com> References: <20250518173309.3600728-1-raj.khem@gmail.com> MIME-Version: 1.0 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 ; Sun, 18 May 2025 17:33:16 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/117458 Signed-off-by: Khem Raj --- ...emove-upper-version-constraint-for-C.patch | 33 +++++++++++++++++++ .../python/python3-dbus-fast_2.44.1.bb | 1 + 2 files changed, 34 insertions(+) create mode 100644 meta-python/recipes-devtools/python/python3-dbus-fast/0001-pyproject.toml-Remove-upper-version-constraint-for-C.patch diff --git a/meta-python/recipes-devtools/python/python3-dbus-fast/0001-pyproject.toml-Remove-upper-version-constraint-for-C.patch b/meta-python/recipes-devtools/python/python3-dbus-fast/0001-pyproject.toml-Remove-upper-version-constraint-for-C.patch new file mode 100644 index 0000000000..fb8f4df4a6 --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-dbus-fast/0001-pyproject.toml-Remove-upper-version-constraint-for-C.patch @@ -0,0 +1,33 @@ +From 85189fb66d3abb2645605f8a3c14d8152ef755fe Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sun, 18 May 2025 10:24:19 -0700 +Subject: [PATCH] pyproject.toml: Remove upper version constraint for Cython + +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- + pyproject.toml | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/pyproject.toml b/pyproject.toml +index e22ea42..f670d3d 100644 +--- a/pyproject.toml ++++ b/pyproject.toml +@@ -50,7 +50,7 @@ pytest-cov = ">=3,<7" + pytest-asyncio = ">=0.19,<0.27" + pycairo = "^1.21.0" + PyGObject = {version = ">=3.50,<3.51", python = "<4"} +-Cython = ">=3,<3.1.0" ++Cython = ">=3" + setuptools = ">=65.4.1,<79.0.0" + pytest-timeout = "^2.1.0" + pytest-codspeed = "^3.1.1" +@@ -104,7 +104,7 @@ module = "docs.*" + ignore_errors = true + + [build-system] +-requires = ['setuptools>=65.4.1', 'wheel', 'Cython>=3,<3.1.0', "poetry-core>=1.0.0"] ++requires = ['setuptools>=65.4.1', 'wheel', 'Cython>=3', "poetry-core>=1.0.0"] + build-backend = "poetry.core.masonry.api" + + [tool.ruff] diff --git a/meta-python/recipes-devtools/python/python3-dbus-fast_2.44.1.bb b/meta-python/recipes-devtools/python/python3-dbus-fast_2.44.1.bb index 95f1eafebd..f827d21bb2 100644 --- a/meta-python/recipes-devtools/python/python3-dbus-fast_2.44.1.bb +++ b/meta-python/recipes-devtools/python/python3-dbus-fast_2.44.1.bb @@ -3,6 +3,7 @@ HOMEPAGE = "https://github.com/bluetooth-devices/dbus-fast" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=729e372b5ea0168438e4fd4a00a04947" +SRC_URI += "file://0001-pyproject.toml-Remove-upper-version-constraint-for-C.patch" SRC_URI[sha256sum] = "b027e96c39ed5622bb54d811dcdbbe9d9d6edec3454808a85a1ceb1867d9e25c" PYPI_PACKAGE = "dbus_fast" From patchwork Sun May 18 17:33:09 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 63158 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 B63A6C54756 for ; Sun, 18 May 2025 17:33:16 +0000 (UTC) Received: from mail-pf1-f180.google.com (mail-pf1-f180.google.com [209.85.210.180]) by mx.groups.io with SMTP id smtpd.web10.34328.1747589595371464029 for ; Sun, 18 May 2025 10:33:15 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=S5hgdGZh; spf=pass (domain: gmail.com, ip: 209.85.210.180, mailfrom: raj.khem@gmail.com) Received: by mail-pf1-f180.google.com with SMTP id d2e1a72fcca58-742b614581dso2018524b3a.3 for ; Sun, 18 May 2025 10:33:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1747589594; x=1748194394; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=3AsrgDPcGt4n/bAJBeLU5/5Js/U3+d39On1CFBLCvV8=; b=S5hgdGZhZJyZ5cZ+16Agq89aVa3SLA/JNDq+EKLVxY3SChqJkTP4GuJycc7nvoL+9A LEo8pO/uJWAapEct9SqWHCJrx1CVrSyQFT9q738GEPqpXbPIc+/024ZVJovCp6yFLG1H cE9o9ubpwfZdD/S3y4vg28W0U7P5XvvvSJjcypnEqKDpama0jusiLtAe6HmvasU9Yx50 OupF840CYp5p63PTvy0Zk7Qc7pK2oDc6kxvfvi7wqWHDqSHB2CMtQoUGkRPeLjUDR3oZ cRCaOvm8VJoenjJ5jinQQDivQZtDdvutz/TFMkdSFvOIW/NhwmnMKO1+UGjo6RTwJkcJ Q04g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747589594; x=1748194394; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=3AsrgDPcGt4n/bAJBeLU5/5Js/U3+d39On1CFBLCvV8=; b=P8+nXbQifcAlqmb3jgnkdW07eJFGXEh8oxhPfreAgYRXqHpcbejizMOqK3EIYxCV9g UmC741GxFUvTODYe2XhJXbchimDp01UfIhTHsc3tMQ2JO0W8MaRAzEHqGRprZCftdd5V qG4AgQ1HVaOjFyFWbsME8p0cc7By5BmRCzYikasPqfQWaQPbMZ2KKfcfg6FNhb5NMFET qG1AWPpjM3XtggBBSaXJclPKxy5sK38FIqGOJWkTECHzwqFtZC0rOKpTSaeB+iQdrH0m A7daLtl9nixEGISVZ9pdXTvH073VusgHAYJpA051JvXGTTrQh9mC1rDI6bYZ4T9uD6hO iuvA== X-Gm-Message-State: AOJu0YxJUdA5ralSyb5idIFfmmkNAVL+pOI5P4Xky2kEQrMeQCFCzWCp bUPF3Y/I5Kx0Z/9by6EpDrclMbhzSl1yNmOvvtQpWAp3XxQhttjihBFLzfHbGGDR X-Gm-Gg: ASbGnct4/Zc9YWaFGAmkNWSSSZ0aVjcbGNMlRBvja3reVG9pz2hC6EzBZTG78oEKteW 1b/Jsc9qo6eWR0+FCLRp9ENWVIViIt46E0Jgg/NUdpHO6TiZnnWyUD9HjD1yWCwPe4mXj03BBvY +47ywYNMWWO8csIZCSzdheuqaxH3YZoEND468ErfiHntfYByOIYmUhGukHr4f19VuBzyzoLPtNN ceZdS//HlsPHcfZ7uX9f7XxtXchehVQg7kojfsJMD1R60P8NFD0CDUgqX/a15CMM70gLMy0Ev4o yFgpjNP8tur42+45J/boL6WpkDryPNWzf+LQ1SjzZ6E= X-Google-Smtp-Source: AGHT+IGHo+XQ85uanOd2QGEOn6U5Ml0PQp3IuraTOAM7pla5oQpAy9IdsN1xhazxhXEJFbHauKo9Lg== X-Received: by 2002:a05:6a00:94a7:b0:740:91eb:c66 with SMTP id d2e1a72fcca58-742acc906b0mr13754011b3a.3.1747589594476; Sun, 18 May 2025 10:33:14 -0700 (PDT) Received: from apollo.localdomain ([2601:646:8201:fd20::5209]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-742a970bb2fsm4890177b3a.53.2025.05.18.10.33.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 18 May 2025 10:33:13 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-python][PATCH 4/4] python3-propcache: Fix build with cython 3.1 Date: Sun, 18 May 2025 10:33:09 -0700 Message-ID: <20250518173309.3600728-4-raj.khem@gmail.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250518173309.3600728-1-raj.khem@gmail.com> References: <20250518173309.3600728-1-raj.khem@gmail.com> MIME-Version: 1.0 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 ; Sun, 18 May 2025 17:33:16 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/117459 Signed-off-by: Khem Raj --- .../0001-Fix-build-with-cython-3.1.x.patch | 34 +++++++++++++++++++ .../python/python3-propcache_0.3.1.bb | 1 + 2 files changed, 35 insertions(+) create mode 100644 meta-python/recipes-devtools/python/python3-propcache/0001-Fix-build-with-cython-3.1.x.patch diff --git a/meta-python/recipes-devtools/python/python3-propcache/0001-Fix-build-with-cython-3.1.x.patch b/meta-python/recipes-devtools/python/python3-propcache/0001-Fix-build-with-cython-3.1.x.patch new file mode 100644 index 0000000000..3b86b23c00 --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-propcache/0001-Fix-build-with-cython-3.1.x.patch @@ -0,0 +1,34 @@ +From 8d44d867f7cd86da4edf328e06b13778577ea4b7 Mon Sep 17 00:00:00 2001 +From: WXbet <57314510+WXbet@users.noreply.github.com> +Date: Thu, 15 May 2025 21:54:48 +0200 +Subject: [PATCH] Fix build with cython 3.1.x + +closes #113 + +Upstream-Status: Submitted [https://github.com/aio-libs/propcache/pull/114] +Signed-off-by: Khem Raj +--- + packaging/pep517_backend/_backend.py | 2 +- + requirements/cython.txt | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/packaging/pep517_backend/_backend.py b/packaging/pep517_backend/_backend.py +index 7588db3..f75b83a 100644 +--- a/packaging/pep517_backend/_backend.py ++++ b/packaging/pep517_backend/_backend.py +@@ -379,7 +379,7 @@ def get_requires_for_build_wheel( + elif sysconfig.get_config_var('Py_GIL_DISABLED'): + c_ext_build_deps = ['Cython ~= 3.1.0a1'] + else: +- c_ext_build_deps = ['Cython ~= 3.0.12'] ++ c_ext_build_deps = ['Cython ~= 3.1'] + + return _setuptools_get_requires_for_build_wheel( + config_settings=config_settings, +diff --git a/requirements/cython.txt b/requirements/cython.txt +index 69a1d6f..5b356ed 100644 +--- a/requirements/cython.txt ++++ b/requirements/cython.txt +@@ -1 +1 @@ +-cython==3.0.12 ++cython~=3.1 diff --git a/meta-python/recipes-devtools/python/python3-propcache_0.3.1.bb b/meta-python/recipes-devtools/python/python3-propcache_0.3.1.bb index 24b72f09c3..afa6822563 100644 --- a/meta-python/recipes-devtools/python/python3-propcache_0.3.1.bb +++ b/meta-python/recipes-devtools/python/python3-propcache_0.3.1.bb @@ -3,6 +3,7 @@ HOMEPAGE = "https://github.com/aio-libs/propcache" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" +SRC_URI += "file://0001-Fix-build-with-cython-3.1.x.patch" SRC_URI[sha256sum] = "40d980c33765359098837527e18eddefc9a24cea5b45e078a7f3bb5b032c6ecf" inherit pypi python_setuptools_build_meta ptest-python-pytest cython