Skip to contentSkip to conversation

python-pytest-helpers-namespace: consolidate inc and bb files into a single bb file

PATCH New Derek Straka 1 participant 5 messages Apr 4, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/5 python-pytest-helpers-namespace: consolidate inc and bb files into a single bb file

---
 .../python/python-pytest-helpers-namespace.inc    | 10 ----------
 .../python3-pytest-helpers-namespace_2019.1.8.bb  | 15 +++++++++++----
 2 files changed, 11 insertions(+), 14 deletions(-)
 delete mode 100644 meta-python/recipes-devtools/python/python-pytest-helpers-namespace.inc
meta-python/recipes-devtools/python/python-pytest-helpers-namespace.inc deleted +0 -10
deleted file mode 100644
index c091ab9768..0000000000
@@ -1,10 +0,0 @@
-DESCRIPTION = "This plugin does not provide any helpers to pytest, it does, however, provide a helpers namespace in pytest which enables you to register helper functions in your conftest.py to be used within your tests without having to import them."
-HOMEPAGE = "https://github.com/saltstack/pytest-helpers-namespace"
-SECTION = "devel/python"
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://PKG-INFO;md5=cc99508c43d9d14fd51c7fac622ffd23"
-
-SRC_URI[md5sum] = "04ec1d8750f9b154e782a47cf8b30736"
-SRC_URI[sha256sum] = "4eff23a19f92410c0166f6dffbfa8901d3e14a80e97d70cd08428b6d597771ce"
-
-inherit pypi
meta-python/recipes-devtools/python/python3-pytest-helpers-namespace_2019.1.8.bb +11 -4
index f03f5d415f..b3aced4f68 100644
@@ -1,7 +1,14 @@
-require python-pytest-helpers-namespace.inc
+DESCRIPTION = "This plugin does not provide any helpers to pytest, it does, however, provide a helpers namespace in pytest which enables you to register helper functions in your conftest.py to be used within your tests without having to import them."
+HOMEPAGE = "https://github.com/saltstack/pytest-helpers-namespace"
+SECTION = "devel/python"
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://PKG-INFO;md5=cc99508c43d9d14fd51c7fac622ffd23"
 
-inherit setuptools3
+SRC_URI[md5sum] = "04ec1d8750f9b154e782a47cf8b30736"
+SRC_URI[sha256sum] = "4eff23a19f92410c0166f6dffbfa8901d3e14a80e97d70cd08428b6d597771ce"
+
+inherit pypi setuptools3
 
 RDEPENDS_${PN} += " \
-    python3-pytest \
-    "
+    ${PYTHON_PN}-pytest \
+"
Signature · 1 line
2.17.1
#1 lore raw

PATCH 2/5 python-pytest-asyncio: consolidate inc and bb files into a single bb file

---
 .../python/python-pytest-asyncio.inc              | 13 -------------
 .../python/python3-pytest-asyncio_0.10.0.bb       | 15 +++++++++++++--
 2 files changed, 13 insertions(+), 15 deletions(-)
 delete mode 100644 meta-python/recipes-devtools/python/python-pytest-asyncio.inc
meta-python/recipes-devtools/python/python-pytest-asyncio.inc deleted +0 -13
deleted file mode 100644
index 9132c7452c..0000000000
@@ -1,13 +0,0 @@
-DESCRIPTION = "pytest-asyncio is an Apache2 licensed library, written in Python, for testing asyncio code with pytest"
-HOMEPAGE = "https://github.com/pytest-dev/pytest-asyncio"
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://README.rst;md5=ae62268d207c73b615fbefddaf91a881"
-
-SRC_URI[md5sum] = "247a7ec32f24a185341327c42a0f85bf"
-SRC_URI[sha256sum] = "9fac5100fd716cbecf6ef89233e8590a4ad61d729d1732e0a96b84182df1daaf"
-
-inherit pypi
-
-DEPENDS += "${PYTHON_PN}-pytest-native"
-
-BBCLASSEXTEND = "native"
meta-python/recipes-devtools/python/python3-pytest-asyncio_0.10.0.bb +13 -2
index 09f26f8d15..a7e963b044 100644
@@ -1,2 +1,13 @@
-inherit setuptools3
-require python-pytest-asyncio.inc
+DESCRIPTION = "pytest-asyncio is an Apache2 licensed library, written in Python, for testing asyncio code with pytest"
+HOMEPAGE = "https://github.com/pytest-dev/pytest-asyncio"
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://README.rst;md5=ae62268d207c73b615fbefddaf91a881"
+
+SRC_URI[md5sum] = "247a7ec32f24a185341327c42a0f85bf"
+SRC_URI[sha256sum] = "9fac5100fd716cbecf6ef89233e8590a4ad61d729d1732e0a96b84182df1daaf"
+
+inherit pypi setuptools3
+
+DEPENDS += "${PYTHON_PN}-pytest-native"
+
+BBCLASSEXTEND = "native"
Signature · 1 line
2.17.1
#2 lore raw

PATCH 3/5 python-pystache: consolidate inc and bb files into a single bb file

In reply to Derek Straka
---
 .../python/{python-pystache.inc => python3-pystache_0.5.4.bb}   | 2 ++
 1 file changed, 2 insertions(+)
 rename meta-python/recipes-devtools/python/{python-pystache.inc => python3-pystache_0.5.4.bb} (94%)
meta-python/recipes-devtools/python/python3-pystache_0.5.4.bb renamed from meta-python/recipes-devtools/python/python-pystache.inc +2 -0
similarity index 94%
rename from meta-python/recipes-devtools/python/python-pystache.inc
rename to meta-python/recipes-devtools/python/python3-pystache_0.5.4.bb
index 6dbc99f530..feb4986109 100644
@@ -6,6 +6,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=eb4417802c56384aac71b34505528a60"
 SRC_URI[md5sum] = "485885e67a0f6411d5252e69b20a35ca"
 SRC_URI[sha256sum] = "f7bbc265fb957b4d6c7c042b336563179444ab313fb93a719759111eabd3b85a"
 
+inherit pypi setuptools3
+
 RDEPENDS_${PN} += " \
     ${PYTHON_PN}-netserver \
 "
Signature · 1 line
2.17.1
#3 lore raw

PATCH 4/5 python-pysql: Remove package incorporated into standard library in python 3

In reply to Derek Straka
---
 .../python/python-pysqlite.inc                 | 18 ------------------
 1 file changed, 18 deletions(-)
 delete mode 100644 meta-python/recipes-devtools/python/python-pysqlite.inc
meta-python/recipes-devtools/python/python-pysqlite.inc deleted +0 -18
deleted file mode 100644
index 884556570d..0000000000
@@ -1,18 +0,0 @@
-DESCRIPTION = "DB-API 2.0 interface for SQLite 3.x"
-HOMEPAGE = "http://github.com/ghaering/pysqlite"
-LICENSE = "Zlib"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=28ad4f115e06c88bd737372a453369d8"
-
-SRC_URI[md5sum] = "033f17b8644577715aee55e8832ac9fc"
-SRC_URI[sha256sum] = "17d3335863e8cf8392eea71add33dab3f96d060666fe68ab7382469d307f4490"
-
-inherit pypi
-
-DEPENDS += "${PYTHON_PN}-pip"
-
-RDEPENDS_${PN}_class-target += "\
-    ${PYTHON_PN}-datetime \
-    sqlite3 \
-"
-
-FILES_${PN}-doc += "${datadir}"
Signature · 1 line
2.17.1
#4 lore raw

PATCH 5/5 python-pysocks: consolidate inc and bb files into a single bb file

In reply to Derek Straka
---
 .../recipes-devtools/python/python-pysocks.inc | 18 ------------------
 .../python/python3-pysocks_1.7.1.bb            | 15 ++++++++++++++-
 2 files changed, 14 insertions(+), 19 deletions(-)
 delete mode 100644 meta-python/recipes-devtools/python/python-pysocks.inc
meta-python/recipes-devtools/python/python-pysocks.inc deleted +0 -18
deleted file mode 100644
index 1836e52d00..0000000000
@@ -1,18 +0,0 @@
-DESCRIPTION = "A Python SOCKS client module"
-HOMEPAGE = "http://python-requests.org"
-LICENSE = "BSD-3-Clause"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=1d457bcffb9661b45f799d4efee72f16"
-
-SRC_URI[md5sum] = "89b1a6865c61bae67a32417517612ee6"
-SRC_URI[sha256sum] = "3f8804571ebe159c380ac6de37643bb4685970655d3bba243530d6558b799aa0"
-
-PYPI_PACKAGE = "PySocks"
-
-RDEPENDS_${PN}_class-target += "\
-    ${PYTHON_PN}-email \
-    ${PYTHON_PN}-io \
-    ${PYTHON_PN}-netclient \
-    ${PYTHON_PN}-shell \
-"
-
-BBCLASSEXTEND = "native nativesdk"
meta-python/recipes-devtools/python/python3-pysocks_1.7.1.bb +14 -1
index bbda05a518..e311904fcf 100644
@@ -1,6 +1,19 @@
+DESCRIPTION = "A Python SOCKS client module"
+HOMEPAGE = "http://python-requests.org"
+LICENSE = "BSD-3-Clause"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=1d457bcffb9661b45f799d4efee72f16"
+
+SRC_URI[md5sum] = "89b1a6865c61bae67a32417517612ee6"
+SRC_URI[sha256sum] = "3f8804571ebe159c380ac6de37643bb4685970655d3bba243530d6558b799aa0"
+
+PYPI_PACKAGE = "PySocks"
 inherit pypi setuptools3
-require python-pysocks.inc
 
 RDEPENDS_${PN}_class-target += "\
+    ${PYTHON_PN}-email \
+    ${PYTHON_PN}-io \
     ${PYTHON_PN}-netclient \
+    ${PYTHON_PN}-shell \
 "
+
+BBCLASSEXTEND = "native nativesdk"
Signature · 1 line
2.17.1