[meta-python] python3-cryptography: Upgrade 3.3.1 -> 3.4.6

Submitted by Leon Anavi on April 1, 2021, 12:33 p.m. | Patch ID: 179539

Details

Message ID 20210401123310.566-1-leon.anavi@konsulko.com
State Master Next
Commit 78b0465abd26e2e6163d671afe649334c9b00336
Headers show

Commit Message

Leon Anavi April 1, 2021, 12:33 p.m.
Upgrade to release 3.4.6:

- Updated Windows, macOS, and manylinux wheels to be compiled
  with OpenSSL 1.1.1j.

New versions of python3-cryptography depend on Rust. Temporary,
the environment variable CRYPTOGRAPHY_DONT_BUILD_RUST has been set
to disable Rust and to avoid dependency on addional layers such
as meta-rust. Hopefully, in long-term with the introduction of
Rust recipes in newer Yocto releases this will be fixed.

Signed-off-by: Leon Anavi <leon.anavi@konsulko.com>
---
 .../python/python3-cryptography/h-test.patch  | 23 ++++++++++++++++---
 ...3.3.1.bb => python3-cryptography_3.4.6.bb} |  7 +++++-
 2 files changed, 26 insertions(+), 4 deletions(-)
 rename meta-python/recipes-devtools/python/{python3-cryptography_3.3.1.bb => python3-cryptography_3.4.6.bb} (84%)

Patch hide | download patch | download mbox

diff --git a/meta-python/recipes-devtools/python/python3-cryptography/h-test.patch b/meta-python/recipes-devtools/python/python3-cryptography/h-test.patch
index 9f07c7380..0f257a5ed 100644
--- a/meta-python/recipes-devtools/python/python3-cryptography/h-test.patch
+++ b/meta-python/recipes-devtools/python/python3-cryptography/h-test.patch
@@ -1,10 +1,27 @@ 
+From 0707dc0701ea265cbf979d4a10457b29721bcaf7 Mon Sep 17 00:00:00 2001
+From: Leon Anavi <leon.anavi@konsulko.com>
+Date: Fri, 26 Feb 2021 12:58:22 +0200
+Subject: [PATCH] tests/hypothesis/__init__.py: Import pytest
+
+Import pytest.
+
+Signed-off-by: Leon Anavi <leon.anavi@konsulko.com>
+---
+ tests/hypothesis/__init__.py | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/tests/hypothesis/__init__.py b/tests/hypothesis/__init__.py
+index b5093362..d4c9b80b 100644
 --- a/tests/hypothesis/__init__.py
 +++ b/tests/hypothesis/__init__.py
-@@ -3,3 +3,7 @@
+@@ -1,3 +1,7 @@
+ # This file is dual licensed under the terms of the Apache License, Version
+ # 2.0, and the BSD License. See the LICENSE file in the root of this repository
  # for complete details.
- 
- from __future__ import absolute_import, division, print_function
 +
 +import pytest
 +hypothesis = pytest.importorskip("hypothesis")
 +
+-- 
+2.17.1
+
diff --git a/meta-python/recipes-devtools/python/python3-cryptography_3.3.1.bb b/meta-python/recipes-devtools/python/python3-cryptography_3.4.6.bb
similarity index 84%
rename from meta-python/recipes-devtools/python/python3-cryptography_3.3.1.bb
rename to meta-python/recipes-devtools/python/python3-cryptography_3.4.6.bb
index 79a7ac1bf..3978952ed 100644
--- a/meta-python/recipes-devtools/python/python3-cryptography_3.3.1.bb
+++ b/meta-python/recipes-devtools/python/python3-cryptography_3.4.6.bb
@@ -6,7 +6,7 @@  LIC_FILES_CHKSUM = "file://LICENSE;md5=bf405a8056a6647e7d077b0e7bc36aba"
 
 LDSHARED += "-pthread"
 
-SRC_URI[sha256sum] = "7e177e4bea2de937a584b13645cab32f25e3d96fc0bc4a4cf99c27dc77682be6"
+SRC_URI[sha256sum] = "2d32223e5b0ee02943f32b19245b61a62db83a882f0e76cc564e1cec60d48f87"
 
 SRC_URI += " \
     file://run-ptest \
@@ -15,11 +15,16 @@  SRC_URI += " \
 
 inherit pypi setuptools3
 
+# Set the environment variable to disable Rust
+export CRYPTOGRAPHY_DONT_BUILD_RUST="1"
+
 DEPENDS += " \
     ${PYTHON_PN}-cffi \
     ${PYTHON_PN}-cffi-native \
     ${PYTHON_PN}-asn1crypto \
     ${PYTHON_PN}-six \
+    ${PYTHON_PN}-semantic-version-native \
+    ${PYTHON_PN}-setuptools-rust-native \
 "
 
 RDEPENDS_${PN} += " \

Comments

Khem Raj April 1, 2021, 10:19 p.m.
it seems to be causing

00:02:15.567 ERROR: Nothing PROVIDES 'python3-setuptools-rust-native'
(but /mnt/jenkins/workspace/yocto-world-glibc/sources/meta-openembedded/meta-python/recipes-devtools/python/python3-cryptography_3.4.6.bb
DEPENDS on or otherwise requires it). Close matches:
00:02:15.567   python3-setuptools-native
00:02:15.567   python3-setuptools-scm
00:02:15.567   python3-setuptools-scm-native
00:02:16.009 ERROR: Nothing RPROVIDES 'python3-pyopenssl' (but
/mnt/jenkins/workspace/yocto-world-glibc/sources/meta-openembedded/meta-python/recipes-devtools/python/python3-autobahn_21.3.1.bb,
/mnt/jenkins/workspace/yocto-world-glibc/sources/meta-openembedded/meta-python/recipes-devtools/python/python3-urllib3_1.26.4.bb,
/mnt/jenkins/workspace/yocto-world-glibc/sources/meta-openembedded/meta-python/recipes-devtools/python/python3-pyopenssl_20.0.1.bb,
/mnt/jenkins/workspace/yocto-world-glibc/sources/meta-openembedded/meta-python/recipes-devtools/python/python3-requests_2.25.1.bb,
/mnt/jenkins/workspace/yocto-world-glibc/sources/meta-openembedded/meta-python/recipes-devtools/python/python3-ndg-httpsclient_0.5.1.bb
RDEPENDS on or otherwise requires it)

On Thu, Apr 1, 2021 at 5:33 AM Leon Anavi <leon.anavi@konsulko.com> wrote:
>
> Upgrade to release 3.4.6:
>
> - Updated Windows, macOS, and manylinux wheels to be compiled
>   with OpenSSL 1.1.1j.
>
> New versions of python3-cryptography depend on Rust. Temporary,
> the environment variable CRYPTOGRAPHY_DONT_BUILD_RUST has been set
> to disable Rust and to avoid dependency on addional layers such
> as meta-rust. Hopefully, in long-term with the introduction of
> Rust recipes in newer Yocto releases this will be fixed.
>
> Signed-off-by: Leon Anavi <leon.anavi@konsulko.com>
> ---
>  .../python/python3-cryptography/h-test.patch  | 23 ++++++++++++++++---
>  ...3.3.1.bb => python3-cryptography_3.4.6.bb} |  7 +++++-
>  2 files changed, 26 insertions(+), 4 deletions(-)
>  rename meta-python/recipes-devtools/python/{python3-cryptography_3.3.1.bb => python3-cryptography_3.4.6.bb} (84%)
>
> diff --git a/meta-python/recipes-devtools/python/python3-cryptography/h-test.patch b/meta-python/recipes-devtools/python/python3-cryptography/h-test.patch
> index 9f07c7380..0f257a5ed 100644
> --- a/meta-python/recipes-devtools/python/python3-cryptography/h-test.patch
> +++ b/meta-python/recipes-devtools/python/python3-cryptography/h-test.patch
> @@ -1,10 +1,27 @@
> +From 0707dc0701ea265cbf979d4a10457b29721bcaf7 Mon Sep 17 00:00:00 2001
> +From: Leon Anavi <leon.anavi@konsulko.com>
> +Date: Fri, 26 Feb 2021 12:58:22 +0200
> +Subject: [PATCH] tests/hypothesis/__init__.py: Import pytest
> +
> +Import pytest.
> +
> +Signed-off-by: Leon Anavi <leon.anavi@konsulko.com>
> +---
> + tests/hypothesis/__init__.py | 4 ++++
> + 1 file changed, 4 insertions(+)
> +
> +diff --git a/tests/hypothesis/__init__.py b/tests/hypothesis/__init__.py
> +index b5093362..d4c9b80b 100644
>  --- a/tests/hypothesis/__init__.py
>  +++ b/tests/hypothesis/__init__.py
> -@@ -3,3 +3,7 @@
> +@@ -1,3 +1,7 @@
> + # This file is dual licensed under the terms of the Apache License, Version
> + # 2.0, and the BSD License. See the LICENSE file in the root of this repository
>   # for complete details.
> -
> - from __future__ import absolute_import, division, print_function
>  +
>  +import pytest
>  +hypothesis = pytest.importorskip("hypothesis")
>  +
> +--
> +2.17.1
> +
> diff --git a/meta-python/recipes-devtools/python/python3-cryptography_3.3.1.bb b/meta-python/recipes-devtools/python/python3-cryptography_3.4.6.bb
> similarity index 84%
> rename from meta-python/recipes-devtools/python/python3-cryptography_3.3.1.bb
> rename to meta-python/recipes-devtools/python/python3-cryptography_3.4.6.bb
> index 79a7ac1bf..3978952ed 100644
> --- a/meta-python/recipes-devtools/python/python3-cryptography_3.3.1.bb
> +++ b/meta-python/recipes-devtools/python/python3-cryptography_3.4.6.bb
> @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=bf405a8056a6647e7d077b0e7bc36aba"
>
>  LDSHARED += "-pthread"
>
> -SRC_URI[sha256sum] = "7e177e4bea2de937a584b13645cab32f25e3d96fc0bc4a4cf99c27dc77682be6"
> +SRC_URI[sha256sum] = "2d32223e5b0ee02943f32b19245b61a62db83a882f0e76cc564e1cec60d48f87"
>
>  SRC_URI += " \
>      file://run-ptest \
> @@ -15,11 +15,16 @@ SRC_URI += " \
>
>  inherit pypi setuptools3
>
> +# Set the environment variable to disable Rust
> +export CRYPTOGRAPHY_DONT_BUILD_RUST="1"
> +
>  DEPENDS += " \
>      ${PYTHON_PN}-cffi \
>      ${PYTHON_PN}-cffi-native \
>      ${PYTHON_PN}-asn1crypto \
>      ${PYTHON_PN}-six \
> +    ${PYTHON_PN}-semantic-version-native \
> +    ${PYTHON_PN}-setuptools-rust-native \
>  "
>
>  RDEPENDS_${PN} += " \
> --
> 2.17.1
>
>
> 
>
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#90501): https://lists.openembedded.org/g/openembedded-devel/message/90501
Mute This Topic: https://lists.openembedded.org/mt/81775044/3617530
Group Owner: openembedded-devel+owner@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [oe-patchwork@oe-patch.openembedded.org]
-=-=-=-=-=-=-=-=-=-=-=-
Leon Anavi April 2, 2021, 11:47 a.m.
Hi Khem,

Thank you for the feedback. I forgot I have the recipe for this 
dependency only locally. I've just submitted it for a review at 
openembedded-core mailing list:

https://lists.openembedded.org/g/openembedded-core/topic/meta_oe_patch/81800474?p=,,,20,0,0,0::recentpostdate%2Fsticky,,,20,2,0,81800474

Thanks,
Leon

On 2.04.21 г. 1:19, Khem Raj wrote:
> it seems to be causing
>
> 00:02:15.567 ERROR: Nothing PROVIDES 'python3-setuptools-rust-native'
> (but /mnt/jenkins/workspace/yocto-world-glibc/sources/meta-openembedded/meta-python/recipes-devtools/python/python3-cryptography_3.4.6.bb
> DEPENDS on or otherwise requires it). Close matches:
> 00:02:15.567   python3-setuptools-native
> 00:02:15.567   python3-setuptools-scm
> 00:02:15.567   python3-setuptools-scm-native
> 00:02:16.009 ERROR: Nothing RPROVIDES 'python3-pyopenssl' (but
> /mnt/jenkins/workspace/yocto-world-glibc/sources/meta-openembedded/meta-python/recipes-devtools/python/python3-autobahn_21.3.1.bb,
> /mnt/jenkins/workspace/yocto-world-glibc/sources/meta-openembedded/meta-python/recipes-devtools/python/python3-urllib3_1.26.4.bb,
> /mnt/jenkins/workspace/yocto-world-glibc/sources/meta-openembedded/meta-python/recipes-devtools/python/python3-pyopenssl_20.0.1.bb,
> /mnt/jenkins/workspace/yocto-world-glibc/sources/meta-openembedded/meta-python/recipes-devtools/python/python3-requests_2.25.1.bb,
> /mnt/jenkins/workspace/yocto-world-glibc/sources/meta-openembedded/meta-python/recipes-devtools/python/python3-ndg-httpsclient_0.5.1.bb
> RDEPENDS on or otherwise requires it)
>
> On Thu, Apr 1, 2021 at 5:33 AM Leon Anavi <leon.anavi@konsulko.com> wrote:
>> Upgrade to release 3.4.6:
>>
>> - Updated Windows, macOS, and manylinux wheels to be compiled
>>    with OpenSSL 1.1.1j.
>>
>> New versions of python3-cryptography depend on Rust. Temporary,
>> the environment variable CRYPTOGRAPHY_DONT_BUILD_RUST has been set
>> to disable Rust and to avoid dependency on addional layers such
>> as meta-rust. Hopefully, in long-term with the introduction of
>> Rust recipes in newer Yocto releases this will be fixed.
>>
>> Signed-off-by: Leon Anavi <leon.anavi@konsulko.com>
>> ---
>>   .../python/python3-cryptography/h-test.patch  | 23 ++++++++++++++++---
>>   ...3.3.1.bb => python3-cryptography_3.4.6.bb} |  7 +++++-
>>   2 files changed, 26 insertions(+), 4 deletions(-)
>>   rename meta-python/recipes-devtools/python/{python3-cryptography_3.3.1.bb => python3-cryptography_3.4.6.bb} (84%)
>>
>> diff --git a/meta-python/recipes-devtools/python/python3-cryptography/h-test.patch b/meta-python/recipes-devtools/python/python3-cryptography/h-test.patch
>> index 9f07c7380..0f257a5ed 100644
>> --- a/meta-python/recipes-devtools/python/python3-cryptography/h-test.patch
>> +++ b/meta-python/recipes-devtools/python/python3-cryptography/h-test.patch
>> @@ -1,10 +1,27 @@
>> +From 0707dc0701ea265cbf979d4a10457b29721bcaf7 Mon Sep 17 00:00:00 2001
>> +From: Leon Anavi <leon.anavi@konsulko.com>
>> +Date: Fri, 26 Feb 2021 12:58:22 +0200
>> +Subject: [PATCH] tests/hypothesis/__init__.py: Import pytest
>> +
>> +Import pytest.
>> +
>> +Signed-off-by: Leon Anavi <leon.anavi@konsulko.com>
>> +---
>> + tests/hypothesis/__init__.py | 4 ++++
>> + 1 file changed, 4 insertions(+)
>> +
>> +diff --git a/tests/hypothesis/__init__.py b/tests/hypothesis/__init__.py
>> +index b5093362..d4c9b80b 100644
>>   --- a/tests/hypothesis/__init__.py
>>   +++ b/tests/hypothesis/__init__.py
>> -@@ -3,3 +3,7 @@
>> +@@ -1,3 +1,7 @@
>> + # This file is dual licensed under the terms of the Apache License, Version
>> + # 2.0, and the BSD License. See the LICENSE file in the root of this repository
>>    # for complete details.
>> -
>> - from __future__ import absolute_import, division, print_function
>>   +
>>   +import pytest
>>   +hypothesis = pytest.importorskip("hypothesis")
>>   +
>> +--
>> +2.17.1
>> +
>> diff --git a/meta-python/recipes-devtools/python/python3-cryptography_3.3.1.bb b/meta-python/recipes-devtools/python/python3-cryptography_3.4.6.bb
>> similarity index 84%
>> rename from meta-python/recipes-devtools/python/python3-cryptography_3.3.1.bb
>> rename to meta-python/recipes-devtools/python/python3-cryptography_3.4.6.bb
>> index 79a7ac1bf..3978952ed 100644
>> --- a/meta-python/recipes-devtools/python/python3-cryptography_3.3.1.bb
>> +++ b/meta-python/recipes-devtools/python/python3-cryptography_3.4.6.bb
>> @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=bf405a8056a6647e7d077b0e7bc36aba"
>>
>>   LDSHARED += "-pthread"
>>
>> -SRC_URI[sha256sum] = "7e177e4bea2de937a584b13645cab32f25e3d96fc0bc4a4cf99c27dc77682be6"
>> +SRC_URI[sha256sum] = "2d32223e5b0ee02943f32b19245b61a62db83a882f0e76cc564e1cec60d48f87"
>>
>>   SRC_URI += " \
>>       file://run-ptest \
>> @@ -15,11 +15,16 @@ SRC_URI += " \
>>
>>   inherit pypi setuptools3
>>
>> +# Set the environment variable to disable Rust
>> +export CRYPTOGRAPHY_DONT_BUILD_RUST="1"
>> +
>>   DEPENDS += " \
>>       ${PYTHON_PN}-cffi \
>>       ${PYTHON_PN}-cffi-native \
>>       ${PYTHON_PN}-asn1crypto \
>>       ${PYTHON_PN}-six \
>> +    ${PYTHON_PN}-semantic-version-native \
>> +    ${PYTHON_PN}-setuptools-rust-native \
>>   "
>>
>>   RDEPENDS_${PN} += " \
>> --
>> 2.17.1
>>
>>
>> 
>>