* [OE-core][PATCH 1/2] python3-pip: upgrade 20.0.2 -> 21.1.2 @ 2021-06-22 17:37 Trevor Gamblin 2021-06-22 17:37 ` [OE-core][PATCH 2/2] python3-pip: add multiprocessing to RDEPENDS Trevor Gamblin ` (2 more replies) 0 siblings, 3 replies; 6+ messages in thread From: Trevor Gamblin @ 2021-06-22 17:37 UTC (permalink / raw) To: openembedded-core 21.1.2 contains a fix for CVE-2021-3572 (https://github.com/pypa/pip/commit/e46bdda9711392fec0c45c1175bae6db847cb30b) The LICENSE.txt signature changed due to an update to the copyright dates, but the terms are the same. Also update 0001-change-shebang-to-python3.patch to cover all files in pip's src directory, since we need to ensure compatibility. Signed-off-by: Trevor Gamblin <trevor.gamblin@windriver.com> --- .../0001-change-shebang-to-python3.patch | 128 ++++++++++++++---- ...n3-pip_20.0.2.bb => python3-pip_21.1.2.bb} | 6 +- 2 files changed, 101 insertions(+), 33 deletions(-) rename meta/recipes-devtools/python/{python3-pip_20.0.2.bb => python3-pip_21.1.2.bb} (73%) diff --git a/meta/recipes-devtools/python/python3-pip/0001-change-shebang-to-python3.patch b/meta/recipes-devtools/python/python3-pip/0001-change-shebang-to-python3.patch index 00cffe169b..0187001168 100644 --- a/meta/recipes-devtools/python/python3-pip/0001-change-shebang-to-python3.patch +++ b/meta/recipes-devtools/python/python3-pip/0001-change-shebang-to-python3.patch @@ -1,32 +1,30 @@ -From e7a00e9b5104ae2fbcea32a35c85760b77fae7e5 Mon Sep 17 00:00:00 2001 -From: Changqing Li <changqing.li@windriver.com> -Date: Thu, 23 Apr 2020 09:42:10 +0000 +From baa85a4dab2e8d64eb25d1181b6420db25ce919a Mon Sep 17 00:00:00 2001 +From: Trevor Gamblin <trevor.gamblin@windriver.com> +Date: Tue, 22 Jun 2021 12:31:46 -0400 Subject: [PATCH] change shebang to python3 -Upstream-Status: Pending +Upstream-Status: Inappropriate (OE-specific) -pip will drop support of python2 from 21.0 +Despite no longer supporting python2, some files in the pip source refer +to "python" instead of "python3", so patch them as needed to ensure that +they correctly reference the python3 binary. -Signed-off-by: Changqing Li <changqing.li@windriver.com> +Signed-off-by: Trevor Gamblin <trevor.gamblin@windriver.com> --- - src/pip/_internal/__init__.py | 2 +- - src/pip/_vendor/appdirs.py | 2 +- - src/pip/_vendor/chardet/cli/chardetect.py | 2 +- - src/pip/_vendor/requests/certs.py | 2 +- - 4 files changed, 4 insertions(+), 4 deletions(-) + src/pip/_vendor/appdirs.py | 2 +- + src/pip/_vendor/chardet/langbulgarianmodel.py | 2 +- + src/pip/_vendor/chardet/langgreekmodel.py | 2 +- + src/pip/_vendor/chardet/langhebrewmodel.py | 2 +- + src/pip/_vendor/chardet/langhungarianmodel.py | 2 +- + src/pip/_vendor/chardet/langrussianmodel.py | 2 +- + src/pip/_vendor/chardet/langthaimodel.py | 2 +- + src/pip/_vendor/chardet/langturkishmodel.py | 2 +- + src/pip/_vendor/chardet/metadata/languages.py | 2 +- + src/pip/_vendor/requests/certs.py | 2 +- + 10 files changed, 10 insertions(+), 10 deletions(-) -diff --git a/src/pip/_internal/__init__.py b/src/pip/_internal/__init__.py -index 3aa8a46..e1ad179 100755 ---- a/src/pip/_internal/__init__.py -+++ b/src/pip/_internal/__init__.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - import pip._internal.utils.inject_securetransport # noqa - from pip._internal.utils.typing import MYPY_CHECK_RUNNING - diff --git a/src/pip/_vendor/appdirs.py b/src/pip/_vendor/appdirs.py -index 3a52b75..ad3f81d 100644 +index 33a3b7741..60b9ef5f7 100644 --- a/src/pip/_vendor/appdirs.py +++ b/src/pip/_vendor/appdirs.py @@ -1,4 +1,4 @@ @@ -35,18 +33,88 @@ index 3a52b75..ad3f81d 100644 # -*- coding: utf-8 -*- # Copyright (c) 2005-2010 ActiveState Software Inc. # Copyright (c) 2013 Eddy Petrișor -diff --git a/src/pip/_vendor/chardet/cli/chardetect.py b/src/pip/_vendor/chardet/cli/chardetect.py -index c61136b..a497e98 100644 ---- a/src/pip/_vendor/chardet/cli/chardetect.py -+++ b/src/pip/_vendor/chardet/cli/chardetect.py +diff --git a/src/pip/_vendor/chardet/langbulgarianmodel.py b/src/pip/_vendor/chardet/langbulgarianmodel.py +index e963a5097..97ea6cea8 100644 +--- a/src/pip/_vendor/chardet/langbulgarianmodel.py ++++ b/src/pip/_vendor/chardet/langbulgarianmodel.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + # -*- coding: utf-8 -*- + + from pip._vendor.chardet.sbcharsetprober import SingleByteCharSetModel +diff --git a/src/pip/_vendor/chardet/langgreekmodel.py b/src/pip/_vendor/chardet/langgreekmodel.py +index d99528ede..4a127ea83 100644 +--- a/src/pip/_vendor/chardet/langgreekmodel.py ++++ b/src/pip/_vendor/chardet/langgreekmodel.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + # -*- coding: utf-8 -*- + + from pip._vendor.chardet.sbcharsetprober import SingleByteCharSetModel +diff --git a/src/pip/_vendor/chardet/langhebrewmodel.py b/src/pip/_vendor/chardet/langhebrewmodel.py +index 484c652a4..676c1a711 100644 +--- a/src/pip/_vendor/chardet/langhebrewmodel.py ++++ b/src/pip/_vendor/chardet/langhebrewmodel.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + # -*- coding: utf-8 -*- + + from pip._vendor.chardet.sbcharsetprober import SingleByteCharSetModel +diff --git a/src/pip/_vendor/chardet/langhungarianmodel.py b/src/pip/_vendor/chardet/langhungarianmodel.py +index bbc5cda64..042eae70a 100644 +--- a/src/pip/_vendor/chardet/langhungarianmodel.py ++++ b/src/pip/_vendor/chardet/langhungarianmodel.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + # -*- coding: utf-8 -*- + + from pip._vendor.chardet.sbcharsetprober import SingleByteCharSetModel +diff --git a/src/pip/_vendor/chardet/langrussianmodel.py b/src/pip/_vendor/chardet/langrussianmodel.py +index 5594452b5..564b02e58 100644 +--- a/src/pip/_vendor/chardet/langrussianmodel.py ++++ b/src/pip/_vendor/chardet/langrussianmodel.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + # -*- coding: utf-8 -*- + + from pip._vendor.chardet.sbcharsetprober import SingleByteCharSetModel +diff --git a/src/pip/_vendor/chardet/langthaimodel.py b/src/pip/_vendor/chardet/langthaimodel.py +index 9a37db573..c97487959 100644 +--- a/src/pip/_vendor/chardet/langthaimodel.py ++++ b/src/pip/_vendor/chardet/langthaimodel.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + # -*- coding: utf-8 -*- + + from pip._vendor.chardet.sbcharsetprober import SingleByteCharSetModel +diff --git a/src/pip/_vendor/chardet/langturkishmodel.py b/src/pip/_vendor/chardet/langturkishmodel.py +index 43f4230ae..7e710c371 100644 +--- a/src/pip/_vendor/chardet/langturkishmodel.py ++++ b/src/pip/_vendor/chardet/langturkishmodel.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + # -*- coding: utf-8 -*- + + from pip._vendor.chardet.sbcharsetprober import SingleByteCharSetModel +diff --git a/src/pip/_vendor/chardet/metadata/languages.py b/src/pip/_vendor/chardet/metadata/languages.py +index 3237d5abf..aa2ec7c35 100644 +--- a/src/pip/_vendor/chardet/metadata/languages.py ++++ b/src/pip/_vendor/chardet/metadata/languages.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 + # -*- coding: utf-8 -*- """ - Script which takes one or more file paths and reports on their detected - encodings + Metadata about languages used by our model training code for our diff --git a/src/pip/_vendor/requests/certs.py b/src/pip/_vendor/requests/certs.py -index 06a594e..bfa7839 100644 +index 06a594e58..bfa7839a4 100644 --- a/src/pip/_vendor/requests/certs.py +++ b/src/pip/_vendor/requests/certs.py @@ -1,4 +1,4 @@ @@ -56,5 +124,5 @@ index 06a594e..bfa7839 100644 """ -- -2.24.1 +2.31.1 diff --git a/meta/recipes-devtools/python/python3-pip_20.0.2.bb b/meta/recipes-devtools/python/python3-pip_21.1.2.bb similarity index 73% rename from meta/recipes-devtools/python/python3-pip_20.0.2.bb rename to meta/recipes-devtools/python/python3-pip_21.1.2.bb index 99eeea2edf..fd7a145205 100644 --- a/meta/recipes-devtools/python/python3-pip_20.0.2.bb +++ b/meta/recipes-devtools/python/python3-pip_21.1.2.bb @@ -2,14 +2,14 @@ SUMMARY = "The PyPA recommended tool for installing Python packages" HOMEPAGE = "https://pypi.org/project/pip" SECTION = "devel/python" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=8ba06d529c955048e5ddd7c45459eb2e" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=c4fa2b50f55649f43060fa04b0919b9b" DEPENDS += "python3 python3-setuptools-native" SRC_URI += "file://0001-change-shebang-to-python3.patch" -SRC_URI[md5sum] = "7d42ba49b809604f0df3d55df1c3fd86" -SRC_URI[sha256sum] = "7db0c8ea4c7ea51c8049640e8e6e7fde949de672bfa4949920675563a5a6967f" +SRC_URI[md5sum] = "a867fd51eacfd5293f5b7e0c2e7867a7" +SRC_URI[sha256sum] = "eb5df6b9ab0af50fe1098a52fd439b04730b6e066887ff7497357b9ebd19f79b" inherit pypi distutils3 -- 2.31.1 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* [OE-core][PATCH 2/2] python3-pip: add multiprocessing to RDEPENDS 2021-06-22 17:37 [OE-core][PATCH 1/2] python3-pip: upgrade 20.0.2 -> 21.1.2 Trevor Gamblin @ 2021-06-22 17:37 ` Trevor Gamblin 2021-06-22 18:43 ` [OE-core][PATCH 1/2] python3-pip: upgrade 20.0.2 -> 21.1.2 Alexander Kanavin [not found] ` <168AFBC4AA915097.26331@lists.openembedded.org> 2 siblings, 0 replies; 6+ messages in thread From: Trevor Gamblin @ 2021-06-22 17:37 UTC (permalink / raw) To: openembedded-core Without it, simple invocations like "pip3 list" will fail with a ModuleNotFoundError for multiprocessing. Signed-off-by: Trevor Gamblin <trevor.gamblin@windriver.com> --- meta/recipes-devtools/python/python3-pip_21.1.2.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-devtools/python/python3-pip_21.1.2.bb b/meta/recipes-devtools/python/python3-pip_21.1.2.bb index fd7a145205..2dc628fc29 100644 --- a/meta/recipes-devtools/python/python3-pip_21.1.2.bb +++ b/meta/recipes-devtools/python/python3-pip_21.1.2.bb @@ -23,6 +23,7 @@ RDEPENDS_${PN} = "\ python3-io \ python3-html \ python3-json \ + python3-multiprocessing \ python3-netserver \ python3-setuptools \ python3-unixadmin \ -- 2.31.1 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [OE-core][PATCH 1/2] python3-pip: upgrade 20.0.2 -> 21.1.2 2021-06-22 17:37 [OE-core][PATCH 1/2] python3-pip: upgrade 20.0.2 -> 21.1.2 Trevor Gamblin 2021-06-22 17:37 ` [OE-core][PATCH 2/2] python3-pip: add multiprocessing to RDEPENDS Trevor Gamblin @ 2021-06-22 18:43 ` Alexander Kanavin [not found] ` <168AFBC4AA915097.26331@lists.openembedded.org> 2 siblings, 0 replies; 6+ messages in thread From: Alexander Kanavin @ 2021-06-22 18:43 UTC (permalink / raw) To: Trevor Gamblin; +Cc: OE-core [-- Attachment #1: Type: text/plain, Size: 9494 bytes --] Can you please check why 'devtool check-upgrade-status' wasn't able to report that all these new versions have been available? Alex On Tue, 22 Jun 2021 at 19:37, Trevor Gamblin <trevor.gamblin@windriver.com> wrote: > 21.1.2 contains a fix for CVE-2021-3572 > ( > https://github.com/pypa/pip/commit/e46bdda9711392fec0c45c1175bae6db847cb30b > ) > > The LICENSE.txt signature changed due to an update to the copyright > dates, but the terms are the same. > > Also update 0001-change-shebang-to-python3.patch to cover all files in > pip's src directory, since we need to ensure compatibility. > > Signed-off-by: Trevor Gamblin <trevor.gamblin@windriver.com> > --- > .../0001-change-shebang-to-python3.patch | 128 ++++++++++++++---- > ...n3-pip_20.0.2.bb => python3-pip_21.1.2.bb} | 6 +- > 2 files changed, 101 insertions(+), 33 deletions(-) > rename meta/recipes-devtools/python/{python3-pip_20.0.2.bb => > python3-pip_21.1.2.bb} (73%) > > diff --git > a/meta/recipes-devtools/python/python3-pip/0001-change-shebang-to-python3.patch > b/meta/recipes-devtools/python/python3-pip/0001-change-shebang-to-python3.patch > index 00cffe169b..0187001168 100644 > --- > a/meta/recipes-devtools/python/python3-pip/0001-change-shebang-to-python3.patch > +++ > b/meta/recipes-devtools/python/python3-pip/0001-change-shebang-to-python3.patch > @@ -1,32 +1,30 @@ > -From e7a00e9b5104ae2fbcea32a35c85760b77fae7e5 Mon Sep 17 00:00:00 2001 > -From: Changqing Li <changqing.li@windriver.com> > -Date: Thu, 23 Apr 2020 09:42:10 +0000 > +From baa85a4dab2e8d64eb25d1181b6420db25ce919a Mon Sep 17 00:00:00 2001 > +From: Trevor Gamblin <trevor.gamblin@windriver.com> > +Date: Tue, 22 Jun 2021 12:31:46 -0400 > Subject: [PATCH] change shebang to python3 > > -Upstream-Status: Pending > +Upstream-Status: Inappropriate (OE-specific) > > -pip will drop support of python2 from 21.0 > +Despite no longer supporting python2, some files in the pip source refer > +to "python" instead of "python3", so patch them as needed to ensure that > +they correctly reference the python3 binary. > > -Signed-off-by: Changqing Li <changqing.li@windriver.com> > +Signed-off-by: Trevor Gamblin <trevor.gamblin@windriver.com> > --- > - src/pip/_internal/__init__.py | 2 +- > - src/pip/_vendor/appdirs.py | 2 +- > - src/pip/_vendor/chardet/cli/chardetect.py | 2 +- > - src/pip/_vendor/requests/certs.py | 2 +- > - 4 files changed, 4 insertions(+), 4 deletions(-) > + src/pip/_vendor/appdirs.py | 2 +- > + src/pip/_vendor/chardet/langbulgarianmodel.py | 2 +- > + src/pip/_vendor/chardet/langgreekmodel.py | 2 +- > + src/pip/_vendor/chardet/langhebrewmodel.py | 2 +- > + src/pip/_vendor/chardet/langhungarianmodel.py | 2 +- > + src/pip/_vendor/chardet/langrussianmodel.py | 2 +- > + src/pip/_vendor/chardet/langthaimodel.py | 2 +- > + src/pip/_vendor/chardet/langturkishmodel.py | 2 +- > + src/pip/_vendor/chardet/metadata/languages.py | 2 +- > + src/pip/_vendor/requests/certs.py | 2 +- > + 10 files changed, 10 insertions(+), 10 deletions(-) > > -diff --git a/src/pip/_internal/__init__.py b/src/pip/_internal/__init__.py > -index 3aa8a46..e1ad179 100755 > ---- a/src/pip/_internal/__init__.py > -+++ b/src/pip/_internal/__init__.py > -@@ -1,4 +1,4 @@ > --#!/usr/bin/env python > -+#!/usr/bin/env python3 > - import pip._internal.utils.inject_securetransport # noqa > - from pip._internal.utils.typing import MYPY_CHECK_RUNNING > - > diff --git a/src/pip/_vendor/appdirs.py b/src/pip/_vendor/appdirs.py > -index 3a52b75..ad3f81d 100644 > +index 33a3b7741..60b9ef5f7 100644 > --- a/src/pip/_vendor/appdirs.py > +++ b/src/pip/_vendor/appdirs.py > @@ -1,4 +1,4 @@ > @@ -35,18 +33,88 @@ index 3a52b75..ad3f81d 100644 > # -*- coding: utf-8 -*- > # Copyright (c) 2005-2010 ActiveState Software Inc. > # Copyright (c) 2013 Eddy Petrișor > -diff --git a/src/pip/_vendor/chardet/cli/chardetect.py > b/src/pip/_vendor/chardet/cli/chardetect.py > -index c61136b..a497e98 100644 > ---- a/src/pip/_vendor/chardet/cli/chardetect.py > -+++ b/src/pip/_vendor/chardet/cli/chardetect.py > +diff --git a/src/pip/_vendor/chardet/langbulgarianmodel.py > b/src/pip/_vendor/chardet/langbulgarianmodel.py > +index e963a5097..97ea6cea8 100644 > +--- a/src/pip/_vendor/chardet/langbulgarianmodel.py > ++++ b/src/pip/_vendor/chardet/langbulgarianmodel.py > +@@ -1,4 +1,4 @@ > +-#!/usr/bin/env python > ++#!/usr/bin/env python3 > + # -*- coding: utf-8 -*- > + > + from pip._vendor.chardet.sbcharsetprober import SingleByteCharSetModel > +diff --git a/src/pip/_vendor/chardet/langgreekmodel.py > b/src/pip/_vendor/chardet/langgreekmodel.py > +index d99528ede..4a127ea83 100644 > +--- a/src/pip/_vendor/chardet/langgreekmodel.py > ++++ b/src/pip/_vendor/chardet/langgreekmodel.py > +@@ -1,4 +1,4 @@ > +-#!/usr/bin/env python > ++#!/usr/bin/env python3 > + # -*- coding: utf-8 -*- > + > + from pip._vendor.chardet.sbcharsetprober import SingleByteCharSetModel > +diff --git a/src/pip/_vendor/chardet/langhebrewmodel.py > b/src/pip/_vendor/chardet/langhebrewmodel.py > +index 484c652a4..676c1a711 100644 > +--- a/src/pip/_vendor/chardet/langhebrewmodel.py > ++++ b/src/pip/_vendor/chardet/langhebrewmodel.py > +@@ -1,4 +1,4 @@ > +-#!/usr/bin/env python > ++#!/usr/bin/env python3 > + # -*- coding: utf-8 -*- > + > + from pip._vendor.chardet.sbcharsetprober import SingleByteCharSetModel > +diff --git a/src/pip/_vendor/chardet/langhungarianmodel.py > b/src/pip/_vendor/chardet/langhungarianmodel.py > +index bbc5cda64..042eae70a 100644 > +--- a/src/pip/_vendor/chardet/langhungarianmodel.py > ++++ b/src/pip/_vendor/chardet/langhungarianmodel.py > +@@ -1,4 +1,4 @@ > +-#!/usr/bin/env python > ++#!/usr/bin/env python3 > + # -*- coding: utf-8 -*- > + > + from pip._vendor.chardet.sbcharsetprober import SingleByteCharSetModel > +diff --git a/src/pip/_vendor/chardet/langrussianmodel.py > b/src/pip/_vendor/chardet/langrussianmodel.py > +index 5594452b5..564b02e58 100644 > +--- a/src/pip/_vendor/chardet/langrussianmodel.py > ++++ b/src/pip/_vendor/chardet/langrussianmodel.py > +@@ -1,4 +1,4 @@ > +-#!/usr/bin/env python > ++#!/usr/bin/env python3 > + # -*- coding: utf-8 -*- > + > + from pip._vendor.chardet.sbcharsetprober import SingleByteCharSetModel > +diff --git a/src/pip/_vendor/chardet/langthaimodel.py > b/src/pip/_vendor/chardet/langthaimodel.py > +index 9a37db573..c97487959 100644 > +--- a/src/pip/_vendor/chardet/langthaimodel.py > ++++ b/src/pip/_vendor/chardet/langthaimodel.py > +@@ -1,4 +1,4 @@ > +-#!/usr/bin/env python > ++#!/usr/bin/env python3 > + # -*- coding: utf-8 -*- > + > + from pip._vendor.chardet.sbcharsetprober import SingleByteCharSetModel > +diff --git a/src/pip/_vendor/chardet/langturkishmodel.py > b/src/pip/_vendor/chardet/langturkishmodel.py > +index 43f4230ae..7e710c371 100644 > +--- a/src/pip/_vendor/chardet/langturkishmodel.py > ++++ b/src/pip/_vendor/chardet/langturkishmodel.py > +@@ -1,4 +1,4 @@ > +-#!/usr/bin/env python > ++#!/usr/bin/env python3 > + # -*- coding: utf-8 -*- > + > + from pip._vendor.chardet.sbcharsetprober import SingleByteCharSetModel > +diff --git a/src/pip/_vendor/chardet/metadata/languages.py > b/src/pip/_vendor/chardet/metadata/languages.py > +index 3237d5abf..aa2ec7c35 100644 > +--- a/src/pip/_vendor/chardet/metadata/languages.py > ++++ b/src/pip/_vendor/chardet/metadata/languages.py > @@ -1,4 +1,4 @@ > -#!/usr/bin/env python > +#!/usr/bin/env python3 > + # -*- coding: utf-8 -*- > """ > - Script which takes one or more file paths and reports on their detected > - encodings > + Metadata about languages used by our model training code for our > diff --git a/src/pip/_vendor/requests/certs.py > b/src/pip/_vendor/requests/certs.py > -index 06a594e..bfa7839 100644 > +index 06a594e58..bfa7839a4 100644 > --- a/src/pip/_vendor/requests/certs.py > +++ b/src/pip/_vendor/requests/certs.py > @@ -1,4 +1,4 @@ > @@ -56,5 +124,5 @@ index 06a594e..bfa7839 100644 > > """ > -- > -2.24.1 > +2.31.1 > > diff --git a/meta/recipes-devtools/python/python3-pip_20.0.2.bb > b/meta/recipes-devtools/python/python3-pip_21.1.2.bb > similarity index 73% > rename from meta/recipes-devtools/python/python3-pip_20.0.2.bb > rename to meta/recipes-devtools/python/python3-pip_21.1.2.bb > index 99eeea2edf..fd7a145205 100644 > --- a/meta/recipes-devtools/python/python3-pip_20.0.2.bb > +++ b/meta/recipes-devtools/python/python3-pip_21.1.2.bb > @@ -2,14 +2,14 @@ SUMMARY = "The PyPA recommended tool for installing > Python packages" > HOMEPAGE = "https://pypi.org/project/pip" > SECTION = "devel/python" > LICENSE = "MIT" > -LIC_FILES_CHKSUM = > "file://LICENSE.txt;md5=8ba06d529c955048e5ddd7c45459eb2e" > +LIC_FILES_CHKSUM = > "file://LICENSE.txt;md5=c4fa2b50f55649f43060fa04b0919b9b" > > DEPENDS += "python3 python3-setuptools-native" > > SRC_URI += "file://0001-change-shebang-to-python3.patch" > > -SRC_URI[md5sum] = "7d42ba49b809604f0df3d55df1c3fd86" > -SRC_URI[sha256sum] = > "7db0c8ea4c7ea51c8049640e8e6e7fde949de672bfa4949920675563a5a6967f" > +SRC_URI[md5sum] = "a867fd51eacfd5293f5b7e0c2e7867a7" > +SRC_URI[sha256sum] = > "eb5df6b9ab0af50fe1098a52fd439b04730b6e066887ff7497357b9ebd19f79b" > > inherit pypi distutils3 > > -- > 2.31.1 > > > > > [-- Attachment #2: Type: text/html, Size: 11767 bytes --] ^ permalink raw reply [flat|nested] 6+ messages in thread
[parent not found: <168AFBC4AA915097.26331@lists.openembedded.org>]
* Re: [OE-core][PATCH 1/2] python3-pip: upgrade 20.0.2 -> 21.1.2 [not found] ` <168AFBC4AA915097.26331@lists.openembedded.org> @ 2021-06-22 18:47 ` Alexander Kanavin 2021-06-22 20:27 ` Trevor Gamblin 0 siblings, 1 reply; 6+ messages in thread From: Alexander Kanavin @ 2021-06-22 18:47 UTC (permalink / raw) To: Alexander Kanavin; +Cc: Trevor Gamblin, OE-core [-- Attachment #1: Type: text/plain, Size: 9989 bytes --] Ah, because pypi.bbclass sets SRC_URI += instead of =. I'll queue a patch to fix the class. Alex On Tue, 22 Jun 2021 at 20:44, Alexander Kanavin via lists.openembedded.org <alex.kanavin=gmail.com@lists.openembedded.org> wrote: > Can you please check why 'devtool check-upgrade-status' wasn't able to > report that all these new versions have been available? > > Alex > > On Tue, 22 Jun 2021 at 19:37, Trevor Gamblin <trevor.gamblin@windriver.com> > wrote: > >> 21.1.2 contains a fix for CVE-2021-3572 >> ( >> https://github.com/pypa/pip/commit/e46bdda9711392fec0c45c1175bae6db847cb30b >> ) >> >> The LICENSE.txt signature changed due to an update to the copyright >> dates, but the terms are the same. >> >> Also update 0001-change-shebang-to-python3.patch to cover all files in >> pip's src directory, since we need to ensure compatibility. >> >> Signed-off-by: Trevor Gamblin <trevor.gamblin@windriver.com> >> --- >> .../0001-change-shebang-to-python3.patch | 128 ++++++++++++++---- >> ...n3-pip_20.0.2.bb => python3-pip_21.1.2.bb} | 6 +- >> 2 files changed, 101 insertions(+), 33 deletions(-) >> rename meta/recipes-devtools/python/{python3-pip_20.0.2.bb => >> python3-pip_21.1.2.bb} (73%) >> >> diff --git >> a/meta/recipes-devtools/python/python3-pip/0001-change-shebang-to-python3.patch >> b/meta/recipes-devtools/python/python3-pip/0001-change-shebang-to-python3.patch >> index 00cffe169b..0187001168 100644 >> --- >> a/meta/recipes-devtools/python/python3-pip/0001-change-shebang-to-python3.patch >> +++ >> b/meta/recipes-devtools/python/python3-pip/0001-change-shebang-to-python3.patch >> @@ -1,32 +1,30 @@ >> -From e7a00e9b5104ae2fbcea32a35c85760b77fae7e5 Mon Sep 17 00:00:00 2001 >> -From: Changqing Li <changqing.li@windriver.com> >> -Date: Thu, 23 Apr 2020 09:42:10 +0000 >> +From baa85a4dab2e8d64eb25d1181b6420db25ce919a Mon Sep 17 00:00:00 2001 >> +From: Trevor Gamblin <trevor.gamblin@windriver.com> >> +Date: Tue, 22 Jun 2021 12:31:46 -0400 >> Subject: [PATCH] change shebang to python3 >> >> -Upstream-Status: Pending >> +Upstream-Status: Inappropriate (OE-specific) >> >> -pip will drop support of python2 from 21.0 >> +Despite no longer supporting python2, some files in the pip source refer >> +to "python" instead of "python3", so patch them as needed to ensure that >> +they correctly reference the python3 binary. >> >> -Signed-off-by: Changqing Li <changqing.li@windriver.com> >> +Signed-off-by: Trevor Gamblin <trevor.gamblin@windriver.com> >> --- >> - src/pip/_internal/__init__.py | 2 +- >> - src/pip/_vendor/appdirs.py | 2 +- >> - src/pip/_vendor/chardet/cli/chardetect.py | 2 +- >> - src/pip/_vendor/requests/certs.py | 2 +- >> - 4 files changed, 4 insertions(+), 4 deletions(-) >> + src/pip/_vendor/appdirs.py | 2 +- >> + src/pip/_vendor/chardet/langbulgarianmodel.py | 2 +- >> + src/pip/_vendor/chardet/langgreekmodel.py | 2 +- >> + src/pip/_vendor/chardet/langhebrewmodel.py | 2 +- >> + src/pip/_vendor/chardet/langhungarianmodel.py | 2 +- >> + src/pip/_vendor/chardet/langrussianmodel.py | 2 +- >> + src/pip/_vendor/chardet/langthaimodel.py | 2 +- >> + src/pip/_vendor/chardet/langturkishmodel.py | 2 +- >> + src/pip/_vendor/chardet/metadata/languages.py | 2 +- >> + src/pip/_vendor/requests/certs.py | 2 +- >> + 10 files changed, 10 insertions(+), 10 deletions(-) >> >> -diff --git a/src/pip/_internal/__init__.py >> b/src/pip/_internal/__init__.py >> -index 3aa8a46..e1ad179 100755 >> ---- a/src/pip/_internal/__init__.py >> -+++ b/src/pip/_internal/__init__.py >> -@@ -1,4 +1,4 @@ >> --#!/usr/bin/env python >> -+#!/usr/bin/env python3 >> - import pip._internal.utils.inject_securetransport # noqa >> - from pip._internal.utils.typing import MYPY_CHECK_RUNNING >> - >> diff --git a/src/pip/_vendor/appdirs.py b/src/pip/_vendor/appdirs.py >> -index 3a52b75..ad3f81d 100644 >> +index 33a3b7741..60b9ef5f7 100644 >> --- a/src/pip/_vendor/appdirs.py >> +++ b/src/pip/_vendor/appdirs.py >> @@ -1,4 +1,4 @@ >> @@ -35,18 +33,88 @@ index 3a52b75..ad3f81d 100644 >> # -*- coding: utf-8 -*- >> # Copyright (c) 2005-2010 ActiveState Software Inc. >> # Copyright (c) 2013 Eddy Petrișor >> -diff --git a/src/pip/_vendor/chardet/cli/chardetect.py >> b/src/pip/_vendor/chardet/cli/chardetect.py >> -index c61136b..a497e98 100644 >> ---- a/src/pip/_vendor/chardet/cli/chardetect.py >> -+++ b/src/pip/_vendor/chardet/cli/chardetect.py >> +diff --git a/src/pip/_vendor/chardet/langbulgarianmodel.py >> b/src/pip/_vendor/chardet/langbulgarianmodel.py >> +index e963a5097..97ea6cea8 100644 >> +--- a/src/pip/_vendor/chardet/langbulgarianmodel.py >> ++++ b/src/pip/_vendor/chardet/langbulgarianmodel.py >> +@@ -1,4 +1,4 @@ >> +-#!/usr/bin/env python >> ++#!/usr/bin/env python3 >> + # -*- coding: utf-8 -*- >> + >> + from pip._vendor.chardet.sbcharsetprober import SingleByteCharSetModel >> +diff --git a/src/pip/_vendor/chardet/langgreekmodel.py >> b/src/pip/_vendor/chardet/langgreekmodel.py >> +index d99528ede..4a127ea83 100644 >> +--- a/src/pip/_vendor/chardet/langgreekmodel.py >> ++++ b/src/pip/_vendor/chardet/langgreekmodel.py >> +@@ -1,4 +1,4 @@ >> +-#!/usr/bin/env python >> ++#!/usr/bin/env python3 >> + # -*- coding: utf-8 -*- >> + >> + from pip._vendor.chardet.sbcharsetprober import SingleByteCharSetModel >> +diff --git a/src/pip/_vendor/chardet/langhebrewmodel.py >> b/src/pip/_vendor/chardet/langhebrewmodel.py >> +index 484c652a4..676c1a711 100644 >> +--- a/src/pip/_vendor/chardet/langhebrewmodel.py >> ++++ b/src/pip/_vendor/chardet/langhebrewmodel.py >> +@@ -1,4 +1,4 @@ >> +-#!/usr/bin/env python >> ++#!/usr/bin/env python3 >> + # -*- coding: utf-8 -*- >> + >> + from pip._vendor.chardet.sbcharsetprober import SingleByteCharSetModel >> +diff --git a/src/pip/_vendor/chardet/langhungarianmodel.py >> b/src/pip/_vendor/chardet/langhungarianmodel.py >> +index bbc5cda64..042eae70a 100644 >> +--- a/src/pip/_vendor/chardet/langhungarianmodel.py >> ++++ b/src/pip/_vendor/chardet/langhungarianmodel.py >> +@@ -1,4 +1,4 @@ >> +-#!/usr/bin/env python >> ++#!/usr/bin/env python3 >> + # -*- coding: utf-8 -*- >> + >> + from pip._vendor.chardet.sbcharsetprober import SingleByteCharSetModel >> +diff --git a/src/pip/_vendor/chardet/langrussianmodel.py >> b/src/pip/_vendor/chardet/langrussianmodel.py >> +index 5594452b5..564b02e58 100644 >> +--- a/src/pip/_vendor/chardet/langrussianmodel.py >> ++++ b/src/pip/_vendor/chardet/langrussianmodel.py >> +@@ -1,4 +1,4 @@ >> +-#!/usr/bin/env python >> ++#!/usr/bin/env python3 >> + # -*- coding: utf-8 -*- >> + >> + from pip._vendor.chardet.sbcharsetprober import SingleByteCharSetModel >> +diff --git a/src/pip/_vendor/chardet/langthaimodel.py >> b/src/pip/_vendor/chardet/langthaimodel.py >> +index 9a37db573..c97487959 100644 >> +--- a/src/pip/_vendor/chardet/langthaimodel.py >> ++++ b/src/pip/_vendor/chardet/langthaimodel.py >> +@@ -1,4 +1,4 @@ >> +-#!/usr/bin/env python >> ++#!/usr/bin/env python3 >> + # -*- coding: utf-8 -*- >> + >> + from pip._vendor.chardet.sbcharsetprober import SingleByteCharSetModel >> +diff --git a/src/pip/_vendor/chardet/langturkishmodel.py >> b/src/pip/_vendor/chardet/langturkishmodel.py >> +index 43f4230ae..7e710c371 100644 >> +--- a/src/pip/_vendor/chardet/langturkishmodel.py >> ++++ b/src/pip/_vendor/chardet/langturkishmodel.py >> +@@ -1,4 +1,4 @@ >> +-#!/usr/bin/env python >> ++#!/usr/bin/env python3 >> + # -*- coding: utf-8 -*- >> + >> + from pip._vendor.chardet.sbcharsetprober import SingleByteCharSetModel >> +diff --git a/src/pip/_vendor/chardet/metadata/languages.py >> b/src/pip/_vendor/chardet/metadata/languages.py >> +index 3237d5abf..aa2ec7c35 100644 >> +--- a/src/pip/_vendor/chardet/metadata/languages.py >> ++++ b/src/pip/_vendor/chardet/metadata/languages.py >> @@ -1,4 +1,4 @@ >> -#!/usr/bin/env python >> +#!/usr/bin/env python3 >> + # -*- coding: utf-8 -*- >> """ >> - Script which takes one or more file paths and reports on their detected >> - encodings >> + Metadata about languages used by our model training code for our >> diff --git a/src/pip/_vendor/requests/certs.py >> b/src/pip/_vendor/requests/certs.py >> -index 06a594e..bfa7839 100644 >> +index 06a594e58..bfa7839a4 100644 >> --- a/src/pip/_vendor/requests/certs.py >> +++ b/src/pip/_vendor/requests/certs.py >> @@ -1,4 +1,4 @@ >> @@ -56,5 +124,5 @@ index 06a594e..bfa7839 100644 >> >> """ >> -- >> -2.24.1 >> +2.31.1 >> >> diff --git a/meta/recipes-devtools/python/python3-pip_20.0.2.bb >> b/meta/recipes-devtools/python/python3-pip_21.1.2.bb >> similarity index 73% >> rename from meta/recipes-devtools/python/python3-pip_20.0.2.bb >> rename to meta/recipes-devtools/python/python3-pip_21.1.2.bb >> index 99eeea2edf..fd7a145205 100644 >> --- a/meta/recipes-devtools/python/python3-pip_20.0.2.bb >> +++ b/meta/recipes-devtools/python/python3-pip_21.1.2.bb >> @@ -2,14 +2,14 @@ SUMMARY = "The PyPA recommended tool for installing >> Python packages" >> HOMEPAGE = "https://pypi.org/project/pip" >> SECTION = "devel/python" >> LICENSE = "MIT" >> -LIC_FILES_CHKSUM = >> "file://LICENSE.txt;md5=8ba06d529c955048e5ddd7c45459eb2e" >> +LIC_FILES_CHKSUM = >> "file://LICENSE.txt;md5=c4fa2b50f55649f43060fa04b0919b9b" >> >> DEPENDS += "python3 python3-setuptools-native" >> >> SRC_URI += "file://0001-change-shebang-to-python3.patch" >> >> -SRC_URI[md5sum] = "7d42ba49b809604f0df3d55df1c3fd86" >> -SRC_URI[sha256sum] = >> "7db0c8ea4c7ea51c8049640e8e6e7fde949de672bfa4949920675563a5a6967f" >> +SRC_URI[md5sum] = "a867fd51eacfd5293f5b7e0c2e7867a7" >> +SRC_URI[sha256sum] = >> "eb5df6b9ab0af50fe1098a52fd439b04730b6e066887ff7497357b9ebd19f79b" >> >> inherit pypi distutils3 >> >> -- >> 2.31.1 >> >> >> >> >> > > > [-- Attachment #2: Type: text/html, Size: 12410 bytes --] ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [OE-core][PATCH 1/2] python3-pip: upgrade 20.0.2 -> 21.1.2 2021-06-22 18:47 ` Alexander Kanavin @ 2021-06-22 20:27 ` Trevor Gamblin 0 siblings, 0 replies; 6+ messages in thread From: Trevor Gamblin @ 2021-06-22 20:27 UTC (permalink / raw) To: Alexander Kanavin; +Cc: OE-core, timothy.t.orling [-- Attachment #1: Type: text/plain, Size: 22487 bytes --] On 2021-06-22 2:47 p.m., Alexander Kanavin wrote: > > **[Please note: This e-mail is from an EXTERNAL e-mail address] > > Ah, because pypi.bbclass sets SRC_URI += instead of =. I'll queue a > patch to fix the class. Right, Tim noticed this too and I re-submitted a v2 of this patch to fix the ordering of the inherit and SRC_URI lines in the recipe. Thanks for looking at the bbclass! - Trevor > > Alex > > On Tue, 22 Jun 2021 at 20:44, Alexander Kanavin via > lists.openembedded.org > <https://urldefense.com/v3/__http://lists.openembedded.org__;!!AjveYdw8EvQ!KTM5dte-TboJLS9K0bF7OZrppD8lmjf4Eo7ynTvDKO4FGa0RE8rK6A6Aa3oADXEISK6-AA$> > <alex.kanavin=gmail.com@lists.openembedded.org > <mailto:gmail.com@lists.openembedded.org>> wrote: > > Can you please check why 'devtool check-upgrade-status' wasn't > able to report that all these new versions have been available? > > Alex > > On Tue, 22 Jun 2021 at 19:37, Trevor Gamblin > <trevor.gamblin@windriver.com > <mailto:trevor.gamblin@windriver.com>> wrote: > > 21.1.2 contains a fix for CVE-2021-3572 > (https://github.com/pypa/pip/commit/e46bdda9711392fec0c45c1175bae6db847cb30b > <https://urldefense.com/v3/__https://github.com/pypa/pip/commit/e46bdda9711392fec0c45c1175bae6db847cb30b__;!!AjveYdw8EvQ!KTM5dte-TboJLS9K0bF7OZrppD8lmjf4Eo7ynTvDKO4FGa0RE8rK6A6Aa3oADXE6_DCCNA$>) > > The LICENSE.txt signature changed due to an update to the > copyright > dates, but the terms are the same. > > Also update 0001-change-shebang-to-python3.patch to cover all > files in > pip's src directory, since we need to ensure compatibility. > > Signed-off-by: Trevor Gamblin <trevor.gamblin@windriver.com > <mailto:trevor.gamblin@windriver.com>> > --- > .../0001-change-shebang-to-python3.patch | 128 > ++++++++++++++---- > ...n3-pip_20.0.2.bb > <https://urldefense.com/v3/__http://n3-pip_20.0.2.bb__;!!AjveYdw8EvQ!KTM5dte-TboJLS9K0bF7OZrppD8lmjf4Eo7ynTvDKO4FGa0RE8rK6A6Aa3oADXEMfxdA4w$> > => python3-pip_21.1.2.bb > <https://urldefense.com/v3/__http://python3-pip_21.1.2.bb__;!!AjveYdw8EvQ!KTM5dte-TboJLS9K0bF7OZrppD8lmjf4Eo7ynTvDKO4FGa0RE8rK6A6Aa3oADXEfAt_Dfg$>} > | 6 +- > 2 files changed, 101 insertions(+), 33 deletions(-) > rename meta/recipes-devtools/python/{python3-pip_20.0.2.bb > <https://urldefense.com/v3/__http://python3-pip_20.0.2.bb__;!!AjveYdw8EvQ!KTM5dte-TboJLS9K0bF7OZrppD8lmjf4Eo7ynTvDKO4FGa0RE8rK6A6Aa3oADXFLvQTN5g$> > => python3-pip_21.1.2.bb > <https://urldefense.com/v3/__http://python3-pip_21.1.2.bb__;!!AjveYdw8EvQ!KTM5dte-TboJLS9K0bF7OZrppD8lmjf4Eo7ynTvDKO4FGa0RE8rK6A6Aa3oADXEfAt_Dfg$>} > (73%) > > diff --git > a/meta/recipes-devtools/python/python3-pip/0001-change-shebang-to-python3.patch > b/meta/recipes-devtools/python/python3-pip/0001-change-shebang-to-python3.patch > index 00cffe169b..0187001168 100644 > --- > a/meta/recipes-devtools/python/python3-pip/0001-change-shebang-to-python3.patch > +++ > b/meta/recipes-devtools/python/python3-pip/0001-change-shebang-to-python3.patch > @@ -1,32 +1,30 @@ > -From e7a00e9b5104ae2fbcea32a35c85760b77fae7e5 Mon Sep 17 > 00:00:00 2001 > -From: Changqing Li <changqing.li@windriver.com > <mailto:changqing.li@windriver.com>> > -Date: Thu, 23 Apr 2020 09:42:10 +0000 > +From baa85a4dab2e8d64eb25d1181b6420db25ce919a Mon Sep 17 > 00:00:00 2001 > +From: Trevor Gamblin <trevor.gamblin@windriver.com > <mailto:trevor.gamblin@windriver.com>> > +Date: Tue, 22 Jun 2021 12:31:46 -0400 > Subject: [PATCH] change shebang to python3 > > -Upstream-Status: Pending > +Upstream-Status: Inappropriate (OE-specific) > > -pip will drop support of python2 from 21.0 > +Despite no longer supporting python2, some files in the pip > source refer > +to "python" instead of "python3", so patch them as needed to > ensure that > +they correctly reference the python3 binary. > > -Signed-off-by: Changqing Li <changqing.li@windriver.com > <mailto:changqing.li@windriver.com>> > +Signed-off-by: Trevor Gamblin <trevor.gamblin@windriver.com > <mailto:trevor.gamblin@windriver.com>> > --- > - src/pip/_internal/__init__.py | 2 +- > - src/pip/_vendor/appdirs.py | 2 +- > - src/pip/_vendor/chardet/cli/chardetect.py > <https://urldefense.com/v3/__http://chardetect.py__;!!AjveYdw8EvQ!KTM5dte-TboJLS9K0bF7OZrppD8lmjf4Eo7ynTvDKO4FGa0RE8rK6A6Aa3oADXFqJhUBzw$> > | 2 +- > - src/pip/_vendor/requests/certs.py | 2 +- > - 4 files changed, 4 insertions(+), 4 deletions(-) > + src/pip/_vendor/appdirs.py | 2 +- > + src/pip/_vendor/chardet/langbulgarianmodel.py > <https://urldefense.com/v3/__http://langbulgarianmodel.py__;!!AjveYdw8EvQ!KTM5dte-TboJLS9K0bF7OZrppD8lmjf4Eo7ynTvDKO4FGa0RE8rK6A6Aa3oADXEtK07ePQ$> > | 2 +- > + src/pip/_vendor/chardet/langgreekmodel.py | 2 +- > + src/pip/_vendor/chardet/langhebrewmodel.py | 2 +- > + src/pip/_vendor/chardet/langhungarianmodel.py > <https://urldefense.com/v3/__http://langhungarianmodel.py__;!!AjveYdw8EvQ!KTM5dte-TboJLS9K0bF7OZrppD8lmjf4Eo7ynTvDKO4FGa0RE8rK6A6Aa3oADXEn0q6gyA$> > | 2 +- > + src/pip/_vendor/chardet/langrussianmodel.py | 2 +- > + src/pip/_vendor/chardet/langthaimodel.py | 2 +- > + src/pip/_vendor/chardet/langturkishmodel.py | 2 +- > + src/pip/_vendor/chardet/metadata/languages.py > <https://urldefense.com/v3/__http://languages.py__;!!AjveYdw8EvQ!KTM5dte-TboJLS9K0bF7OZrppD8lmjf4Eo7ynTvDKO4FGa0RE8rK6A6Aa3oADXGPj_LLsw$> > | 2 +- > + src/pip/_vendor/requests/certs.py | 2 +- > + 10 files changed, 10 insertions(+), 10 deletions(-) > > -diff --git a/src/pip/_internal/__init__.py > <https://urldefense.com/v3/__http://__init__.py__;!!AjveYdw8EvQ!KTM5dte-TboJLS9K0bF7OZrppD8lmjf4Eo7ynTvDKO4FGa0RE8rK6A6Aa3oADXFPaRIkpQ$> > b/src/pip/_internal/__init__.py > <https://urldefense.com/v3/__http://__init__.py__;!!AjveYdw8EvQ!KTM5dte-TboJLS9K0bF7OZrppD8lmjf4Eo7ynTvDKO4FGa0RE8rK6A6Aa3oADXFPaRIkpQ$> > -index 3aa8a46..e1ad179 100755 > ---- a/src/pip/_internal/__init__.py > <https://urldefense.com/v3/__http://__init__.py__;!!AjveYdw8EvQ!KTM5dte-TboJLS9K0bF7OZrppD8lmjf4Eo7ynTvDKO4FGa0RE8rK6A6Aa3oADXFPaRIkpQ$> > -+++ b/src/pip/_internal/__init__.py > <https://urldefense.com/v3/__http://__init__.py__;!!AjveYdw8EvQ!KTM5dte-TboJLS9K0bF7OZrppD8lmjf4Eo7ynTvDKO4FGa0RE8rK6A6Aa3oADXFPaRIkpQ$> > -@@ -1,4 +1,4 @@ > --#!/usr/bin/env python > -+#!/usr/bin/env python3 > - import pip._internal.utils.inject_securetransport # noqa > - from pip._internal.utils.typing import MYPY_CHECK_RUNNING > - > diff --git a/src/pip/_vendor/appdirs.py > <https://urldefense.com/v3/__http://appdirs.py__;!!AjveYdw8EvQ!KTM5dte-TboJLS9K0bF7OZrppD8lmjf4Eo7ynTvDKO4FGa0RE8rK6A6Aa3oADXGIyyzB_A$> > b/src/pip/_vendor/appdirs.py > <https://urldefense.com/v3/__http://appdirs.py__;!!AjveYdw8EvQ!KTM5dte-TboJLS9K0bF7OZrppD8lmjf4Eo7ynTvDKO4FGa0RE8rK6A6Aa3oADXGIyyzB_A$> > -index 3a52b75..ad3f81d 100644 > +index 33a3b7741..60b9ef5f7 100644 > --- a/src/pip/_vendor/appdirs.py > <https://urldefense.com/v3/__http://appdirs.py__;!!AjveYdw8EvQ!KTM5dte-TboJLS9K0bF7OZrppD8lmjf4Eo7ynTvDKO4FGa0RE8rK6A6Aa3oADXGIyyzB_A$> > +++ b/src/pip/_vendor/appdirs.py > <https://urldefense.com/v3/__http://appdirs.py__;!!AjveYdw8EvQ!KTM5dte-TboJLS9K0bF7OZrppD8lmjf4Eo7ynTvDKO4FGa0RE8rK6A6Aa3oADXGIyyzB_A$> > @@ -1,4 +1,4 @@ > @@ -35,18 +33,88 @@ index 3a52b75..ad3f81d 100644 > # -*- coding: utf-8 -*- > # Copyright (c) 2005-2010 ActiveState Software Inc. > # Copyright (c) 2013 Eddy Petrișor > -diff --git a/src/pip/_vendor/chardet/cli/chardetect.py > <https://urldefense.com/v3/__http://chardetect.py__;!!AjveYdw8EvQ!KTM5dte-TboJLS9K0bF7OZrppD8lmjf4Eo7ynTvDKO4FGa0RE8rK6A6Aa3oADXFqJhUBzw$> > b/src/pip/_vendor/chardet/cli/chardetect.py > <https://urldefense.com/v3/__http://chardetect.py__;!!AjveYdw8EvQ!KTM5dte-TboJLS9K0bF7OZrppD8lmjf4Eo7ynTvDKO4FGa0RE8rK6A6Aa3oADXFqJhUBzw$> > -index c61136b..a497e98 100644 > ---- a/src/pip/_vendor/chardet/cli/chardetect.py > <https://urldefense.com/v3/__http://chardetect.py__;!!AjveYdw8EvQ!KTM5dte-TboJLS9K0bF7OZrppD8lmjf4Eo7ynTvDKO4FGa0RE8rK6A6Aa3oADXFqJhUBzw$> > -+++ b/src/pip/_vendor/chardet/cli/chardetect.py > <https://urldefense.com/v3/__http://chardetect.py__;!!AjveYdw8EvQ!KTM5dte-TboJLS9K0bF7OZrppD8lmjf4Eo7ynTvDKO4FGa0RE8rK6A6Aa3oADXFqJhUBzw$> > +diff --git a/src/pip/_vendor/chardet/langbulgarianmodel.py > <https://urldefense.com/v3/__http://langbulgarianmodel.py__;!!AjveYdw8EvQ!KTM5dte-TboJLS9K0bF7OZrppD8lmjf4Eo7ynTvDKO4FGa0RE8rK6A6Aa3oADXEtK07ePQ$> > b/src/pip/_vendor/chardet/langbulgarianmodel.py > <https://urldefense.com/v3/__http://langbulgarianmodel.py__;!!AjveYdw8EvQ!KTM5dte-TboJLS9K0bF7OZrppD8lmjf4Eo7ynTvDKO4FGa0RE8rK6A6Aa3oADXEtK07ePQ$> > +index e963a5097..97ea6cea8 100644 > +--- a/src/pip/_vendor/chardet/langbulgarianmodel.py > <https://urldefense.com/v3/__http://langbulgarianmodel.py__;!!AjveYdw8EvQ!KTM5dte-TboJLS9K0bF7OZrppD8lmjf4Eo7ynTvDKO4FGa0RE8rK6A6Aa3oADXEtK07ePQ$> > ++++ b/src/pip/_vendor/chardet/langbulgarianmodel.py > <https://urldefense.com/v3/__http://langbulgarianmodel.py__;!!AjveYdw8EvQ!KTM5dte-TboJLS9K0bF7OZrppD8lmjf4Eo7ynTvDKO4FGa0RE8rK6A6Aa3oADXEtK07ePQ$> > +@@ -1,4 +1,4 @@ > +-#!/usr/bin/env python > ++#!/usr/bin/env python3 > + # -*- coding: utf-8 -*- > + > + from pip._vendor.chardet.sbcharsetprober import > SingleByteCharSetModel > +diff --git a/src/pip/_vendor/chardet/langgreekmodel.py > <https://urldefense.com/v3/__http://langgreekmodel.py__;!!AjveYdw8EvQ!KTM5dte-TboJLS9K0bF7OZrppD8lmjf4Eo7ynTvDKO4FGa0RE8rK6A6Aa3oADXGyKPuYcQ$> > b/src/pip/_vendor/chardet/langgreekmodel.py > <https://urldefense.com/v3/__http://langgreekmodel.py__;!!AjveYdw8EvQ!KTM5dte-TboJLS9K0bF7OZrppD8lmjf4Eo7ynTvDKO4FGa0RE8rK6A6Aa3oADXGyKPuYcQ$> > +index d99528ede..4a127ea83 100644 > +--- a/src/pip/_vendor/chardet/langgreekmodel.py > <https://urldefense.com/v3/__http://langgreekmodel.py__;!!AjveYdw8EvQ!KTM5dte-TboJLS9K0bF7OZrppD8lmjf4Eo7ynTvDKO4FGa0RE8rK6A6Aa3oADXGyKPuYcQ$> > ++++ b/src/pip/_vendor/chardet/langgreekmodel.py > <https://urldefense.com/v3/__http://langgreekmodel.py__;!!AjveYdw8EvQ!KTM5dte-TboJLS9K0bF7OZrppD8lmjf4Eo7ynTvDKO4FGa0RE8rK6A6Aa3oADXGyKPuYcQ$> > +@@ -1,4 +1,4 @@ > +-#!/usr/bin/env python > ++#!/usr/bin/env python3 > + # -*- coding: utf-8 -*- > + > + from pip._vendor.chardet.sbcharsetprober import > SingleByteCharSetModel > +diff --git a/src/pip/_vendor/chardet/langhebrewmodel.py > <https://urldefense.com/v3/__http://langhebrewmodel.py__;!!AjveYdw8EvQ!KTM5dte-TboJLS9K0bF7OZrppD8lmjf4Eo7ynTvDKO4FGa0RE8rK6A6Aa3oADXFZBNVhRg$> > b/src/pip/_vendor/chardet/langhebrewmodel.py > <https://urldefense.com/v3/__http://langhebrewmodel.py__;!!AjveYdw8EvQ!KTM5dte-TboJLS9K0bF7OZrppD8lmjf4Eo7ynTvDKO4FGa0RE8rK6A6Aa3oADXFZBNVhRg$> > +index 484c652a4..676c1a711 100644 > +--- a/src/pip/_vendor/chardet/langhebrewmodel.py > <https://urldefense.com/v3/__http://langhebrewmodel.py__;!!AjveYdw8EvQ!KTM5dte-TboJLS9K0bF7OZrppD8lmjf4Eo7ynTvDKO4FGa0RE8rK6A6Aa3oADXFZBNVhRg$> > ++++ b/src/pip/_vendor/chardet/langhebrewmodel.py > <https://urldefense.com/v3/__http://langhebrewmodel.py__;!!AjveYdw8EvQ!KTM5dte-TboJLS9K0bF7OZrppD8lmjf4Eo7ynTvDKO4FGa0RE8rK6A6Aa3oADXFZBNVhRg$> > +@@ -1,4 +1,4 @@ > +-#!/usr/bin/env python > ++#!/usr/bin/env python3 > + # -*- coding: utf-8 -*- > + > + from pip._vendor.chardet.sbcharsetprober import > SingleByteCharSetModel > +diff --git a/src/pip/_vendor/chardet/langhungarianmodel.py > <https://urldefense.com/v3/__http://langhungarianmodel.py__;!!AjveYdw8EvQ!KTM5dte-TboJLS9K0bF7OZrppD8lmjf4Eo7ynTvDKO4FGa0RE8rK6A6Aa3oADXEn0q6gyA$> > b/src/pip/_vendor/chardet/langhungarianmodel.py > <https://urldefense.com/v3/__http://langhungarianmodel.py__;!!AjveYdw8EvQ!KTM5dte-TboJLS9K0bF7OZrppD8lmjf4Eo7ynTvDKO4FGa0RE8rK6A6Aa3oADXEn0q6gyA$> > +index bbc5cda64..042eae70a 100644 > +--- a/src/pip/_vendor/chardet/langhungarianmodel.py > <https://urldefense.com/v3/__http://langhungarianmodel.py__;!!AjveYdw8EvQ!KTM5dte-TboJLS9K0bF7OZrppD8lmjf4Eo7ynTvDKO4FGa0RE8rK6A6Aa3oADXEn0q6gyA$> > ++++ b/src/pip/_vendor/chardet/langhungarianmodel.py > <https://urldefense.com/v3/__http://langhungarianmodel.py__;!!AjveYdw8EvQ!KTM5dte-TboJLS9K0bF7OZrppD8lmjf4Eo7ynTvDKO4FGa0RE8rK6A6Aa3oADXEn0q6gyA$> > +@@ -1,4 +1,4 @@ > +-#!/usr/bin/env python > ++#!/usr/bin/env python3 > + # -*- coding: utf-8 -*- > + > + from pip._vendor.chardet.sbcharsetprober import > SingleByteCharSetModel > +diff --git a/src/pip/_vendor/chardet/langrussianmodel.py > <https://urldefense.com/v3/__http://langrussianmodel.py__;!!AjveYdw8EvQ!KTM5dte-TboJLS9K0bF7OZrppD8lmjf4Eo7ynTvDKO4FGa0RE8rK6A6Aa3oADXEJwAnJ7Q$> > b/src/pip/_vendor/chardet/langrussianmodel.py > <https://urldefense.com/v3/__http://langrussianmodel.py__;!!AjveYdw8EvQ!KTM5dte-TboJLS9K0bF7OZrppD8lmjf4Eo7ynTvDKO4FGa0RE8rK6A6Aa3oADXEJwAnJ7Q$> > +index 5594452b5..564b02e58 100644 > +--- a/src/pip/_vendor/chardet/langrussianmodel.py > <https://urldefense.com/v3/__http://langrussianmodel.py__;!!AjveYdw8EvQ!KTM5dte-TboJLS9K0bF7OZrppD8lmjf4Eo7ynTvDKO4FGa0RE8rK6A6Aa3oADXEJwAnJ7Q$> > ++++ b/src/pip/_vendor/chardet/langrussianmodel.py > <https://urldefense.com/v3/__http://langrussianmodel.py__;!!AjveYdw8EvQ!KTM5dte-TboJLS9K0bF7OZrppD8lmjf4Eo7ynTvDKO4FGa0RE8rK6A6Aa3oADXEJwAnJ7Q$> > +@@ -1,4 +1,4 @@ > +-#!/usr/bin/env python > ++#!/usr/bin/env python3 > + # -*- coding: utf-8 -*- > + > + from pip._vendor.chardet.sbcharsetprober import > SingleByteCharSetModel > +diff --git a/src/pip/_vendor/chardet/langthaimodel.py > <https://urldefense.com/v3/__http://langthaimodel.py__;!!AjveYdw8EvQ!KTM5dte-TboJLS9K0bF7OZrppD8lmjf4Eo7ynTvDKO4FGa0RE8rK6A6Aa3oADXFC7vWkYw$> > b/src/pip/_vendor/chardet/langthaimodel.py > <https://urldefense.com/v3/__http://langthaimodel.py__;!!AjveYdw8EvQ!KTM5dte-TboJLS9K0bF7OZrppD8lmjf4Eo7ynTvDKO4FGa0RE8rK6A6Aa3oADXFC7vWkYw$> > +index 9a37db573..c97487959 100644 > +--- a/src/pip/_vendor/chardet/langthaimodel.py > <https://urldefense.com/v3/__http://langthaimodel.py__;!!AjveYdw8EvQ!KTM5dte-TboJLS9K0bF7OZrppD8lmjf4Eo7ynTvDKO4FGa0RE8rK6A6Aa3oADXFC7vWkYw$> > ++++ b/src/pip/_vendor/chardet/langthaimodel.py > <https://urldefense.com/v3/__http://langthaimodel.py__;!!AjveYdw8EvQ!KTM5dte-TboJLS9K0bF7OZrppD8lmjf4Eo7ynTvDKO4FGa0RE8rK6A6Aa3oADXFC7vWkYw$> > +@@ -1,4 +1,4 @@ > +-#!/usr/bin/env python > ++#!/usr/bin/env python3 > + # -*- coding: utf-8 -*- > + > + from pip._vendor.chardet.sbcharsetprober import > SingleByteCharSetModel > +diff --git a/src/pip/_vendor/chardet/langturkishmodel.py > <https://urldefense.com/v3/__http://langturkishmodel.py__;!!AjveYdw8EvQ!KTM5dte-TboJLS9K0bF7OZrppD8lmjf4Eo7ynTvDKO4FGa0RE8rK6A6Aa3oADXHWo0SFzQ$> > b/src/pip/_vendor/chardet/langturkishmodel.py > <https://urldefense.com/v3/__http://langturkishmodel.py__;!!AjveYdw8EvQ!KTM5dte-TboJLS9K0bF7OZrppD8lmjf4Eo7ynTvDKO4FGa0RE8rK6A6Aa3oADXHWo0SFzQ$> > +index 43f4230ae..7e710c371 100644 > +--- a/src/pip/_vendor/chardet/langturkishmodel.py > <https://urldefense.com/v3/__http://langturkishmodel.py__;!!AjveYdw8EvQ!KTM5dte-TboJLS9K0bF7OZrppD8lmjf4Eo7ynTvDKO4FGa0RE8rK6A6Aa3oADXHWo0SFzQ$> > ++++ b/src/pip/_vendor/chardet/langturkishmodel.py > <https://urldefense.com/v3/__http://langturkishmodel.py__;!!AjveYdw8EvQ!KTM5dte-TboJLS9K0bF7OZrppD8lmjf4Eo7ynTvDKO4FGa0RE8rK6A6Aa3oADXHWo0SFzQ$> > +@@ -1,4 +1,4 @@ > +-#!/usr/bin/env python > ++#!/usr/bin/env python3 > + # -*- coding: utf-8 -*- > + > + from pip._vendor.chardet.sbcharsetprober import > SingleByteCharSetModel > +diff --git a/src/pip/_vendor/chardet/metadata/languages.py > <https://urldefense.com/v3/__http://languages.py__;!!AjveYdw8EvQ!KTM5dte-TboJLS9K0bF7OZrppD8lmjf4Eo7ynTvDKO4FGa0RE8rK6A6Aa3oADXGPj_LLsw$> > b/src/pip/_vendor/chardet/metadata/languages.py > <https://urldefense.com/v3/__http://languages.py__;!!AjveYdw8EvQ!KTM5dte-TboJLS9K0bF7OZrppD8lmjf4Eo7ynTvDKO4FGa0RE8rK6A6Aa3oADXGPj_LLsw$> > +index 3237d5abf..aa2ec7c35 100644 > +--- a/src/pip/_vendor/chardet/metadata/languages.py > <https://urldefense.com/v3/__http://languages.py__;!!AjveYdw8EvQ!KTM5dte-TboJLS9K0bF7OZrppD8lmjf4Eo7ynTvDKO4FGa0RE8rK6A6Aa3oADXGPj_LLsw$> > ++++ b/src/pip/_vendor/chardet/metadata/languages.py > <https://urldefense.com/v3/__http://languages.py__;!!AjveYdw8EvQ!KTM5dte-TboJLS9K0bF7OZrppD8lmjf4Eo7ynTvDKO4FGa0RE8rK6A6Aa3oADXGPj_LLsw$> > @@ -1,4 +1,4 @@ > -#!/usr/bin/env python > +#!/usr/bin/env python3 > + # -*- coding: utf-8 -*- > """ > - Script which takes one or more file paths and reports on > their detected > - encodings > + Metadata about languages used by our model training code for our > diff --git a/src/pip/_vendor/requests/certs.py > <https://urldefense.com/v3/__http://certs.py__;!!AjveYdw8EvQ!KTM5dte-TboJLS9K0bF7OZrppD8lmjf4Eo7ynTvDKO4FGa0RE8rK6A6Aa3oADXH2cXPF3A$> > b/src/pip/_vendor/requests/certs.py > <https://urldefense.com/v3/__http://certs.py__;!!AjveYdw8EvQ!KTM5dte-TboJLS9K0bF7OZrppD8lmjf4Eo7ynTvDKO4FGa0RE8rK6A6Aa3oADXH2cXPF3A$> > -index 06a594e..bfa7839 100644 > +index 06a594e58..bfa7839a4 100644 > --- a/src/pip/_vendor/requests/certs.py > <https://urldefense.com/v3/__http://certs.py__;!!AjveYdw8EvQ!KTM5dte-TboJLS9K0bF7OZrppD8lmjf4Eo7ynTvDKO4FGa0RE8rK6A6Aa3oADXH2cXPF3A$> > +++ b/src/pip/_vendor/requests/certs.py > <https://urldefense.com/v3/__http://certs.py__;!!AjveYdw8EvQ!KTM5dte-TboJLS9K0bF7OZrppD8lmjf4Eo7ynTvDKO4FGa0RE8rK6A6Aa3oADXH2cXPF3A$> > @@ -1,4 +1,4 @@ > @@ -56,5 +124,5 @@ index 06a594e..bfa7839 100644 > > """ > -- > -2.24.1 > +2.31.1 > > diff --git > a/meta/recipes-devtools/python/python3-pip_20.0.2.bb > <https://urldefense.com/v3/__http://python3-pip_20.0.2.bb__;!!AjveYdw8EvQ!KTM5dte-TboJLS9K0bF7OZrppD8lmjf4Eo7ynTvDKO4FGa0RE8rK6A6Aa3oADXFLvQTN5g$> > b/meta/recipes-devtools/python/python3-pip_21.1.2.bb > <https://urldefense.com/v3/__http://python3-pip_21.1.2.bb__;!!AjveYdw8EvQ!KTM5dte-TboJLS9K0bF7OZrppD8lmjf4Eo7ynTvDKO4FGa0RE8rK6A6Aa3oADXEfAt_Dfg$> > similarity index 73% > rename from meta/recipes-devtools/python/python3-pip_20.0.2.bb > <https://urldefense.com/v3/__http://python3-pip_20.0.2.bb__;!!AjveYdw8EvQ!KTM5dte-TboJLS9K0bF7OZrppD8lmjf4Eo7ynTvDKO4FGa0RE8rK6A6Aa3oADXFLvQTN5g$> > rename to meta/recipes-devtools/python/python3-pip_21.1.2.bb > <https://urldefense.com/v3/__http://python3-pip_21.1.2.bb__;!!AjveYdw8EvQ!KTM5dte-TboJLS9K0bF7OZrppD8lmjf4Eo7ynTvDKO4FGa0RE8rK6A6Aa3oADXEfAt_Dfg$> > index 99eeea2edf..fd7a145205 100644 > --- a/meta/recipes-devtools/python/python3-pip_20.0.2.bb > <https://urldefense.com/v3/__http://python3-pip_20.0.2.bb__;!!AjveYdw8EvQ!KTM5dte-TboJLS9K0bF7OZrppD8lmjf4Eo7ynTvDKO4FGa0RE8rK6A6Aa3oADXFLvQTN5g$> > +++ b/meta/recipes-devtools/python/python3-pip_21.1.2.bb > <https://urldefense.com/v3/__http://python3-pip_21.1.2.bb__;!!AjveYdw8EvQ!KTM5dte-TboJLS9K0bF7OZrppD8lmjf4Eo7ynTvDKO4FGa0RE8rK6A6Aa3oADXEfAt_Dfg$> > @@ -2,14 +2,14 @@ SUMMARY = "The PyPA recommended tool for > installing Python packages" > HOMEPAGE = "https://pypi.org/project/pip > <https://urldefense.com/v3/__https://pypi.org/project/pip__;!!AjveYdw8EvQ!KTM5dte-TboJLS9K0bF7OZrppD8lmjf4Eo7ynTvDKO4FGa0RE8rK6A6Aa3oADXHB7VK9eg$>" > SECTION = "devel/python" > LICENSE = "MIT" > -LIC_FILES_CHKSUM = > "file://LICENSE.txt;md5=8ba06d529c955048e5ddd7c45459eb2e" > +LIC_FILES_CHKSUM = > "file://LICENSE.txt;md5=c4fa2b50f55649f43060fa04b0919b9b" > > DEPENDS += "python3 python3-setuptools-native" > > SRC_URI += "file://0001-change-shebang-to-python3.patch" > > -SRC_URI[md5sum] = "7d42ba49b809604f0df3d55df1c3fd86" > -SRC_URI[sha256sum] = > "7db0c8ea4c7ea51c8049640e8e6e7fde949de672bfa4949920675563a5a6967f" > +SRC_URI[md5sum] = "a867fd51eacfd5293f5b7e0c2e7867a7" > +SRC_URI[sha256sum] = > "eb5df6b9ab0af50fe1098a52fd439b04730b6e066887ff7497357b9ebd19f79b" > > inherit pypi distutils3 > > -- > 2.31.1 > > > > > > > [-- Attachment #2: Type: text/html, Size: 30038 bytes --] ^ permalink raw reply [flat|nested] 6+ messages in thread
[parent not found: <168AF829ECD17622.26593@lists.openembedded.org>]
* Re: [OE-core][PATCH 1/2] python3-pip: upgrade 20.0.2 -> 21.1.2 [not found] <168AF829ECD17622.26593@lists.openembedded.org> @ 2021-06-22 18:40 ` Trevor Gamblin 0 siblings, 0 replies; 6+ messages in thread From: Trevor Gamblin @ 2021-06-22 18:40 UTC (permalink / raw) To: openembedded-core [-- Attachment #1: Type: text/plain, Size: 9435 bytes --] On 2021-06-22 1:37 p.m., Trevor Gamblin wrote: > 21.1.2 contains a fix for CVE-2021-3572 > (https://github.com/pypa/pip/commit/e46bdda9711392fec0c45c1175bae6db847cb30b) > > The LICENSE.txt signature changed due to an update to the copyright > dates, but the terms are the same. > > Also update 0001-change-shebang-to-python3.patch to cover all files in > pip's src directory, since we need to ensure compatibility. Re-submitting this patch (and not the second one to fix RDEPENDS) because we detected a bug in the inherit/SRC_URI ordering in the recipe file... > > Signed-off-by: Trevor Gamblin <trevor.gamblin@windriver.com> > --- > .../0001-change-shebang-to-python3.patch | 128 ++++++++++++++---- > ...n3-pip_20.0.2.bb => python3-pip_21.1.2.bb} | 6 +- > 2 files changed, 101 insertions(+), 33 deletions(-) > rename meta/recipes-devtools/python/{python3-pip_20.0.2.bb => python3-pip_21.1.2.bb} (73%) > > diff --git a/meta/recipes-devtools/python/python3-pip/0001-change-shebang-to-python3.patch b/meta/recipes-devtools/python/python3-pip/0001-change-shebang-to-python3.patch > index 00cffe169b..0187001168 100644 > --- a/meta/recipes-devtools/python/python3-pip/0001-change-shebang-to-python3.patch > +++ b/meta/recipes-devtools/python/python3-pip/0001-change-shebang-to-python3.patch > @@ -1,32 +1,30 @@ > -From e7a00e9b5104ae2fbcea32a35c85760b77fae7e5 Mon Sep 17 00:00:00 2001 > -From: Changqing Li <changqing.li@windriver.com> > -Date: Thu, 23 Apr 2020 09:42:10 +0000 > +From baa85a4dab2e8d64eb25d1181b6420db25ce919a Mon Sep 17 00:00:00 2001 > +From: Trevor Gamblin <trevor.gamblin@windriver.com> > +Date: Tue, 22 Jun 2021 12:31:46 -0400 > Subject: [PATCH] change shebang to python3 > > -Upstream-Status: Pending > +Upstream-Status: Inappropriate (OE-specific) > > -pip will drop support of python2 from 21.0 > +Despite no longer supporting python2, some files in the pip source refer > +to "python" instead of "python3", so patch them as needed to ensure that > +they correctly reference the python3 binary. > > -Signed-off-by: Changqing Li <changqing.li@windriver.com> > +Signed-off-by: Trevor Gamblin <trevor.gamblin@windriver.com> > --- > - src/pip/_internal/__init__.py | 2 +- > - src/pip/_vendor/appdirs.py | 2 +- > - src/pip/_vendor/chardet/cli/chardetect.py | 2 +- > - src/pip/_vendor/requests/certs.py | 2 +- > - 4 files changed, 4 insertions(+), 4 deletions(-) > + src/pip/_vendor/appdirs.py | 2 +- > + src/pip/_vendor/chardet/langbulgarianmodel.py | 2 +- > + src/pip/_vendor/chardet/langgreekmodel.py | 2 +- > + src/pip/_vendor/chardet/langhebrewmodel.py | 2 +- > + src/pip/_vendor/chardet/langhungarianmodel.py | 2 +- > + src/pip/_vendor/chardet/langrussianmodel.py | 2 +- > + src/pip/_vendor/chardet/langthaimodel.py | 2 +- > + src/pip/_vendor/chardet/langturkishmodel.py | 2 +- > + src/pip/_vendor/chardet/metadata/languages.py | 2 +- > + src/pip/_vendor/requests/certs.py | 2 +- > + 10 files changed, 10 insertions(+), 10 deletions(-) > > -diff --git a/src/pip/_internal/__init__.py b/src/pip/_internal/__init__.py > -index 3aa8a46..e1ad179 100755 > ---- a/src/pip/_internal/__init__.py > -+++ b/src/pip/_internal/__init__.py > -@@ -1,4 +1,4 @@ > --#!/usr/bin/env python > -+#!/usr/bin/env python3 > - import pip._internal.utils.inject_securetransport # noqa > - from pip._internal.utils.typing import MYPY_CHECK_RUNNING > - > diff --git a/src/pip/_vendor/appdirs.py b/src/pip/_vendor/appdirs.py > -index 3a52b75..ad3f81d 100644 > +index 33a3b7741..60b9ef5f7 100644 > --- a/src/pip/_vendor/appdirs.py > +++ b/src/pip/_vendor/appdirs.py > @@ -1,4 +1,4 @@ > @@ -35,18 +33,88 @@ index 3a52b75..ad3f81d 100644 > # -*- coding: utf-8 -*- > # Copyright (c) 2005-2010 ActiveState Software Inc. > # Copyright (c) 2013 Eddy Petrișor > -diff --git a/src/pip/_vendor/chardet/cli/chardetect.py b/src/pip/_vendor/chardet/cli/chardetect.py > -index c61136b..a497e98 100644 > ---- a/src/pip/_vendor/chardet/cli/chardetect.py > -+++ b/src/pip/_vendor/chardet/cli/chardetect.py > +diff --git a/src/pip/_vendor/chardet/langbulgarianmodel.py b/src/pip/_vendor/chardet/langbulgarianmodel.py > +index e963a5097..97ea6cea8 100644 > +--- a/src/pip/_vendor/chardet/langbulgarianmodel.py > ++++ b/src/pip/_vendor/chardet/langbulgarianmodel.py > +@@ -1,4 +1,4 @@ > +-#!/usr/bin/env python > ++#!/usr/bin/env python3 > + # -*- coding: utf-8 -*- > + > + from pip._vendor.chardet.sbcharsetprober import SingleByteCharSetModel > +diff --git a/src/pip/_vendor/chardet/langgreekmodel.py b/src/pip/_vendor/chardet/langgreekmodel.py > +index d99528ede..4a127ea83 100644 > +--- a/src/pip/_vendor/chardet/langgreekmodel.py > ++++ b/src/pip/_vendor/chardet/langgreekmodel.py > +@@ -1,4 +1,4 @@ > +-#!/usr/bin/env python > ++#!/usr/bin/env python3 > + # -*- coding: utf-8 -*- > + > + from pip._vendor.chardet.sbcharsetprober import SingleByteCharSetModel > +diff --git a/src/pip/_vendor/chardet/langhebrewmodel.py b/src/pip/_vendor/chardet/langhebrewmodel.py > +index 484c652a4..676c1a711 100644 > +--- a/src/pip/_vendor/chardet/langhebrewmodel.py > ++++ b/src/pip/_vendor/chardet/langhebrewmodel.py > +@@ -1,4 +1,4 @@ > +-#!/usr/bin/env python > ++#!/usr/bin/env python3 > + # -*- coding: utf-8 -*- > + > + from pip._vendor.chardet.sbcharsetprober import SingleByteCharSetModel > +diff --git a/src/pip/_vendor/chardet/langhungarianmodel.py b/src/pip/_vendor/chardet/langhungarianmodel.py > +index bbc5cda64..042eae70a 100644 > +--- a/src/pip/_vendor/chardet/langhungarianmodel.py > ++++ b/src/pip/_vendor/chardet/langhungarianmodel.py > +@@ -1,4 +1,4 @@ > +-#!/usr/bin/env python > ++#!/usr/bin/env python3 > + # -*- coding: utf-8 -*- > + > + from pip._vendor.chardet.sbcharsetprober import SingleByteCharSetModel > +diff --git a/src/pip/_vendor/chardet/langrussianmodel.py b/src/pip/_vendor/chardet/langrussianmodel.py > +index 5594452b5..564b02e58 100644 > +--- a/src/pip/_vendor/chardet/langrussianmodel.py > ++++ b/src/pip/_vendor/chardet/langrussianmodel.py > +@@ -1,4 +1,4 @@ > +-#!/usr/bin/env python > ++#!/usr/bin/env python3 > + # -*- coding: utf-8 -*- > + > + from pip._vendor.chardet.sbcharsetprober import SingleByteCharSetModel > +diff --git a/src/pip/_vendor/chardet/langthaimodel.py b/src/pip/_vendor/chardet/langthaimodel.py > +index 9a37db573..c97487959 100644 > +--- a/src/pip/_vendor/chardet/langthaimodel.py > ++++ b/src/pip/_vendor/chardet/langthaimodel.py > +@@ -1,4 +1,4 @@ > +-#!/usr/bin/env python > ++#!/usr/bin/env python3 > + # -*- coding: utf-8 -*- > + > + from pip._vendor.chardet.sbcharsetprober import SingleByteCharSetModel > +diff --git a/src/pip/_vendor/chardet/langturkishmodel.py b/src/pip/_vendor/chardet/langturkishmodel.py > +index 43f4230ae..7e710c371 100644 > +--- a/src/pip/_vendor/chardet/langturkishmodel.py > ++++ b/src/pip/_vendor/chardet/langturkishmodel.py > +@@ -1,4 +1,4 @@ > +-#!/usr/bin/env python > ++#!/usr/bin/env python3 > + # -*- coding: utf-8 -*- > + > + from pip._vendor.chardet.sbcharsetprober import SingleByteCharSetModel > +diff --git a/src/pip/_vendor/chardet/metadata/languages.py b/src/pip/_vendor/chardet/metadata/languages.py > +index 3237d5abf..aa2ec7c35 100644 > +--- a/src/pip/_vendor/chardet/metadata/languages.py > ++++ b/src/pip/_vendor/chardet/metadata/languages.py > @@ -1,4 +1,4 @@ > -#!/usr/bin/env python > +#!/usr/bin/env python3 > + # -*- coding: utf-8 -*- > """ > - Script which takes one or more file paths and reports on their detected > - encodings > + Metadata about languages used by our model training code for our > diff --git a/src/pip/_vendor/requests/certs.py b/src/pip/_vendor/requests/certs.py > -index 06a594e..bfa7839 100644 > +index 06a594e58..bfa7839a4 100644 > --- a/src/pip/_vendor/requests/certs.py > +++ b/src/pip/_vendor/requests/certs.py > @@ -1,4 +1,4 @@ > @@ -56,5 +124,5 @@ index 06a594e..bfa7839 100644 > > """ > -- > -2.24.1 > +2.31.1 > > diff --git a/meta/recipes-devtools/python/python3-pip_20.0.2.bb b/meta/recipes-devtools/python/python3-pip_21.1.2.bb > similarity index 73% > rename from meta/recipes-devtools/python/python3-pip_20.0.2.bb > rename to meta/recipes-devtools/python/python3-pip_21.1.2.bb > index 99eeea2edf..fd7a145205 100644 > --- a/meta/recipes-devtools/python/python3-pip_20.0.2.bb > +++ b/meta/recipes-devtools/python/python3-pip_21.1.2.bb > @@ -2,14 +2,14 @@ SUMMARY = "The PyPA recommended tool for installing Python packages" > HOMEPAGE = "https://pypi.org/project/pip" > SECTION = "devel/python" > LICENSE = "MIT" > -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=8ba06d529c955048e5ddd7c45459eb2e" > +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=c4fa2b50f55649f43060fa04b0919b9b" > > DEPENDS += "python3 python3-setuptools-native" > > SRC_URI += "file://0001-change-shebang-to-python3.patch" > > -SRC_URI[md5sum] = "7d42ba49b809604f0df3d55df1c3fd86" > -SRC_URI[sha256sum] = "7db0c8ea4c7ea51c8049640e8e6e7fde949de672bfa4949920675563a5a6967f" > +SRC_URI[md5sum] = "a867fd51eacfd5293f5b7e0c2e7867a7" > +SRC_URI[sha256sum] = "eb5df6b9ab0af50fe1098a52fd439b04730b6e066887ff7497357b9ebd19f79b" > > inherit pypi distutils3 > > > > [-- Attachment #2: Type: text/html, Size: 10731 bytes --] ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2021-06-22 20:27 UTC | newest] Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2021-06-22 17:37 [OE-core][PATCH 1/2] python3-pip: upgrade 20.0.2 -> 21.1.2 Trevor Gamblin 2021-06-22 17:37 ` [OE-core][PATCH 2/2] python3-pip: add multiprocessing to RDEPENDS Trevor Gamblin 2021-06-22 18:43 ` [OE-core][PATCH 1/2] python3-pip: upgrade 20.0.2 -> 21.1.2 Alexander Kanavin [not found] ` <168AFBC4AA915097.26331@lists.openembedded.org> 2021-06-22 18:47 ` Alexander Kanavin 2021-06-22 20:27 ` Trevor Gamblin [not found] <168AF829ECD17622.26593@lists.openembedded.org> 2021-06-22 18:40 ` Trevor Gamblin
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.