Skip to contentSkip to conversation

python-pytest: update to version 3.1.3

PATCH New Derek Straka 1 participant 2 messages Jul 5, 2017

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 python-pytest: update to version 3.1.3

Updated license for copyright changes and verified terms

---
 meta-python/recipes-devtools/python/python-pytest.inc               | 6 +++---
 .../python/{python-pytest_3.1.2.bb => python-pytest_3.1.3.bb}       | 0
 .../python/{python3-pytest_3.1.2.bb => python3-pytest_3.1.3.bb}     | 0
 3 files changed, 3 insertions(+), 3 deletions(-)
 rename meta-python/recipes-devtools/python/{python-pytest_3.1.2.bb => python-pytest_3.1.3.bb} (100%)
 rename meta-python/recipes-devtools/python/{python3-pytest_3.1.2.bb => python3-pytest_3.1.3.bb} (100%)
meta-python/recipes-devtools/python/python-pytest.inc +3 -3
index 2826838..2279596 100644
@@ -1,9 +1,9 @@
 SUMMARY = "Simple powerful teting with python"
 LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=d8a5609608d9a5a180705b0fa298ae01"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=c39b24965f4aef64222cb35de9d47cc4"
 
-SRC_URI[md5sum] = "c4d179f89043cc925e1c169d03128e02"
-SRC_URI[sha256sum] = "795ec29fbba70b22a593691ce8bcd4bdde2dc96e8099731f73c7d8bb3ce879bf"
+SRC_URI[md5sum] = "35356e6e31cbd8318e8b2a8340a90b72"
+SRC_URI[sha256sum] = "095e1832f7e424563c95daf4d8d3c865052b80e139cdd2f9610a986ee8526206"
 
 RDEPENDS_${PN}_class-target += " \
     ${PYTHON_PN}-argparse \
meta-python/recipes-devtools/python/python-pytest_3.1.3.bb renamed from meta-python/recipes-devtools/python/python-pytest_3.1.2.bb +0 -0
similarity index 100%
rename from meta-python/recipes-devtools/python/python-pytest_3.1.2.bb
rename to meta-python/recipes-devtools/python/python-pytest_3.1.3.bb
meta-python/recipes-devtools/python/python3-pytest_3.1.3.bb renamed from meta-python/recipes-devtools/python/python3-pytest_3.1.2.bb +0 -0
similarity index 100%
rename from meta-python/recipes-devtools/python/python3-pytest_3.1.2.bb
rename to meta-python/recipes-devtools/python/python3-pytest_3.1.3.bb
Signature · 1 line
2.7.4
#1 lore raw

PATCH 2/2 python-pytest: remove fetch during do_compile phase

---
 .../recipes-devtools/python/python-pytest.inc      |  4 +++
 ...ove-the-setup_requires-for-setuptools-scm.patch | 29 ++++++++++++++++++++++
 2 files changed, 33 insertions(+)
 create mode 100644 meta-python/recipes-devtools/python/python-pytest/0001-setup.py-remove-the-setup_requires-for-setuptools-scm.patch
meta-python/recipes-devtools/python/python-pytest.inc +4 -0
index 2279596..b5c1fa8 100644
@@ -5,6 +5,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=c39b24965f4aef64222cb35de9d47cc4"
 SRC_URI[md5sum] = "35356e6e31cbd8318e8b2a8340a90b72"
 SRC_URI[sha256sum] = "095e1832f7e424563c95daf4d8d3c865052b80e139cdd2f9610a986ee8526206"
 
+SRC_URI_append = " file://0001-setup.py-remove-the-setup_requires-for-setuptools-scm.patch"
+
 RDEPENDS_${PN}_class-target += " \
     ${PYTHON_PN}-argparse \
     ${PYTHON_PN}-debugger \
@@ -13,4 +15,6 @@ RDEPENDS_${PN}_class-target += " \
     ${PYTHON_PN}-setuptools \
 "
 
+FILESEXTRAPATHS_prepend := "${THISDIR}/python-pytest:"
+
 BBCLASSEXTEND = "native nativesdk"
meta-python/recipes-devtools/python/python-pytest/0001-setup.py-remove-the-setup_requires-for-setuptools-scm.patch new file +29 -0
new file mode 100644
index 0000000..e283b17
@@ -0,0 +1,29 @@
+From e2d81009c790b4ebeced8408b6bae78060cabcaf Mon Sep 17 00:00:00 2001
+From: Derek Straka <[email protected]>
+Date: Wed, 5 Jul 2017 09:35:51 -0400
+Subject: [PATCH 1/1] setup.py: remove the setup_requires for setuptools-scm
+
+The setup_requires argument forces the download of the egg file for setuptools-scm
+during the do_compile phase.  This download is incompatible with the typical fetch
+and mirror structure.  The only usage of scm is the generation of the _version.py
+file and in the release tarball it is already correctly created
+
+Signed-off-by: Derek Straka <[email protected]>
+---
+ setup.py | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/setup.py b/setup.py
+index 751868c..ef6ebf1 100644
+--- a/setup.py
++++ b/setup.py
+@@ -71,7 +71,6 @@ def main():
+         keywords="test unittest",
+         cmdclass={'test': PyTest},
+         # the following should be enabled for release
+-        setup_requires=['setuptools-scm'],
+         install_requires=install_requires,
+         extras_require=extras_require,
+         packages=['_pytest', '_pytest.assertion', '_pytest._code', '_pytest.vendored_packages'],
+-- 
+2.7.4
Signature · 1 line
2.7.4