diff options
| author | Mingli Yu <mingli.yu@windriver.com> | 2024-03-27 15:16:36 +0800 |
|---|---|---|
| committer | Armin Kuster <akuster808@gmail.com> | 2024-04-28 13:10:23 -0400 |
| commit | a246e26a4686863290998a1be2d4989cbe996ba9 (patch) | |
| tree | eddef172b915ff43c45a19d3c96654a47a45999f /meta-python | |
| parent | b0e6f9c1de07fe3456e9e5902174719f56b086f1 (diff) | |
| download | meta-openembedded-a246e26a4686863290998a1be2d4989cbe996ba9.tar.gz | |
python3-pyyaml-include: Upgrade 1.3.2 -> 1.4.1
* Upgrade to 1.4.1 to make it work with setuptools 59.x as it doesn't
support pep 621 [1], so remove pyproject.toml and add setup.cfg back [2].
* Add python3-toml to RDEPENDS to fix below error:
self = <yamlinclude.readers.TomlReader object at 0x7faceccdbd30>
def __call__(self):
if sys.version_info >= (3, 11):
with open(self._path, "rb") as fp:
return tomllib.load(fp)
else:
try:
import toml
except ImportError as err: # pragma: no cover
> raise ImportError(f'Un-supported file "{self._path}".\n`pip install toml` should solve the problem.\n\n{err}')
E ImportError: Un-supported file "tests/data/include.d/1.toml".
E `pip install toml` should solve the problem.
E
E No module named 'toml'
../../python3.10/site-packages/yamlinclude/readers.py:69: ImportError
[1] https://setuptools.pypa.io/en/latest/userguide/pyproject_config.html
[2] https://github.com/tanbro/pyyaml-include/issues/43
Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Diffstat (limited to 'meta-python')
| -rw-r--r-- | meta-python/recipes-devtools/python/python3-pyyaml-include_1.4.1.bb (renamed from meta-python/recipes-devtools/python/python3-pyyaml-include_1.3.2.bb) | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/meta-python/recipes-devtools/python/python3-pyyaml-include_1.3.2.bb b/meta-python/recipes-devtools/python/python3-pyyaml-include_1.4.1.bb index 3a5bd99a78..6768e959f4 100644 --- a/meta-python/recipes-devtools/python/python3-pyyaml-include_1.3.2.bb +++ b/meta-python/recipes-devtools/python/python3-pyyaml-include_1.4.1.bb | |||
| @@ -2,11 +2,10 @@ SUMMARY = "Extending PyYAML with a custom constructor for including YAML files w | |||
| 2 | HOMEPAGE = "https://github.com/tanbro/pyyaml-include" | 2 | HOMEPAGE = "https://github.com/tanbro/pyyaml-include" |
| 3 | LICENSE = "GPL-3.0-only" | 3 | LICENSE = "GPL-3.0-only" |
| 4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=d32239bcb673463ab874e80d47fae504" | 4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=d32239bcb673463ab874e80d47fae504" |
| 5 | DEPENDS += "python3-setuptools-scm-native" | 5 | SRCREV = "0f86bf16343d2ad52b53b793e0b35bb7ed7cd85b" |
| 6 | SRCREV = "36b6975aa8fc7a6cbf37de40aa2ed6d996b2f7be" | ||
| 7 | 6 | ||
| 8 | SRC_URI = " \ | 7 | SRC_URI = " \ |
| 9 | git://github.com/tanbro/pyyaml-include;protocol=https;branch=main \ | 8 | git://github.com/tanbro/pyyaml-include;protocol=https;branch=1.x \ |
| 10 | file://run-ptest \ | 9 | file://run-ptest \ |
| 11 | " | 10 | " |
| 12 | 11 | ||
| @@ -21,6 +20,7 @@ do_install_ptest() { | |||
| 21 | 20 | ||
| 22 | RDEPENDS:${PN} += " \ | 21 | RDEPENDS:${PN} += " \ |
| 23 | python3-pyyaml \ | 22 | python3-pyyaml \ |
| 23 | python3-toml \ | ||
| 24 | " | 24 | " |
| 25 | RDEPENDS:${PN}-ptest += " \ | 25 | RDEPENDS:${PN}-ptest += " \ |
| 26 | python3-pytest \ | 26 | python3-pytest \ |
