[meta-python][PATCH 1/4] python-chardet: provide both python2 and python3 packages

[meta-python][PATCH 1/4] python-chardet: provide both python2 and python3 packages

[Pascal Bach]

From: Pascal Bach <pascal.bach@nextrem.ch>

Signed-off-by: Pascal Bach <pascal.bach@nextrem.ch>
---
 meta-python/recipes-devtools/python/python-chardet.inc       |  8 ++++++++
 meta-python/recipes-devtools/python/python-chardet_2.3.0.bb  | 10 ++--------
 meta-python/recipes-devtools/python/python3-chardet_2.3.0.bb |  2 ++
 3 files changed, 12 insertions(+), 8 deletions(-)
 create mode 100755 meta-python/recipes-devtools/python/python-chardet.inc
 mode change 100644 => 100755 meta-python/recipes-devtools/python/python-chardet_2.3.0.bb
 create mode 100755 meta-python/recipes-devtools/python/python3-chardet_2.3.0.bb

diff --git a/meta-python/recipes-devtools/python/python-chardet.inc b/meta-python/recipes-devtools/python/python-chardet.inc
new file mode 100755
index 0000000..60305e8
--- /dev/null
+++ b/meta-python/recipes-devtools/python/python-chardet.inc
@@ -0,0 +1,8 @@
+SUMMARY = "Universal encoding detector for Python 2 and 3"
+LICENSE = "LGPL-2.1"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=a6f89e2100d9b6cdffcea4f398e37343"
+
+inherit pypi
+
+SRC_URI[md5sum] = "25274d664ccb5130adae08047416e1a8"
+SRC_URI[sha256sum] = "e53e38b3a4afe6d1132de62b7400a4ac363452dc5dfcf8d88e8e0cce663c68aa"
diff --git a/meta-python/recipes-devtools/python/python-chardet_2.3.0.bb b/meta-python/recipes-devtools/python/python-chardet_2.3.0.bb
old mode 100644
new mode 100755
index dfc979b..b7a46e9
--- a/meta-python/recipes-devtools/python/python-chardet_2.3.0.bb
+++ b/meta-python/recipes-devtools/python/python-chardet_2.3.0.bb
@@ -1,8 +1,2 @@
-SUMMARY = "Universal encoding detector for Python 2 and 3"
-LICENSE = "LGPLv2.1"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=a6f89e2100d9b6cdffcea4f398e37343"
-
-SRC_URI[md5sum] = "25274d664ccb5130adae08047416e1a8"
-SRC_URI[sha256sum] = "e53e38b3a4afe6d1132de62b7400a4ac363452dc5dfcf8d88e8e0cce663c68aa"
-
-inherit pypi setuptools
+inherit setuptools
+require python-chardet.inc
diff --git a/meta-python/recipes-devtools/python/python3-chardet_2.3.0.bb b/meta-python/recipes-devtools/python/python3-chardet_2.3.0.bb
new file mode 100755
index 0000000..038043c
--- /dev/null
+++ b/meta-python/recipes-devtools/python/python3-chardet_2.3.0.bb
@@ -0,0 +1,2 @@
+inherit setuptools3
+require python-chardet.inc
-- 
2.1.4

[meta-python][PATCH 2/4] python-pytz: provide both python2 and python3 packages

[Pascal Bach]

From: Pascal Bach <pascal.bach@nextrem.ch>

Signed-off-by: Pascal Bach <pascal.bach@nextrem.ch>
---
 meta-python/recipes-devtools/python/python-pytz.inc     | 15 +++++++++++++++
 .../recipes-devtools/python/python-pytz_2016.7.bb       | 17 ++---------------
 .../recipes-devtools/python/python3-pytz_2016.7.bb      |  2 ++
 3 files changed, 19 insertions(+), 15 deletions(-)
 create mode 100755 meta-python/recipes-devtools/python/python-pytz.inc
 mode change 100644 => 100755 meta-python/recipes-devtools/python/python-pytz_2016.7.bb
 create mode 100755 meta-python/recipes-devtools/python/python3-pytz_2016.7.bb

diff --git a/meta-python/recipes-devtools/python/python-pytz.inc b/meta-python/recipes-devtools/python/python-pytz.inc
new file mode 100755
index 0000000..19be2c7
--- /dev/null
+++ b/meta-python/recipes-devtools/python/python-pytz.inc
@@ -0,0 +1,15 @@
+SUMMARY = "World timezone definitions, modern and historical"
+HOMEPAGE = "http://pythonhosted.org/pytz"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=22b38951eb857cf285a4560a914b7cd6"
+
+inherit pypi
+
+SRC_URI[md5sum] = "8660ba7c3c0abd23e6e4efa493b02966"
+SRC_URI[sha256sum] = "8787de03f35f31699bcaf127e56ad14c00647965ed24d72dbaca87c6e4f843a3"
+
+RDEPENDS_${PN} += "\
+    ${PYTHON_PN}-datetime \
+    ${PYTHON_PN}-io \
+    ${PYTHON_PN}-threading \
+"
diff --git a/meta-python/recipes-devtools/python/python-pytz_2016.7.bb b/meta-python/recipes-devtools/python/python-pytz_2016.7.bb
old mode 100644
new mode 100755
index 508fd3b..f2ffc59
--- a/meta-python/recipes-devtools/python/python-pytz_2016.7.bb
+++ b/meta-python/recipes-devtools/python/python-pytz_2016.7.bb
@@ -1,15 +1,2 @@
-SUMMARY = "World timezone definitions, modern and historical"
-HOMEPAGE = " http://pythonhosted.org/pytz"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=22b38951eb857cf285a4560a914b7cd6"
-
-SRC_URI[md5sum] = "8660ba7c3c0abd23e6e4efa493b02966"
-SRC_URI[sha256sum] = "8787de03f35f31699bcaf127e56ad14c00647965ed24d72dbaca87c6e4f843a3"
-
-inherit pypi setuptools
-
-RDEPENDS_${PN} += "\
-    ${PYTHON_PN}-datetime \
-    ${PYTHON_PN}-io \
-    ${PYTHON_PN}-threading \
-"
+inherit setuptools
+require python-pytz.inc
diff --git a/meta-python/recipes-devtools/python/python3-pytz_2016.7.bb b/meta-python/recipes-devtools/python/python3-pytz_2016.7.bb
new file mode 100755
index 0000000..19a89dc
--- /dev/null
+++ b/meta-python/recipes-devtools/python/python3-pytz_2016.7.bb
@@ -0,0 +1,2 @@
+inherit setuptools3
+require python-pytz.inc
-- 
2.1.4

[meta-python][PATCH 3/4] python-yaml: provide both python2 and python3 package

[Pascal Bach]

From: Pascal Bach <pascal.bach@nextrem.ch>

Further the recipe is simplified by using the pypi and setuptools class.
The custom setup.py is no onger necessary.

Signed-off-by: Pascal Bach <pascal.bach@nextrem.ch>
---
 .../recipes-devtools/python/python-pyyaml.inc      | 14 +++++
 .../recipes-devtools/python/python-pyyaml/setup.py | 64 ----------------------
 .../recipes-devtools/python/python-pyyaml_3.12.bb  | 26 +--------
 .../recipes-devtools/python/python3-pyyaml_3.12.bb |  2 +
 4 files changed, 18 insertions(+), 88 deletions(-)
 create mode 100755 meta-python/recipes-devtools/python/python-pyyaml.inc
 delete mode 100644 meta-python/recipes-devtools/python/python-pyyaml/setup.py
 mode change 100644 => 100755 meta-python/recipes-devtools/python/python-pyyaml_3.12.bb
 create mode 100755 meta-python/recipes-devtools/python/python3-pyyaml_3.12.bb

diff --git a/meta-python/recipes-devtools/python/python-pyyaml.inc b/meta-python/recipes-devtools/python/python-pyyaml.inc
new file mode 100755
index 0000000..41321ca
--- /dev/null
+++ b/meta-python/recipes-devtools/python/python-pyyaml.inc
@@ -0,0 +1,14 @@
+SUMMARY = "Python support for YAML"
+HOMEPAGE = "http://www.pyyaml.org"
+SECTION = "devel/python"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=6015f088759b10e0bc2bf64898d4ae17"
+DEPENDS = "libyaml ${PYTHON_PN}-cython-native"
+
+PYPI_PACKAGE = "PyYAML"
+inherit pypi
+
+SRC_URI[md5sum] = "4c129761b661d181ebf7ff4eb2d79950"
+SRC_URI[sha256sum] = "592766c6303207a20efc445587778322d7f73b161bd994f227adaa341ba212ab"
+
+BBCLASSEXTEND = "native nativesdk"
diff --git a/meta-python/recipes-devtools/python/python-pyyaml/setup.py b/meta-python/recipes-devtools/python/python-pyyaml/setup.py
deleted file mode 100644
index 2ed1c94..0000000
--- a/meta-python/recipes-devtools/python/python-pyyaml/setup.py
+++ /dev/null
@@ -1,64 +0,0 @@
-NAME = 'PyYAML'
-VERSION = '3.10'
-DESCRIPTION = "YAML parser and emitter for Python"
-LONG_DESCRIPTION = """\
-YAML is a data serialization format designed for human readability and
-interaction with scripting languages.  PyYAML is a YAML parser and
-emitter for Python.
-
-PyYAML features a complete YAML 1.1 parser, Unicode support, pickle
-support, capable extension API, and sensible error messages.  PyYAML
-supports standard YAML tags and provides Python-specific tags that allow
-to represent an arbitrary Python object.
-
-PyYAML is applicable for a broad range of tasks from complex
-configuration files to object serialization and persistance."""
-AUTHOR = "Kirill Simonov"
-AUTHOR_EMAIL = 'xi@resolvent.net'
-LICENSE = "MIT"
-PLATFORMS = "Any"
-URL = "http://pyyaml.org/wiki/PyYAML"
-DOWNLOAD_URL = "http://pyyaml.org/download/pyyaml/%s-%s.tar.gz" % (NAME, VERSION)
-CLASSIFIERS = [
-    "Development Status :: 5 - Production/Stable",
-    "Intended Audience :: Developers",
-    "License :: OSI Approved :: MIT License",
-    "Operating System :: OS Independent",
-    "Programming Language :: Python",
-    "Topic :: Software Development :: Libraries :: Python Modules",
-    "Topic :: Text Processing :: Markup",
-]
-
-from distutils.core import setup
-from distutils.extension import Extension
-from Cython.Distutils import build_ext
-
-import sys, os.path
-
-
-if __name__ == '__main__':
-
-    setup(
-        name=NAME,
-        version=VERSION,
-        description=DESCRIPTION,
-        long_description=LONG_DESCRIPTION,
-        author=AUTHOR,
-        author_email=AUTHOR_EMAIL,
-        license=LICENSE,
-        platforms=PLATFORMS,
-        url=URL,
-        download_url=DOWNLOAD_URL,
-        classifiers=CLASSIFIERS,
-
-        package_dir={'': 'lib'},
-        packages=['yaml'],
-
-        ext_modules = [
-        Extension( "_yaml", ["ext/_yaml.pyx"], libraries = ["yaml"] )
-        ],
-
-        cmdclass={
-            'build_ext': build_ext,
-        },
-    )
diff --git a/meta-python/recipes-devtools/python/python-pyyaml_3.12.bb b/meta-python/recipes-devtools/python/python-pyyaml_3.12.bb
old mode 100644
new mode 100755
index 0899a2e..6d9f3e9
--- a/meta-python/recipes-devtools/python/python-pyyaml_3.12.bb
+++ b/meta-python/recipes-devtools/python/python-pyyaml_3.12.bb
@@ -1,24 +1,2 @@
-SUMMARY = "Python support for YAML"
-HOMEPAGE = "http://www.pyyaml.org"
-SECTION = "devel/python"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=6015f088759b10e0bc2bf64898d4ae17"
-DEPENDS = "libyaml python-cython-native"
-
-SRC_URI = "http://pyyaml.org/download/pyyaml/PyYAML-${PV}.tar.gz \
-           file://setup.py \
-"
-
-SRC_URI[md5sum] = "4c129761b661d181ebf7ff4eb2d79950"
-SRC_URI[sha256sum] = "592766c6303207a20efc445587778322d7f73b161bd994f227adaa341ba212ab"
-
-S = "${WORKDIR}/PyYAML-${PV}"
-
-inherit distutils
-
-do_configure_prepend() {
-    # upstream setup.py overcomplicated, use ours
-    install -m 0644 ${WORKDIR}/setup.py ${S}
-}
-
-BBCLASSEXTEND = "native nativesdk"
+inherit setuptools
+require python-pyyaml.inc
diff --git a/meta-python/recipes-devtools/python/python3-pyyaml_3.12.bb b/meta-python/recipes-devtools/python/python3-pyyaml_3.12.bb
new file mode 100755
index 0000000..470aca6
--- /dev/null
+++ b/meta-python/recipes-devtools/python/python3-pyyaml_3.12.bb
@@ -0,0 +1,2 @@
+inherit setuptools3
+require python-pyyaml.inc
-- 
2.1.4