From: Steve Sakoman <steve@sakoman.com>
To: openembedded-core@lists.openembedded.org
Subject: [OE-core][kirkstone 07/16] oeqa/selftest/recipetool: downgrade meson version to not use pyproject.toml
Date: Tue, 27 Feb 2024 11:56:54 -1000 [thread overview]
Message-ID: <24bf7bbd1fb21f84539b7a4263d76a33dbacacde.1709070850.git.steve@sakoman.com> (raw)
In-Reply-To: <cover.1709070850.git.steve@sakoman.com>
From: Ross Burton <ross.burton@arm.com>
recipetool's pyproject.toml parsing needs tomllib (python 3.11+) or
tomli (not a hard dependency), so is prone to failing depending on the
host configuration.
Downgrade the Meson release used for the checks to 0.52.1, which was the
last release before moving to pyproject.toml.
Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Backported from master: 6dfe573d83687e5431841f062442b54b9fa22ff3
Signed-off-by: Adrian Freihofer <adrian.freihofer@siemens.com>
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
meta/lib/oeqa/selftest/cases/recipetool.py | 29 ++++++++++++----------
1 file changed, 16 insertions(+), 13 deletions(-)
diff --git a/meta/lib/oeqa/selftest/cases/recipetool.py b/meta/lib/oeqa/selftest/cases/recipetool.py
index db21325155..c888770533 100644
--- a/meta/lib/oeqa/selftest/cases/recipetool.py
+++ b/meta/lib/oeqa/selftest/cases/recipetool.py
@@ -440,17 +440,19 @@ class RecipetoolCreateTests(RecipetoolBase):
self._test_recipe_contents(recipefile, checkvars, inherits)
def test_recipetool_create_github(self):
- # Basic test to see if github URL mangling works
+ # Basic test to see if github URL mangling works. Deliberately use an
+ # older release of Meson at present so we don't need a toml parser.
temprecipe = os.path.join(self.tempdir, 'recipe')
os.makedirs(temprecipe)
- recipefile = os.path.join(temprecipe, 'meson_git.bb')
- srcuri = 'https://github.com/mesonbuild/meson;rev=1.3.1'
- result = runCmd(['recipetool', 'create', '-o', temprecipe, srcuri])
- self.assertTrue(os.path.isfile(recipefile))
+ recipefile = os.path.join(temprecipe, 'python3-meson_git.bb')
+ srcuri = 'https://github.com/mesonbuild/meson;rev=0.52.1'
+ cmd = ['recipetool', 'create', '-o', temprecipe, srcuri]
+ result = runCmd(cmd)
+ self.assertTrue(os.path.isfile(recipefile), msg="recipe %s not created for command %s, output %s" % (recipefile, " ".join(cmd), result.output))
checkvars = {}
- checkvars['LICENSE'] = set(['Apache-2.0', 'Proprietary', 'Unknown'])
- checkvars['SRC_URI'] = 'git://github.com/mesonbuild/meson;protocol=https;branch=1.3'
- inherits = ['python_setuptools_build_meta']
+ checkvars['LICENSE'] = set(['Apache-2.0', "Unknown"])
+ checkvars['SRC_URI'] = 'git://github.com/mesonbuild/meson;protocol=https;branch=0.52'
+ inherits = ['setuptools3']
self._test_recipe_contents(recipefile, checkvars, inherits)
def test_recipetool_create_python3_setuptools(self):
@@ -473,18 +475,19 @@ class RecipetoolCreateTests(RecipetoolBase):
self._test_recipe_contents(recipefile, checkvars, inherits)
def test_recipetool_create_github_tarball(self):
- # Basic test to ensure github URL mangling doesn't apply to release tarballs
+ # Basic test to ensure github URL mangling doesn't apply to release tarballs.
+ # Deliberately use an older release of Meson at present so we don't need a toml parser.
temprecipe = os.path.join(self.tempdir, 'recipe')
os.makedirs(temprecipe)
- pv = '1.3.1'
- recipefile = os.path.join(temprecipe, 'meson_%s.bb' % pv)
+ pv = '0.52.1'
+ recipefile = os.path.join(temprecipe, 'python3-meson_%s.bb' % pv)
srcuri = 'https://github.com/mesonbuild/meson/releases/download/%s/meson-%s.tar.gz' % (pv, pv)
result = runCmd('recipetool create -o %s %s' % (temprecipe, srcuri))
self.assertTrue(os.path.isfile(recipefile))
checkvars = {}
- checkvars['LICENSE'] = set(['Apache-2.0', 'Proprietary', 'Unknown'])
+ checkvars['LICENSE'] = set(['Apache-2.0'])
checkvars['SRC_URI'] = 'https://github.com/mesonbuild/meson/releases/download/${PV}/meson-${PV}.tar.gz'
- inherits = ['python_setuptools_build_meta']
+ inherits = ['setuptools3']
self._test_recipe_contents(recipefile, checkvars, inherits)
def _test_recipetool_create_git(self, srcuri, branch=None):
--
2.34.1
next prev parent reply other threads:[~2024-02-27 21:57 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-27 21:56 [OE-core][kirkstone 00/16] Patch review Steve Sakoman
2024-02-27 21:56 ` [OE-core][kirkstone 01/16] recipetool/create_buildsys_python: use importlib instead of imp Steve Sakoman
2024-02-27 21:56 ` [OE-core][kirkstone 02/16] scripts/runqemu: fix regex escape sequences Steve Sakoman
2024-02-27 21:56 ` [OE-core][kirkstone 03/16] populate_sdk_ext: use ConfigParser instead of SafeConfigParser Steve Sakoman
2024-02-27 21:56 ` [OE-core][kirkstone 04/16] runqemu: add qmp socket support Steve Sakoman
2024-02-27 21:56 ` [OE-core][kirkstone 05/16] oeqa: replace deprecated assertEquals Steve Sakoman
2024-02-27 21:56 ` [OE-core][kirkstone 06/16] oeqa/selftest/recipetool: fix for python 3.12 Steve Sakoman
2024-02-27 21:56 ` Steve Sakoman [this message]
2024-02-27 21:56 ` [OE-core][kirkstone 08/16] oeqa/selftest/recipetool: expect meson.bb Steve Sakoman
2024-02-27 21:56 ` [OE-core][kirkstone 09/16] oeqa/selftest/oelib/buildhistory: git default branch Steve Sakoman
2024-02-27 21:56 ` [OE-core][kirkstone 10/16] feature-microblaze-versions.inc: python 3.12 regex Steve Sakoman
2024-02-27 21:56 ` [OE-core][kirkstone 11/16] meta/lib/oeqa: " Steve Sakoman
2024-02-27 21:56 ` [OE-core][kirkstone 12/16] meta/recipes: " Steve Sakoman
2024-02-27 21:57 ` [OE-core][kirkstone 13/16] scripts: " Steve Sakoman
2024-02-27 21:57 ` [OE-core][kirkstone 14/16] kernel.bbclass: introduce KERNEL_LOCALVERSION Steve Sakoman
2024-02-27 21:57 ` [OE-core][kirkstone 15/16] kernel: fix localversion in v6.3+ Steve Sakoman
2024-02-27 21:57 ` [OE-core][kirkstone 16/16] kernel: make LOCALVERSION consistent between recipes Steve Sakoman
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=24bf7bbd1fb21f84539b7a4263d76a33dbacacde.1709070850.git.steve@sakoman.com \
--to=steve@sakoman.com \
--cc=openembedded-core@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox