From patchwork Fri Feb 9 02:18:56 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tim Orling X-Patchwork-Id: 39091 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 7064AC4828F for ; Fri, 9 Feb 2024 02:19:53 +0000 (UTC) Received: from mail-pj1-f41.google.com (mail-pj1-f41.google.com [209.85.216.41]) by mx.groups.io with SMTP id smtpd.web11.2394.1707445191956631333 for ; Thu, 08 Feb 2024 18:19:52 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=HuIciZTR; spf=pass (domain: gmail.com, ip: 209.85.216.41, mailfrom: ticotimo@gmail.com) Received: by mail-pj1-f41.google.com with SMTP id 98e67ed59e1d1-2909a632e40so365671a91.0 for ; Thu, 08 Feb 2024 18:19:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1707445191; x=1708049991; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=mxACuSRTkcNEneBsaS+apEhLsT697LvMKWxT4yUUJk8=; b=HuIciZTRlfXkCKtVpY81j4J8/ISbnHlO1kC9sLOAfR6G/RebKp2JzoxdAdMAH5OlWS o6ouFd5kdSdCJLN9YPLZBcNGGn1prTc6Dv1TZs6+nkxcWny83+aQW5oI87uCR5KZVTOb KiMnp+UjjTdsSAylJwWkf2L02uFc806FavEyk9k28l2bjPW0gtVShgoKTqzRgRrwtE9D a66gfj4P7ZJQGbrluPzRUHd7flicu7Kiiz45xiYrfk9JCDpk/W99/l0yRrYVwNiLyKBY X58LQ8646tgZz5HcZefjV14hRnCWEQeSIsm5Lo1I5bZZ4FYiqblm6llrZRyzkGZWdrMB d1Dw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707445191; x=1708049991; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=mxACuSRTkcNEneBsaS+apEhLsT697LvMKWxT4yUUJk8=; b=nicUpFFanqIn9W42kt7S8NIM04EjiOhAou96fHWxdRrVscNCt96HMQyrzG8M+Au2is 0d+Zlc/Mi7NDu8zehrVhRBZQd9AL+X7i2sZNCm3XQCSK2euSKwLlkHYv7ECxVfeYUmXx MGKr1+MVijYBsN6T+6NdvnGu5DjMSwbF8uD1M5tJBkrM+IGVbvElmDYC4Lb1LF1rImtU QGse4+31HYm0B1h9xXWXf8gN/1q9G2mbAPRkLWG6t8StAuo+xBaKXkoPaWbrVuVuThW+ j9NCpAgjZuFToSGGNNPyNtL2O2L3S180wesyYLCeREUmvRcQtp4cFUq0OVsnGFnXkp3E x5UA== X-Gm-Message-State: AOJu0YxcRu1hcg1m2zQ8wtADZuJvl1ksbQ3uJYILdeC1X+CzKLyuI/IK GxXKx8dcLQevlxnAb1+bjZJ5AJaXff8wLV806cexEZEz/3RvuRB3+UkTnNjj X-Google-Smtp-Source: AGHT+IGEHQRFyX0Svz7QNEXR7JBpY7DKXeXQtrgVF6t6sgcKF6QxFXDDKboxHCjka0ARUOHcvio7qQ== X-Received: by 2002:a17:90b:d83:b0:295:fb59:5a6d with SMTP id bg3-20020a17090b0d8300b00295fb595a6dmr250758pjb.22.1707445191075; Thu, 08 Feb 2024 18:19:51 -0800 (PST) Received: from chiron.hsd1.or.comcast.net ([2601:1c0:ca01:19f0:8cbe:e895:b511:86c6]) by smtp.gmail.com with ESMTPSA id ft10-20020a17090b0f8a00b00296a6175fc5sm498490pjb.36.2024.02.08.18.19.50 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 08 Feb 2024 18:19:50 -0800 (PST) From: Tim Orling X-Google-Original-From: Tim Orling To: openembedded-core@lists.openembedded.org Subject: [PATCH 1/2] python3-pyyaml: add PACKAGECONFIG for libyaml Date: Thu, 8 Feb 2024 18:18:56 -0800 Message-Id: <788a989e8ec584cfffcb2b505972c43b2205a8ad.1707444824.git.tim.orling@konsulko.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: 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 ; Fri, 09 Feb 2024 02:19:53 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/195185 For some time now, we have probably been susceptible to host contamination or at least non-deterministic behavior when libyaml was available in the build environment. The symptom is: ERROR: python3-pyyaml-6.0-r0 do_package_qa: QA Issue: /usr/lib/python3.11/site-packages/yaml/_yaml.cpython-311-aarch64-linux-gnu.so contained in package python3-pyyaml requires libyaml-0.so.2()(64bit), but no providers found in RDEPENDS:python3-pyyaml? [file-rdeps] From the documentation: """ By default, the setup.py script checks whether LibYAML is installed and if so, builds and installs LibYAML bindings. To skip the check and force installation of LibYAML bindings, use the option --with-libyaml: python setup.py --with-libyaml install To disable the check and skip building and installing LibYAML bindings, use --without-libyaml: python setup.py --without-libyaml install """ Instead of leaving this to chance, add PACKAGECONFIG and by default build with the faster libyaml bindings. Signed-off-by: Tim Orling --- meta/recipes-devtools/python/python3-pyyaml_6.0.1.bb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/meta/recipes-devtools/python/python3-pyyaml_6.0.1.bb b/meta/recipes-devtools/python/python3-pyyaml_6.0.1.bb index 61f7cbc6b36..102e2f2498b 100644 --- a/meta/recipes-devtools/python/python3-pyyaml_6.0.1.bb +++ b/meta/recipes-devtools/python/python3-pyyaml_6.0.1.bb @@ -12,6 +12,9 @@ inherit pypi python_setuptools_build_meta SRC_URI += "file://0001-Fix-builds-with-Cython-3.patch" SRC_URI[sha256sum] = "bfdf460b1736c775f2ba9f6a92bca30bc2095067b8a9d77876d1fad6cc3b4a43" +PACKAGECONFIG ?= "libyaml" +PACKAGECONFIG[libyaml] = "--with-libyaml,--without-libyaml,libyaml" + RDEPENDS:${PN} += "\ ${PYTHON_PN}-datetime \ ${PYTHON_PN}-netclient \ From patchwork Fri Feb 9 02:18:59 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tim Orling X-Patchwork-Id: 39092 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 83105C4828F for ; Fri, 9 Feb 2024 02:21:33 +0000 (UTC) Received: from mail-pj1-f45.google.com (mail-pj1-f45.google.com [209.85.216.45]) by mx.groups.io with SMTP id smtpd.web10.2411.1707445289504318638 for ; Thu, 08 Feb 2024 18:21:29 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=ifKB6Foo; spf=pass (domain: gmail.com, ip: 209.85.216.45, mailfrom: ticotimo@gmail.com) Received: by mail-pj1-f45.google.com with SMTP id 98e67ed59e1d1-296a02b7104so368395a91.2 for ; Thu, 08 Feb 2024 18:21:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1707445288; x=1708050088; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=Vu7Rxu0Q9xJ+f/6bO5zV8y1Nv/XjiRGW1MCmqSjr0P4=; b=ifKB6FooDet6JorC2Yz/YriGL/d994r+aItLep3IS03EY/4SGwWPtOPmeHaZ4ovojH vwvIA3ehpjXSoTWOcw+4ghONrWNAMTRgbNN7wGYOJta4Pae51TYAadscV0vGMKSF64Uo kVFKNolCC0khan3yFD5qTflGCSyxoolmgLM7j9qtEGSh87NnFnS4jWDFhFkCo3gtj3D3 UQN11s8HI7RbW2ERVN3PM/hBxiNzM+h4mEre+kz6AjaQReGT8vLAtNF1YBDqUwucNpEt wyp3N3rNo17gbUBK5NXCm0PQ+bqhC8rU4TRqc4pLW3T/RIrTXL7uYA5Wr+J9KY2FynLX sitQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707445288; x=1708050088; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Vu7Rxu0Q9xJ+f/6bO5zV8y1Nv/XjiRGW1MCmqSjr0P4=; b=Vhc1xnh9jyZROxtC+W90H+bLN0exWYdLdSOZUwIWQfJ22vbtYBGETkXjUv10yuztFT 2ypTCAEIjbFGAXe2+bU1o2EZ8bYi/6kZpn4dK8WtjZPB7qGcXIgWgWwN618dxYOaDeko vxzruwvZG5oYHvd8vDXmGvm8zqMzP6bBxurfNbjNRVxNy2ZFzrI0X/6rrSrGyS2Wma/Z QHuoLYorvJVLjGmdKtfJtW8f560fXwY85earNmNXHLQPFBZGdudkZcl14IE1n2WySXJU oeMczwk05suM7tyz3pSNJUmf6NlOP94E1BB9T6WxjqcXA9xfqAvER6uCQZW5BsBLjCoK 2Umw== X-Gm-Message-State: AOJu0YxocTXHwszXG+FhXH9/pucI/W/6V27KUG92WS+ydiecKUVNqt7m iNTHQ95d3AMvPcwR9oxtmg/3pUu1LQlxxv94TmxwHnPVO9SqKzCWNgGAVslL X-Google-Smtp-Source: AGHT+IF7PsidoqmFQ6me6S2+eoRZdnKAdl3ZerXULSeNUy+NZ+2RjFH4xwsM3KyefpKpKNjdsklgEQ== X-Received: by 2002:a17:90a:9ad:b0:296:2f5c:61f6 with SMTP id 42-20020a17090a09ad00b002962f5c61f6mr280467pjo.38.1707445288505; Thu, 08 Feb 2024 18:21:28 -0800 (PST) Received: from chiron.hsd1.or.comcast.net ([2601:1c0:ca01:19f0:8cbe:e895:b511:86c6]) by smtp.gmail.com with ESMTPSA id ft10-20020a17090b0f8a00b00296a6175fc5sm498490pjb.36.2024.02.08.18.21.27 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 08 Feb 2024 18:21:28 -0800 (PST) From: Tim Orling X-Google-Original-From: Tim Orling To: openembedded-core@lists.openembedded.org Subject: [PATCH 2/2] python3-pyyaml: enable ptest Date: Thu, 8 Feb 2024 18:18:59 -0800 Message-Id: <3314011a7a01983cca9da01341274daf81303b89.1707444824.git.tim.orling@konsulko.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: 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 ; Fri, 09 Feb 2024 02:21:33 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/195186 Upstream is in the process of migrating testing to pytest, backport test_dump_load.py (the legacy_tests were throwing Errors and Failures). We don't really need to run upstream's test suite, but we do need to verify that our runtime is functional. https://github.com/yaml/pyyaml/commit/a98fd6088e81d7aca571220c966bbfe2ac43c335 Signed-off-by: Tim Orling --- All tests pass on qemuarm64 for core-image-ptest-python3-pyyaml via testimage meta/conf/distro/include/ptest-packagelists.inc | 1 + .../python/python3-pyyaml/run-ptest | 3 +++ .../python/python3-pyyaml_6.0.1.bb | 17 +++++++++++++++++ 3 files changed, 21 insertions(+) create mode 100644 meta/recipes-devtools/python/python3-pyyaml/run-ptest diff --git a/meta/conf/distro/include/ptest-packagelists.inc b/meta/conf/distro/include/ptest-packagelists.inc index b590640edc2..0192146dbd0 100644 --- a/meta/conf/distro/include/ptest-packagelists.inc +++ b/meta/conf/distro/include/ptest-packagelists.inc @@ -69,6 +69,7 @@ PTESTS_FAST = "\ python3-pluggy \ python3-pyasn1 \ python3-pytz \ + python3-pyyaml \ python3-trove-classifiers \ python3-wcwidth \ python3-webcolors \ diff --git a/meta/recipes-devtools/python/python3-pyyaml/run-ptest b/meta/recipes-devtools/python/python3-pyyaml/run-ptest new file mode 100644 index 00000000000..8d2017d39ce --- /dev/null +++ b/meta/recipes-devtools/python/python3-pyyaml/run-ptest @@ -0,0 +1,3 @@ +#!/bin/sh + +pytest --automake diff --git a/meta/recipes-devtools/python/python3-pyyaml_6.0.1.bb b/meta/recipes-devtools/python/python3-pyyaml_6.0.1.bb index 102e2f2498b..62be059df52 100644 --- a/meta/recipes-devtools/python/python3-pyyaml_6.0.1.bb +++ b/meta/recipes-devtools/python/python3-pyyaml_6.0.1.bb @@ -20,4 +20,21 @@ RDEPENDS:${PN} += "\ ${PYTHON_PN}-netclient \ " +inherit ptest +SRC_URI += "\ + https://raw.githubusercontent.com/yaml/pyyaml/a98fd6088e81d7aca571220c966bbfe2ac43c335/tests/test_dump_load.py;name=test \ + file://run-ptest \ +" +SRC_URI[test.sha256sum] = "b6a8a2825d89fdc8aee226560f66b8196e872012a0ea7118cbef1a832359434a" + +RDEPENDS:${PN}-ptest += " \ + ${PYTHON_PN}-pytest \ + ${PYTHON_PN}-unittest-automake-output \ +" + +do_install_ptest() { + install -d ${D}${PTEST_PATH}/tests + cp -rf ${WORKDIR}/test_dump_load.py ${D}${PTEST_PATH}/tests/ +} + BBCLASSEXTEND = "native nativesdk"