Skip to contentSkip to conversation

Update python3-pytest to 6.1.0

PATCH In review kai 2 participants 5 messages Sep 27, 2020 – Sep 30, 2020

lore
Share & tools
lore

kai

author
#0 lore raw

v2 cover Update python3-pytest to 6.1.0

From: Kai Kang <[email protected]>

v2:
* add python3-iniconfig to packagegroup-meta-python
* make the link of python3-pytest 6.1.0 release changelog in commit message more specific

Kai Kang (2):
python3-iniconfig: add recipe
python3-pytest: 5.4.3 -> 6.1.0

 .../packagegroups/packagegroup-meta-python.bb |  1 +
 .../python/python3-iniconfig_1.0.1.bb         |  8 +++++
 ...he-setup_requires-for-setuptools-scm.patch | 35 ++++++++++---------
 ...ytest_5.4.3.bb => python3-pytest_6.1.0.bb} |  3 +-
 4 files changed, 30 insertions(+), 17 deletions(-)
 create mode 100644 meta-python/recipes-devtools/python/python3-iniconfig_1.0.1.bb
 rename meta-python/recipes-devtools/python/{python3-pytest_5.4.3.bb => python3-pytest_6.1.0.bb} (89%)
Signature · 1 line
2.17.1
author
#1 lore raw

PATCH v2 1/2 python3-iniconfig: add recipe

From: Kai Kang <[email protected]>

python3-iniconfig is required by pytest 6.1.0. And add it to packagegroup-meta-python.

---
 .../packagegroups/packagegroup-meta-python.bb             | 1 +
 .../recipes-devtools/python/python3-iniconfig_1.0.1.bb    | 8 ++++++++
 2 files changed, 9 insertions(+)
 create mode 100644 meta-python/recipes-devtools/python/python3-iniconfig_1.0.1.bb
meta-python/recipes-core/packagegroups/packagegroup-meta-python.bb +1 -0
index 582037be5..0f032e65e 100644
@@ -302,6 +302,7 @@ RDEPENDS_packagegroup-meta-python3 = "\
     python3-sdnotify \
     python3-pycodestyle \
     python3-pytest \
+    python3-iniconfig \
     python3-speaklater \
     python3-wtforms \
     python3-speedtest-cli \
meta-python/recipes-devtools/python/python3-iniconfig_1.0.1.bb new file +8 -0
new file mode 100644
index 000000000..9ed0e033b
@@ -0,0 +1,8 @@
+SUMMARY = "A small and simple INI-file parser module"
+
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=a6bb0320b04a0a503f12f69fea479de9"
+
+SRC_URI[sha256sum] = "e5f92f89355a67de0595932a6c6c02ab4afddc6fcdc0bfc5becd0d60884d3f69"
+
+inherit pypi setuptools3
Signature · 1 line
2.17.1
Acked-by Trevor Gamblin on v2 1/2
#2 lore raw

Re: [oe] [meta-python][PATCH v2 1/2] python3-iniconfig: add recipe

Quoted 6 lines · kai

From: Kai Kang <[email protected]>

python3-iniconfig is required by pytest 6.1.0. And add it to packagegroup-meta-python.

Quoted 35 lines
---
  .../packagegroups/packagegroup-meta-python.bb             | 1 +
  .../recipes-devtools/python/python3-iniconfig_1.0.1.bb    | 8 ++++++++
  2 files changed, 9 insertions(+)

create mode 100644 meta-python/recipes-devtools/python/python3-iniconfig_1.0.1.bb

meta-python/recipes-core/packagegroups/packagegroup-meta-python.bb +1 -0
index 582037be5..0f032e65e 100644
@@ -302,6 +302,7 @@ RDEPENDS_packagegroup-meta-python3 = "\
      python3-sdnotify \
      python3-pycodestyle \
      python3-pytest \
+    python3-iniconfig \
      python3-speaklater \
      python3-wtforms \
      python3-speedtest-cli \
meta-python/recipes-devtools/python/python3-iniconfig_1.0.1.bb new file +8 -0
new file mode 100644
index 000000000..9ed0e033b
@@ -0,0 +1,8 @@
+SUMMARY = "A small and simple INI-file parser module"
+
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=a6bb0320b04a0a503f12f69fea479de9"
+
+SRC_URI[sha256sum] = "e5f92f89355a67de0595932a6c6c02ab4afddc6fcdc0bfc5becd0d60884d3f69"
+
+inherit pypi setuptools3
author
#3 lore raw

PATCH v2 2/2 python3-pytest: 5.4.3 -> 6.1.0

In reply to kai

From: Kai Kang <[email protected]>

Upgrade python3-pytest from 5.4.3 to 6.1.0
* add runtime dependency python3-iniconfig

And the release changelog is at:

https://docs.pytest.org/en/stable/changelog.html#pytest-6-1-0-2020-09-26

---
 ...he-setup_requires-for-setuptools-scm.patch | 35 ++++++++++---------
 ...ytest_5.4.3.bb => python3-pytest_6.1.0.bb} |  3 +-
 2 files changed, 21 insertions(+), 17 deletions(-)
 rename meta-python/recipes-devtools/python/{python3-pytest_5.4.3.bb => python3-pytest_6.1.0.bb} (89%)
meta-python/recipes-devtools/python/python3-pytest/0001-setup.py-remove-the-setup_requires-for-setuptools-scm.patch +19 -16
index c29fb12de..8c5c17247 100644
@@ -14,23 +14,26 @@ Upstream-Status: Inappropriate [oe specific]
 Signed-off-by: Derek Straka <[email protected]>
 
 Signed-off-by: Yuan Chao <[email protected]>
+
+Rebase for pytest 6.1.0.
+
+Signed-off-by: Kai Kang <[email protected]>
 ---
- setup.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/setup.py b/setup.py
-index adbafb5..75fdd09 100644
---- a/setup.py
-+++ b/setup.py
-@@ -19,7 +19,7 @@ INSTALL_REQUIRES = [
- def main():
-     setup(
-         use_scm_version={"write_to": "src/_pytest/_version.py"},
--        setup_requires=["setuptools-scm", "setuptools>=40.0"],
-+        setup_requires=["setuptools>=40.0"],
-         package_dir={"": "src"},
-         extras_require={
-             "testing": [
+ setup.cfg | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/setup.cfg b/setup.cfg
+index 60f6564..c4d1471 100644
+--- a/setup.cfg
++++ b/setup.cfg
+@@ -55,7 +55,6 @@ package_dir =
+ 	=src
+ setup_requires = 
+ 	setuptools>=40.0
+-	setuptools-scm
+ zip_safe = no
+ 
+ [options.entry_points]
 -- 
 2.17.1
 
meta-python/recipes-devtools/python/python3-pytest_6.1.0.bb renamed from meta-python/recipes-devtools/python/python3-pytest_5.4.3.bb +2 -1
similarity index 89%
rename from meta-python/recipes-devtools/python/python3-pytest_5.4.3.bb
rename to meta-python/recipes-devtools/python/python3-pytest_6.1.0.bb
index ca67223db..1da43c4f9 100644
@@ -3,7 +3,7 @@ SUMMARY = "Simple powerful testing with python"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=81eb9f71d006c6b268cf4388e3c98f7b"
 
-SRC_URI[sha256sum] = "7979331bfcba207414f5e1263b5a0f8f521d0f457318836a7355531ed1a4c7d8"
+SRC_URI[sha256sum] = "d010e24666435b39a4cf48740b039885642b6c273a3f77be3e7e03554d2806b7"
 
 SRC_URI_append = " file://0001-setup.py-remove-the-setup_requires-for-setuptools-scm.patch "
 
@@ -13,6 +13,7 @@ RDEPENDS_${PN}_class-target += " \
     ${PYTHON_PN}-attrs \
     ${PYTHON_PN}-debugger \
     ${PYTHON_PN}-doctest \
+    ${PYTHON_PN}-iniconfig \
     ${PYTHON_PN}-json \
     ${PYTHON_PN}-pluggy \
     ${PYTHON_PN}-py \
Signature · 1 line
2.17.1
Acked-by on v2 2/2
#4 lore raw

Re: [oe] [meta-python][PATCH v2 2/2] python3-pytest: 5.4.3 -> 6.1.0

Quoted 10 lines · kai

From: Kai Kang <[email protected]>

Upgrade python3-pytest from 5.4.3 to 6.1.0
* add runtime dependency python3-iniconfig

And the release changelog is at:

https://docs.pytest.org/en/stable/changelog.html#pytest-6-1-0-2020-09-26

Quoted 80 lines
---
  ...he-setup_requires-for-setuptools-scm.patch | 35 ++++++++++---------
  ...ytest_5.4.3.bb => python3-pytest_6.1.0.bb} |  3 +-
  2 files changed, 21 insertions(+), 17 deletions(-)

rename meta-python/recipes-devtools/python/{python3-pytest_5.4.3.bb => python3-pytest_6.1.0.bb} (89%)

meta-python/recipes-devtools/python/python3-pytest/0001-setup.py-remove-the-setup_requires-for-setuptools-scm.patch +19 -16
index c29fb12de..8c5c17247 100644
@@ -14,23 +14,26 @@ Upstream-Status: Inappropriate [oe specific]
  Signed-off-by: Derek Straka <[email protected]>
 
  Signed-off-by: Yuan Chao <[email protected]>
+
+Rebase for pytest 6.1.0.
+
+Signed-off-by: Kai Kang <[email protected]>
  ---
- setup.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/setup.py b/setup.py
-index adbafb5..75fdd09 100644
---- a/setup.py
-+++ b/setup.py
-@@ -19,7 +19,7 @@ INSTALL_REQUIRES = [
- def main():
-     setup(
-         use_scm_version={"write_to": "src/_pytest/_version.py"},
--        setup_requires=["setuptools-scm", "setuptools>=40.0"],
-+        setup_requires=["setuptools>=40.0"],
-         package_dir={"": "src"},
-         extras_require={
-             "testing": [
+ setup.cfg | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/setup.cfg b/setup.cfg
+index 60f6564..c4d1471 100644
+--- a/setup.cfg
++++ b/setup.cfg
+@@ -55,7 +55,6 @@ package_dir =
+ 	=src
+ setup_requires =
+ 	setuptools>=40.0
+-	setuptools-scm
+ zip_safe = no
+
+ [options.entry_points]
  --
  2.17.1
 
meta-python/recipes-devtools/python/python3-pytest_6.1.0.bb renamed from meta-python/recipes-devtools/python/python3-pytest_5.4.3.bb +2 -1
similarity index 89%
rename from meta-python/recipes-devtools/python/python3-pytest_5.4.3.bb
rename to meta-python/recipes-devtools/python/python3-pytest_6.1.0.bb
index ca67223db..1da43c4f9 100644
@@ -3,7 +3,7 @@ SUMMARY = "Simple powerful testing with python"
  LICENSE = "MIT"
  LIC_FILES_CHKSUM = "file://LICENSE;md5=81eb9f71d006c6b268cf4388e3c98f7b"
 
-SRC_URI[sha256sum] = "7979331bfcba207414f5e1263b5a0f8f521d0f457318836a7355531ed1a4c7d8"
+SRC_URI[sha256sum] = "d010e24666435b39a4cf48740b039885642b6c273a3f77be3e7e03554d2806b7"
 
  SRC_URI_append = " file://0001-setup.py-remove-the-setup_requires-for-setuptools-scm.patch "
 
@@ -13,6 +13,7 @@ RDEPENDS_${PN}_class-target += " \
      ${PYTHON_PN}-attrs \
      ${PYTHON_PN}-debugger \
      ${PYTHON_PN}-doctest \
+    ${PYTHON_PN}-iniconfig \
      ${PYTHON_PN}-json \
      ${PYTHON_PN}-pluggy \
      ${PYTHON_PN}-py \