[oe-commits] [meta-openembedded] 11/55: python3-setuptools-scm: make version available for both Python 2 & 3

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

martin_jansa pushed a commit to branch master-next
in repository meta-openembedded.

commit e1cd4e89b176b2761b3bf7649576cf093073d7f4
Author: Pascal Bach <pascal.bach at siemens.com>
AuthorDate: Fri Apr 21 15:20:15 2017 +0200

    python3-setuptools-scm: make version available for both Python 2 & 3
    
    Signed-off-by: Pascal Bach <pascal.bach at siemens.com>
    Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
---
 ...tuptools-scm_1.15.0.bb => python-setuptools-scm.inc} |  7 +++----
 .../python/python-setuptools-scm_1.15.0.bb              | 17 ++---------------
 .../python/python3-setuptools-scm_1.15.0.bb             |  2 ++
 3 files changed, 7 insertions(+), 19 deletions(-)

diff --git a/meta-python/recipes-devtools/python/python-setuptools-scm_1.15.0.bb b/meta-python/recipes-devtools/python/python-setuptools-scm.inc
similarity index 63%
copy from meta-python/recipes-devtools/python/python-setuptools-scm_1.15.0.bb
copy to meta-python/recipes-devtools/python/python-setuptools-scm.inc
index 08008ce..3249870 100644
--- a/meta-python/recipes-devtools/python/python-setuptools-scm_1.15.0.bb
+++ b/meta-python/recipes-devtools/python/python-setuptools-scm.inc
@@ -6,10 +6,9 @@ SRC_URI[md5sum] = "b6916c78ed6253d6602444fad4279c5b"
 SRC_URI[sha256sum] = "daf12d05aa2155a46aa357453757ffdc47d87f839e62114f042bceac6a619e2f"
 
 PYPI_PACKAGE = "setuptools_scm"
+inherit pypi
 
-RDEPENDS_${PN}_class-target = "python-py python-setuptools python-argparse python-debugger python-json"
-RDEPENDS_${PN}_class-native = "python-setuptools-native"
+RDEPENDS_${PN}_class-target = "${PYTHON_PN}-py ${PYTHON_PN}-setuptools ${PYTHON_PN}-argparse ${PYTHON_PN}-debugger ${PYTHON_PN}-json"
+RDEPENDS_${PN}_class-native = "${PYTHON_PN}-setuptools-native"
 
 BBCLASSEXTEND = "native"
-
-inherit pypi setuptools
diff --git a/meta-python/recipes-devtools/python/python-setuptools-scm_1.15.0.bb b/meta-python/recipes-devtools/python/python-setuptools-scm_1.15.0.bb
index 08008ce..5f9bb0b 100644
--- a/meta-python/recipes-devtools/python/python-setuptools-scm_1.15.0.bb
+++ b/meta-python/recipes-devtools/python/python-setuptools-scm_1.15.0.bb
@@ -1,15 +1,2 @@
-SUMMARY = "the blessed package to manage your versions by scm tags"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=838c366f69b72c5df05c96dff79b35f2"
-
-SRC_URI[md5sum] = "b6916c78ed6253d6602444fad4279c5b"
-SRC_URI[sha256sum] = "daf12d05aa2155a46aa357453757ffdc47d87f839e62114f042bceac6a619e2f"
-
-PYPI_PACKAGE = "setuptools_scm"
-
-RDEPENDS_${PN}_class-target = "python-py python-setuptools python-argparse python-debugger python-json"
-RDEPENDS_${PN}_class-native = "python-setuptools-native"
-
-BBCLASSEXTEND = "native"
-
-inherit pypi setuptools
+inherit setuptools
+require python-setuptools-scm.inc
diff --git a/meta-python/recipes-devtools/python/python3-setuptools-scm_1.15.0.bb b/meta-python/recipes-devtools/python/python3-setuptools-scm_1.15.0.bb
new file mode 100644
index 0000000..5bf5983
--- /dev/null
+++ b/meta-python/recipes-devtools/python/python3-setuptools-scm_1.15.0.bb
@@ -0,0 +1,2 @@
+inherit setuptools3
+require python-setuptools-scm.inc

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.