Skip to contentSkip to conversation

python3-cryptography: merge bb and inc

PATCH In review Tim Orling 2 participants 3 messages Apr 26, 2020 – Apr 27, 2020

lore
Share & tools
lore

Tim Orling

author
#0 lore raw

PATCH 1/2 python3-cryptography: merge bb and inc

From: Tim Orling <[email protected]>

Drop python-cryptography/ not used anywhere.

---
 .../python/python-cryptography.inc            | 58 ------------------
 .../python/python-cryptography/run-ptest      |  2 -
 .../python/python3-cryptography_2.8.bb        | 61 ++++++++++++++++++-
 3 files changed, 59 insertions(+), 62 deletions(-)
 delete mode 100644 meta-python/recipes-devtools/python/python-cryptography.inc
 delete mode 100644 meta-python/recipes-devtools/python/python-cryptography/run-ptest
meta-python/recipes-devtools/python/python-cryptography.inc deleted +0 -58
deleted file mode 100644
index 5acd02d67d..0000000000
@@ -1,58 +0,0 @@
-SUMMARY = "Provides cryptographic recipes and primitives to python developers"
-HOMEPAGE = "https://cryptography.io/"
-LICENSE = "Apache-2.0 | BSD"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=097f805837700cfac572ac274cd38124"
-
-LDSHARED += "-pthread"
-
-DEPENDS += " \
-    ${PYTHON_PN}-cffi \
-    ${PYTHON_PN}-cffi-native \
-    ${PYTHON_PN}-asn1crypto \
-    ${PYTHON_PN}-six \
-"
-
-SRC_URI[md5sum] = "77730058b556c6d9838679a94c6229ce"
-SRC_URI[sha256sum] = "3cda1f0ed8747339bbdf71b9f38ca74c7b592f24f65cdb3ab3765e4b02871651"
-
-RDEPENDS_${PN} += " \
-    ${PYTHON_PN}-cffi \
-    ${PYTHON_PN}-idna \
-    ${PYTHON_PN}-asn1crypto \
-    ${PYTHON_PN}-setuptools \
-    ${PYTHON_PN}-six \
-"
-
-RDEPENDS_${PN}_class-target += " \
-    ${PYTHON_PN}-cffi \
-    ${PYTHON_PN}-idna \
-    ${PYTHON_PN}-numbers \
-    ${PYTHON_PN}-asn1crypto \
-    ${PYTHON_PN}-setuptools \
-    ${PYTHON_PN}-six \
-    ${PYTHON_PN}-threading \
-"
-
-RDEPENDS_${PN}-ptest += " \
-    ${PN} \
-    ${PYTHON_PN}-cryptography-vectors \
-    ${PYTHON_PN}-iso8601 \
-    ${PYTHON_PN}-pretend \
-    ${PYTHON_PN}-pytest \
-    ${PYTHON_PN}-pytz \
-"
-
-inherit ptest
-
-do_install_ptest() {
-    install -d ${D}${PTEST_PATH}/tests
-    cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/
-    install -d ${D}${PTEST_PATH}/tests/hazmat
-    cp -rf ${S}/tests/hazmat/* ${D}${PTEST_PATH}/tests/hazmat/
-}
-
-FILES_${PN}-dbg += " \
-    ${libdir}/${PYTHON_PN}2.7/site-packages/${SRCNAME}/hazmat/bindings/.debug \
-"
-
-BBCLASSEXTEND = "native nativesdk"
meta-python/recipes-devtools/python/python-cryptography/run-ptest deleted +0 -2
deleted file mode 100644
index 0ba239c2a4..0000000000
@@ -1,2 +0,0 @@
-#!/bin/sh
-py.test
meta-python/recipes-devtools/python/python3-cryptography_2.8.bb +59 -2

67 lines not on this page · raw message

Signature · 1 line
2.25.0
author
#1 lore raw

PATCH 2/2 python3-cryptography-vectors: merge bb and inc

From: Tim Orling <[email protected]>

---
 .../python/python-cryptography-vectors.inc    | 18 ----------------
 .../python3-cryptography-vectors_2.8.bb       | 21 ++++++++++++++++++-
 2 files changed, 20 insertions(+), 19 deletions(-)
 delete mode 100644 meta-python/recipes-devtools/python/python-cryptography-vectors.inc
meta-python/recipes-devtools/python/python-cryptography-vectors.inc deleted +0 -18
deleted file mode 100644
index 10af48c9fb..0000000000
@@ -1,18 +0,0 @@
-SUMMARY = "Test vectors for the cryptography package."
-HOMEPAGE = "https://cryptography.io/"
-SECTION = "devel/python"
-LICENSE = "Apache-2.0 | BSD"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=8c3617db4fb6fae01f1d253ab91511e4"
-
-DEPENDS += " \
-    ${PYTHON_PN}-cryptography \
-"
-
-SRC_URI[md5sum] = "a744ed29bb9ef56b3a50317fea3b218e"
-SRC_URI[sha256sum] = "6cd32174c56a3eca72f64af43c1daacaae758cfa5ff9d280dfcf818fa11ef116"
-
-PYPI_PACKAGE = "cryptography_vectors"
-
-BBCLASSEXTEND = "native nativesdk"
-
-UPSTREAM_CHECK_REGEX = ""
meta-python/recipes-devtools/python/python3-cryptography-vectors_2.8.bb +20 -1
index 58994ffffa..49a5664dcd 100644
@@ -1,2 +1,21 @@
-inherit pypi setuptools3
 require python-cryptography-vectors.inc
+SUMMARY = "Test vectors for the cryptography package."
+HOMEPAGE = "https://cryptography.io/"
+SECTION = "devel/python"
+LICENSE = "Apache-2.0 | BSD"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=8c3617db4fb6fae01f1d253ab91511e4"
+
+SRC_URI[md5sum] = "a744ed29bb9ef56b3a50317fea3b218e"
+SRC_URI[sha256sum] = "6cd32174c56a3eca72f64af43c1daacaae758cfa5ff9d280dfcf818fa11ef116"
+
+PYPI_PACKAGE = "cryptography_vectors"
+
+inherit pypi setuptools3
+
+DEPENDS += " \
+    ${PYTHON_PN}-cryptography \
+"
+
+BBCLASSEXTEND = "native nativesdk"
+
+UPSTREAM_CHECK_REGEX = ""
Signature · 1 line
2.25.0
#2 lore raw

Re: [oe] [meta-python][PATCH 2/2] python3-cryptography-vectors: merge bb and inc

Quoted 38 lines · Tim Orling

From: Tim Orling <[email protected]>

---
 .../python/python-cryptography-vectors.inc    | 18 ----------------
 .../python3-cryptography-vectors_2.8.bb       | 21 ++++++++++++++++++-
 2 files changed, 20 insertions(+), 19 deletions(-)
 delete mode 100644 meta-python/recipes-devtools/python/python-cryptography-vectors.inc
meta-python/recipes-devtools/python/python-cryptography-vectors.inc deleted +0 -18
deleted file mode 100644
index 10af48c9fb..0000000000
@@ -1,18 +0,0 @@
-SUMMARY = "Test vectors for the cryptography package."
-HOMEPAGE = "https://cryptography.io/"
-SECTION = "devel/python"
-LICENSE = "Apache-2.0 | BSD"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=8c3617db4fb6fae01f1d253ab91511e4"
-
-DEPENDS += " \
-    ${PYTHON_PN}-cryptography \
-"
-
-SRC_URI[md5sum] = "a744ed29bb9ef56b3a50317fea3b218e"
-SRC_URI[sha256sum] = "6cd32174c56a3eca72f64af43c1daacaae758cfa5ff9d280dfcf818fa11ef116"
-
-PYPI_PACKAGE = "cryptography_vectors"
-
-BBCLASSEXTEND = "native nativesdk"
-
-UPSTREAM_CHECK_REGEX = ""
meta-python/recipes-devtools/python/python3-cryptography-vectors_2.8.bb +0 -0
index 58994ffffa..49a5664dcd 100644

meta-python/recipes-devtools/python/python3-cryptography-vectors_2.8.bb line 1

Quoted 2 lines
meta-python/recipes-devtools/python/python3-cryptography-vectors_2.8.bb +0 -1
@@ -1,2 +1,21 @@
-inherit pypi setuptools3
 require python-cryptography-vectors.inc

this require is no longer needed after merging the inc. I have fixed it locally this time.

Quoted 24 lines
meta-python/recipes-devtools/python/python3-cryptography-vectors_2.8.bb +20 -0
+SUMMARY = "Test vectors for the cryptography package."
+HOMEPAGE = "https://cryptography.io/"
+SECTION = "devel/python"
+LICENSE = "Apache-2.0 | BSD"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=8c3617db4fb6fae01f1d253ab91511e4"
+
+SRC_URI[md5sum] = "a744ed29bb9ef56b3a50317fea3b218e"
+SRC_URI[sha256sum] = "6cd32174c56a3eca72f64af43c1daacaae758cfa5ff9d280dfcf818fa11ef116"
+
+PYPI_PACKAGE = "cryptography_vectors"
+
+inherit pypi setuptools3
+
+DEPENDS += " \
+    ${PYTHON_PN}-cryptography \
+"
+
+BBCLASSEXTEND = "native nativesdk"
+
+UPSTREAM_CHECK_REGEX = ""