From b00638495a512a2da01c9ebfc9b76b7e53667194 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sat, 4 Sep 2021 10:37:19 -0700 Subject: [PATCH 1/9] python3-kivy: Remove hardcoded include paths Use RECIPE_SYSROOT instead of synthesizing the sysroot Signed-off-by: Khem Raj Cc: William Huang Signed-off-by: Trevor Gamblin --- .../0001-add-support-for-glesv2.patch | 20 ++++++++++++++++--- .../python/python3-kivy_2.0.0.bb | 2 +- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/meta-python/recipes-devtools/python/python3-kivy/0001-add-support-for-glesv2.patch b/meta-python/recipes-devtools/python/python3-kivy/0001-add-support-for-glesv2.patch index e50c7e7e242..bb236b41951 100644 --- a/meta-python/recipes-devtools/python/python3-kivy/0001-add-support-for-glesv2.patch +++ b/meta-python/recipes-devtools/python/python3-kivy/0001-add-support-for-glesv2.patch @@ -1,8 +1,6 @@ -diff --git a/setup.py b/setup.py -index 9a507c6c4..3f5b70866 100644 --- a/setup.py +++ b/setup.py -@@ -680,7 +680,18 @@ def determine_gl_flags(): +@@ -695,7 +695,18 @@ def determine_gl_flags(): c_options['use_x11'] = True c_options['use_egl'] = True else: @@ -22,3 +20,19 @@ index 9a507c6c4..3f5b70866 100644 return flags, base_flags +@@ -723,14 +734,13 @@ def determine_sdl2(): + sdl_inc = join(include, 'SDL2') + if isdir(sdl_inc): + sdl2_paths.append(sdl_inc) +- sdl2_paths.extend(['/usr/local/include/SDL2', '/usr/include/SDL2']) + + flags['include_dirs'] = sdl2_paths + flags['extra_link_args'] = [] + flags['extra_compile_args'] = [] + flags['library_dirs'] = ( + sdl2_paths if sdl2_paths else +- ['/usr/local/lib/']) ++ ['']) + + if sdl2_flags: + flags = merge(flags, sdl2_flags) diff --git a/meta-python/recipes-devtools/python/python3-kivy_2.0.0.bb b/meta-python/recipes-devtools/python/python3-kivy_2.0.0.bb index 3f6bafda81d..63c2ae73340 100644 --- a/meta-python/recipes-devtools/python/python3-kivy_2.0.0.bb +++ b/meta-python/recipes-devtools/python/python3-kivy_2.0.0.bb @@ -39,7 +39,7 @@ export USE_X11 KIVY_GRAPHICS = "gles" export KIVY_GRAPHICS -KIVY_CROSS_SYSROOT="${WORKDIR}/recipe-sysroot" +KIVY_CROSS_SYSROOT="${RECIPE_SYSROOT}" export KIVY_CROSS_SYSROOT DEPENDS += " \ From 74e37dfa687bbbb21f7e609d56959084f980b495 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sat, 4 Sep 2021 10:41:00 -0700 Subject: [PATCH 2/9] python3-kivy: Check for x11 and opengl before enabling the recipe Fixes ERROR: Nothing PROVIDES 'libsdl2-ttf' (but meta-openembedded/meta-python/recipes-devtools/python/python3-kivy_2.0.0.bb DEPENDS on or otherwise requires it) libsdl2-ttf was skipped: missing required distro feature 'opengl' (not in DISTRO_FEATURES) ERROR: Nothing RPROVIDES 'python3-kivy-dev' (but meta-openembedded/meta-python/recipes-devtools/python/python3-kivy_2.0.0.bb RDEPENDS on or otherwise requires it) No eligible RPROVIDERs exist for 'python3-kivy-dev' NOTE: Runtime target 'python3-kivy-dev' is unbuildable, removing... Missing or unbuildable dependency chain was: ['python3-kivy-dev'] ERROR: Nothing RPROVIDES 'python3-kivy' (but meta-openembedded/meta-python/recipes-devtools/python/python3-kivy_2.0.0.bb RDEPENDS on or otherwise requires it) No eligible RPROVIDERs exist for 'python3-kivy' NOTE: Runtime target 'python3-kivy' is unbuildable, removing... Missing or unbuildable dependency chain was: ['python3-kivy'] Signed-off-by: Khem Raj Cc: Martin Jansa Cc: William Huang Signed-off-by: Trevor Gamblin --- meta-python/recipes-devtools/python/python3-kivy_2.0.0.bb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/meta-python/recipes-devtools/python/python3-kivy_2.0.0.bb b/meta-python/recipes-devtools/python/python3-kivy_2.0.0.bb index 63c2ae73340..d046489021c 100644 --- a/meta-python/recipes-devtools/python/python3-kivy_2.0.0.bb +++ b/meta-python/recipes-devtools/python/python3-kivy_2.0.0.bb @@ -4,7 +4,7 @@ HOMEPAGE = "https://kivy.org/" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=f0c851d60495c7e27225a819e179208a" -inherit setuptools3 +inherit setuptools3 pkgconfig features_check SRC_URI = "\ git://github.com/kivy/kivy.git;protocol=git;\ @@ -42,6 +42,8 @@ export KIVY_GRAPHICS KIVY_CROSS_SYSROOT="${RECIPE_SYSROOT}" export KIVY_CROSS_SYSROOT +REQUIRED_DISTRO_FEATURES += "x11 opengl" + DEPENDS += " \ gstreamer1.0 \ gstreamer1.0-python \ From c0339070d07e6f86bb2473e55b82f293da813b9d Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 3 Sep 2021 08:37:44 -0700 Subject: [PATCH 3/9] packagegroup-meta-python: Add python3-kivy Signed-off-by: Khem Raj Signed-off-by: Trevor Gamblin --- .../recipes-core/packagegroups/packagegroup-meta-python.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta-python/recipes-core/packagegroups/packagegroup-meta-python.bb b/meta-python/recipes-core/packagegroups/packagegroup-meta-python.bb index b5a2f5d7d9f..2d51b4e1a3d 100644 --- a/meta-python/recipes-core/packagegroups/packagegroup-meta-python.bb +++ b/meta-python/recipes-core/packagegroups/packagegroup-meta-python.bb @@ -210,6 +210,7 @@ RDEPENDS:packagegroup-meta-python3 = "\ python3-kconfiglib \ python3-keras-applications \ python3-keras-preprocessing \ + ${@bb.utils.contains("DISTRO_FEATURES", "x11 opengl", "python3-kivy", "", d)} \ python3-kiwisolver \ python3-langtable \ python3-lazy-object-proxy \ From d6e685cb0543793dfdd4f35cf91ea282c5e20afc Mon Sep 17 00:00:00 2001 From: zangrc Date: Mon, 6 Sep 2021 09:20:33 +0800 Subject: [PATCH 4/9] python3-ipython: upgrade 7.26.0 -> 7.27.0 IPython 7.27 is a minor release that fixes a couple of issues and compatibility. Add support for GTK4 PR Add support for Qt6 PR Fix an issue with pip magic on windows PR Signed-off-by: Zang Ruochen Signed-off-by: Khem Raj Signed-off-by: Trevor Gamblin --- .../{python3-ipython_7.26.0.bb => python3-ipython_7.27.0.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta-python/recipes-devtools/python/{python3-ipython_7.26.0.bb => python3-ipython_7.27.0.bb} (89%) diff --git a/meta-python/recipes-devtools/python/python3-ipython_7.26.0.bb b/meta-python/recipes-devtools/python/python3-ipython_7.27.0.bb similarity index 89% rename from meta-python/recipes-devtools/python/python3-ipython_7.26.0.bb rename to meta-python/recipes-devtools/python/python3-ipython_7.27.0.bb index 4c1d4ebd705..2ec0722c35b 100644 --- a/meta-python/recipes-devtools/python/python3-ipython_7.26.0.bb +++ b/meta-python/recipes-devtools/python/python3-ipython_7.27.0.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING.rst;md5=59b20262b8663cdd094005bddf47af5f" PYPI_PACKAGE = "ipython" -SRC_URI[sha256sum] = "0cff04bb042800129348701f7bd68a430a844e8fb193979c08f6c99f28bb735e" +SRC_URI[sha256sum] = "58b55ebfdfa260dad10d509702dc2857cb25ad82609506b070cf2d7b7df5af13" RDEPENDS:${PN} = "\ ${PYTHON_PN}-setuptools \ From bd44dc154043988e4bb89357f3c860182d5c590b Mon Sep 17 00:00:00 2001 From: zangrc Date: Mon, 6 Sep 2021 09:21:17 +0800 Subject: [PATCH 5/9] python3-kiwisolver: upgrade 1.3.1 -> 1.3.2 CI: fix building wheels on GHA * ci: fix wheel build command * ci: remove references to submodules * ci: fix sdist command and remove Python 3.6 from the matrix * ci: slightly alter invocation * ci: disable emulation * ci: smaller matrix * ci: use a small matrix but with all python versions * ci: use manylinux 2010 for CPython 3.9+ * ci: split again matrix per python version given how slow emulation is Fix also the artifact upload * ci: fix typo * ci: typo Signed-off-by: Zang Ruochen Signed-off-by: Khem Raj Signed-off-by: Trevor Gamblin --- ...python3-kiwisolver_1.3.1.bb => python3-kiwisolver_1.3.2.bb} | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) rename meta-python/recipes-devtools/python/{python3-kiwisolver_1.3.1.bb => python3-kiwisolver_1.3.2.bb} (73%) diff --git a/meta-python/recipes-devtools/python/python3-kiwisolver_1.3.1.bb b/meta-python/recipes-devtools/python/python3-kiwisolver_1.3.2.bb similarity index 73% rename from meta-python/recipes-devtools/python/python3-kiwisolver_1.3.1.bb rename to meta-python/recipes-devtools/python/python3-kiwisolver_1.3.2.bb index fb66619dbd6..cf14c49e6c1 100644 --- a/meta-python/recipes-devtools/python/python3-kiwisolver_1.3.1.bb +++ b/meta-python/recipes-devtools/python/python3-kiwisolver_1.3.2.bb @@ -3,8 +3,7 @@ HOMEPAGE = "https://github.com/nucleic/kiwi" LICENSE = "BSD" LIC_FILES_CHKSUM = "file://setup.py;endline=7;md5=e54bd74bd9d0a84ae3f8f6d21ada0ab4" -SRC_URI[md5sum] = "81012578317ddcfa3daed806142f8fed" -SRC_URI[sha256sum] = "950a199911a8d94683a6b10321f9345d5a3a8433ec58b217ace979e18f16e248" +SRC_URI[sha256sum] = "fc4453705b81d03568d5b808ad8f09c77c47534f6ac2e72e733f9ca4714aa75c" inherit pypi setuptools3 From 3b0f88d3bc0512a9d0c8b80a5cf160713e0d8518 Mon Sep 17 00:00:00 2001 From: Wang Mingyu Date: Mon, 6 Sep 2021 09:17:40 +0800 Subject: [PATCH 6/9] python3-cryptography-vectors: upgrade 3.4.7 -> 3.4.8 Changed the version scheme. This will result in us incrementing the major version more frequently, but does not change our existing backwards compatibility policy. BACKWARDS INCOMPATIBLE: The X.509 certificate parser no longer allows negative serial numbers. RFC 5280 has always prohibited these. BACKWARDS INCOMPATIBLE: Invalid ASN.1 found during certificate parsing will raise an error on initial parse rather than when the invalid field is accessed. BACKWARDS INCOMPATIBLE: Values passed to the X.509 PEM parser must be a single PEM payload and will error on extraneous data. Added support for OpenSSL 3.0.0 as a compilation target. Added support for SM3 and SM4, when using OpenSSL 1.1.1. These algorithms are provided for compatibility in regions where they may be required, and are not generally recommended. We now ship manylinux_2_24 wheels, in addition to our manylinux2010 and manylinux2014 wheels. Added rfc4514_attribute_name attribute to x509.NameAttribute, Signed-off-by: Wang Mingyu Signed-off-by: Khem Raj Signed-off-by: Trevor Gamblin --- ...y-vectors_3.4.7.bb => python3-cryptography-vectors_3.4.8.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta-python/recipes-devtools/python/{python3-cryptography-vectors_3.4.7.bb => python3-cryptography-vectors_3.4.8.bb} (81%) diff --git a/meta-python/recipes-devtools/python/python3-cryptography-vectors_3.4.7.bb b/meta-python/recipes-devtools/python/python3-cryptography-vectors_3.4.8.bb similarity index 81% rename from meta-python/recipes-devtools/python/python3-cryptography-vectors_3.4.7.bb rename to meta-python/recipes-devtools/python/python3-cryptography-vectors_3.4.8.bb index 565e223bfc5..2fb48f3cf75 100644 --- a/meta-python/recipes-devtools/python/python3-cryptography-vectors_3.4.7.bb +++ b/meta-python/recipes-devtools/python/python3-cryptography-vectors_3.4.8.bb @@ -4,7 +4,7 @@ SECTION = "devel/python" LICENSE = "Apache-2.0 | BSD" LIC_FILES_CHKSUM = "file://LICENSE;md5=8c3617db4fb6fae01f1d253ab91511e4" -SRC_URI[sha256sum] = "a7ac3aaa57514687696ad65f833e5e39b6fa3c5d41de2b8c938346ee119204c2" +SRC_URI[sha256sum] = "4c84410257993d3de058b44b777a49e1da2ae35ebea2970a360c7e3aa0f580f2" PYPI_PACKAGE = "cryptography_vectors" From 7eb51bee01e8af6a65cc6323a9006341bb23df18 Mon Sep 17 00:00:00 2001 From: Wang Mingyu Date: Mon, 6 Sep 2021 09:17:58 +0800 Subject: [PATCH 7/9] python3-google-api-python-client: upgrade 2.18.0 -> 2.19.1 remove repeated calls to self._get_reason analyticsdata: update the api androidmanagement: update the api artifactregistry: update the api bigquerydatatransfer: update the api bigquery: update the api chat: update the api cloudidentity: update the api cloudkms: update the api compute: update the api containeranalysis: update the api container: update the api content: update the api dataflow: update the api dataproc: update the api displayvideo: update the api documentai: update the api file: update the api gkehub: update the api logging: update the api managedidentities: update the api metastore: update the api ondemandscanning: update the api people: update the api sqladmin: update the api sts: update the api workflowexecutions: update the api youtube: update the api Signed-off-by: Wang Mingyu Signed-off-by: Khem Raj Signed-off-by: Trevor Gamblin --- ...ent_2.18.0.bb => python3-google-api-python-client_2.19.1.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta-python/recipes-devtools/python/{python3-google-api-python-client_2.18.0.bb => python3-google-api-python-client_2.19.1.bb} (86%) diff --git a/meta-python/recipes-devtools/python/python3-google-api-python-client_2.18.0.bb b/meta-python/recipes-devtools/python/python3-google-api-python-client_2.19.1.bb similarity index 86% rename from meta-python/recipes-devtools/python/python3-google-api-python-client_2.18.0.bb rename to meta-python/recipes-devtools/python/python3-google-api-python-client_2.19.1.bb index 0dc31826b5d..564058e98f8 100644 --- a/meta-python/recipes-devtools/python/python3-google-api-python-client_2.18.0.bb +++ b/meta-python/recipes-devtools/python/python3-google-api-python-client_2.19.1.bb @@ -4,7 +4,7 @@ HOMEPAGE = "https://github.com/googleapis/google-api-python-client" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" -SRC_URI[sha256sum] = "a25661ec6cf4c159f41fe9c061c2bee31b2dddaf2ad787e23617048a25b53842" +SRC_URI[sha256sum] = "c89b345615188fbd525f52d59013156ad3bfd1023af27041f2dec3d7877ba112" inherit pypi setuptools3 From a500e5633655fff74387a3105ce7d69f819508fb Mon Sep 17 00:00:00 2001 From: zangrc Date: Mon, 6 Sep 2021 16:41:15 +0800 Subject: [PATCH 8/9] python3-ruamel-yaml: upgrade 0.17.13 -> 0.17.16 [0, 17, 16]: 2021-08-28 - also handle issue 397 when comment is newline [0, 17, 15]: 2021-08-28 - fix issue 397, insert comment before key when a comment between key and value exists (reported by `Bastien gerard `__) [0, 17, 14]: 2021-08-25 - fix issue 396, inserting key/val in merged-in dictionary (reported by `Bastien gerard `__) Signed-off-by: Zang Ruochen Signed-off-by: Khem Raj Signed-off-by: Trevor Gamblin --- ...-ruamel-yaml_0.17.13.bb => python3-ruamel-yaml_0.17.16.bb} | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) rename meta-python/recipes-devtools/python/{python3-ruamel-yaml_0.17.13.bb => python3-ruamel-yaml_0.17.16.bb} (75%) diff --git a/meta-python/recipes-devtools/python/python3-ruamel-yaml_0.17.13.bb b/meta-python/recipes-devtools/python/python3-ruamel-yaml_0.17.16.bb similarity index 75% rename from meta-python/recipes-devtools/python/python3-ruamel-yaml_0.17.13.bb rename to meta-python/recipes-devtools/python/python3-ruamel-yaml_0.17.16.bb index d28e8a12fed..e64f1960046 100644 --- a/meta-python/recipes-devtools/python/python3-ruamel-yaml_0.17.13.bb +++ b/meta-python/recipes-devtools/python/python3-ruamel-yaml_0.17.16.bb @@ -8,10 +8,12 @@ PYPI_PACKAGE = "ruamel.yaml" inherit pypi setuptools3 -SRC_URI[sha256sum] = "02f0ed93e98ea32498d25a2952635bbd9fabd553599b8ad67724b4ac88dd8f6c" +SRC_URI[sha256sum] = "1a771fc92d3823682b7f0893ad56cb5a5c87c48e62b5399d6f42c8759a583b33" RDEPENDS:${PN} += "\ ${PYTHON_PN}-shell \ + ${PYTHON_PN}-datetime \ + ${PYTHON_PN}-netclient \ " do_install:prepend() { From add83ba47c5410dad6b61605ce05802f6754e8e9 Mon Sep 17 00:00:00 2001 From: zangrc Date: Mon, 6 Sep 2021 16:41:32 +0800 Subject: [PATCH 9/9] python3-traitlets: upgrade 5.0.5 -> 5.1.0 Traitlets 5.1 brings a couple of updates and changes to traitlets, and is recommended for all users. What follow is a non-exhaustive list of changes: - Removal of the ``ipython_genutils`` dependency, this should remove any direct and indirect reliance on ``nose`` and prepare traitlets 5.1 for Python 3.10 and above compatibility, some test suite changes also accommodate Python 3.10 changes. If you package traitlets downstream, make sure to remove this dependency. - Removal of ``ipython_genutils`` may have change the default encoding detected for the command line argument parsing when not utf-8. We expect this to affect a small portion of older windows version. If you encounter issue let us know. - Stop recommendation of ``CUnicode`` in some circumstances as it's deprecated. - Our test suite is now using GitHub action instead of travis CI. If you are packaging downstream using the git repository, you may have to exclude the ``.github`` folder now, and can remove exclusion of - It fixes a parsing issue for list of one single element on the CLI. - We reserve the right to remove official support for Python 3.7 in subsequent minor revisions. Signed-off-by: Zang Ruochen Signed-off-by: Khem Raj Signed-off-by: Trevor Gamblin --- .../{python3-traitlets_5.0.5.bb => python3-traitlets_5.1.0.bb} | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) rename meta-python/recipes-devtools/python/{python3-traitlets_5.0.5.bb => python3-traitlets_5.1.0.bb} (72%) diff --git a/meta-python/recipes-devtools/python/python3-traitlets_5.0.5.bb b/meta-python/recipes-devtools/python/python3-traitlets_5.1.0.bb similarity index 72% rename from meta-python/recipes-devtools/python/python3-traitlets_5.0.5.bb rename to meta-python/recipes-devtools/python/python3-traitlets_5.1.0.bb index 01fdffb87f1..da234215ea8 100644 --- a/meta-python/recipes-devtools/python/python3-traitlets_5.0.5.bb +++ b/meta-python/recipes-devtools/python/python3-traitlets_5.1.0.bb @@ -6,8 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING.md;md5=eec4de4d599518742e54e75954e33b46" PYPI_PACKAGE = "traitlets" -SRC_URI[md5sum] = "2ffe54aee5d0d87890127dd28ce3f6c4" -SRC_URI[sha256sum] = "178f4ce988f69189f7e523337a3e11d91c786ded9360174a3d9ca83e79bc5396" +SRC_URI[sha256sum] = "bd382d7ea181fbbcce157c133db9a829ce06edffe097bcf3ab945b435452b46d" RDEPENDS:${PN} = "\ ${PYTHON_PN}-ipython-genutils \