From 6b9db4343afbd611179ab2d10e19970d32fc8ed8 Mon Sep 17 00:00:00 2001 From: Derek Straka Date: Sun, 9 Feb 2020 19:55:10 -0500 Subject: python3-automat: consolidate inc and bb files into a single bb file Signed-off-by: Derek Straka Signed-off-by: Khem Raj --- .../recipes-devtools/python/python-automat.inc | 24 ----------- ...001-setup.py-remove-the-dependency-on-m2r.patch | 50 ---------------------- ...001-setup.py-remove-the-dependency-on-m2r.patch | 50 ++++++++++++++++++++++ .../python/python3-automat_0.8.0.bb | 23 +++++++++- 4 files changed, 71 insertions(+), 76 deletions(-) delete mode 100644 meta-python/recipes-devtools/python/python-automat.inc delete mode 100644 meta-python/recipes-devtools/python/python-automat/0001-setup.py-remove-the-dependency-on-m2r.patch create mode 100644 meta-python/recipes-devtools/python/python3-automat/0001-setup.py-remove-the-dependency-on-m2r.patch (limited to 'meta-python/recipes-devtools/python') diff --git a/meta-python/recipes-devtools/python/python-automat.inc b/meta-python/recipes-devtools/python/python-automat.inc deleted file mode 100644 index ec392216e8..0000000000 --- a/meta-python/recipes-devtools/python/python-automat.inc +++ /dev/null @@ -1,24 +0,0 @@ -DESCRIPTION = "Self-service finite-state machines for the programmer on the go" -HOMEPAGE = "https://github.com/glyph/Automat" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=4ad213bcca81688e94593e5f60c87477" - -FILESEXTRAPATHS_prepend := "${THISDIR}/python-automat:" - -SRC_URI[md5sum] = "47e980a48201a1dabe37fa11f0187013" -SRC_URI[sha256sum] = "269a09dfb063a3b078983f4976d83f0a0d3e6e7aaf8e27d8df1095e09dc4a484" - -PYPI_PACKAGE = "Automat" - -inherit pypi - -SRC_URI_append = " \ - file://0001-setup.py-remove-the-dependency-on-m2r.patch \ -" - -DEPENDS += "${PYTHON_PN}-setuptools-scm-native" - -RDEPENDS_${PN} += "\ - ${PYTHON_PN}-attrs \ - ${PYTHON_PN}-six \ -" diff --git a/meta-python/recipes-devtools/python/python-automat/0001-setup.py-remove-the-dependency-on-m2r.patch b/meta-python/recipes-devtools/python/python-automat/0001-setup.py-remove-the-dependency-on-m2r.patch deleted file mode 100644 index c29b659bc3..0000000000 --- a/meta-python/recipes-devtools/python/python-automat/0001-setup.py-remove-the-dependency-on-m2r.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 33b70266930c9093712173c4e0c419815b55e313 Mon Sep 17 00:00:00 2001 -From: Derek Straka -Date: Fri, 22 Dec 2017 09:07:00 -0500 -Subject: [PATCH] setup.py: remove the dependency on m2r - -The dependency on m2r is removed here as it only provides the -long_description value that is optional. This item is just the -text that would be present on PyPi, so it doesn't provide much -value in this case - -Upstream-Status: Inappropriate (OE specific) - -Signed-off-by: Derek Straka - ---- - setup.py | 10 ---------- - 1 file changed, 10 deletions(-) - -diff --git a/setup.py b/setup.py -index d360c64..7b4180a 100644 ---- a/setup.py -+++ b/setup.py -@@ -4,14 +4,6 @@ Setup file for automat - - from setuptools import setup, find_packages - --try: -- from m2r import parse_from_file -- long_description = parse_from_file('README.md') --except(IOError, ImportError): -- print("\n\n!!! m2r not found, long_description is bad, don't upload this to PyPI !!!\n\n") -- import io -- long_description = io.open('README.md', encoding="utf-8").read() -- - setup( - name='Automat', - use_scm_version=True, -@@ -19,12 +11,10 @@ setup( - description=""" - Self-service finite-state machines for the programmer on the go. - """.strip(), -- long_description=long_description, - packages=find_packages(exclude=[]), - package_dir={'automat': 'automat'}, - setup_requires=[ - 'setuptools-scm', -- 'm2r', - ], - install_requires=[ - "attrs>=16.1.0", diff --git a/meta-python/recipes-devtools/python/python3-automat/0001-setup.py-remove-the-dependency-on-m2r.patch b/meta-python/recipes-devtools/python/python3-automat/0001-setup.py-remove-the-dependency-on-m2r.patch new file mode 100644 index 0000000000..c29b659bc3 --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-automat/0001-setup.py-remove-the-dependency-on-m2r.patch @@ -0,0 +1,50 @@ +From 33b70266930c9093712173c4e0c419815b55e313 Mon Sep 17 00:00:00 2001 +From: Derek Straka +Date: Fri, 22 Dec 2017 09:07:00 -0500 +Subject: [PATCH] setup.py: remove the dependency on m2r + +The dependency on m2r is removed here as it only provides the +long_description value that is optional. This item is just the +text that would be present on PyPi, so it doesn't provide much +value in this case + +Upstream-Status: Inappropriate (OE specific) + +Signed-off-by: Derek Straka + +--- + setup.py | 10 ---------- + 1 file changed, 10 deletions(-) + +diff --git a/setup.py b/setup.py +index d360c64..7b4180a 100644 +--- a/setup.py ++++ b/setup.py +@@ -4,14 +4,6 @@ Setup file for automat + + from setuptools import setup, find_packages + +-try: +- from m2r import parse_from_file +- long_description = parse_from_file('README.md') +-except(IOError, ImportError): +- print("\n\n!!! m2r not found, long_description is bad, don't upload this to PyPI !!!\n\n") +- import io +- long_description = io.open('README.md', encoding="utf-8").read() +- + setup( + name='Automat', + use_scm_version=True, +@@ -19,12 +11,10 @@ setup( + description=""" + Self-service finite-state machines for the programmer on the go. + """.strip(), +- long_description=long_description, + packages=find_packages(exclude=[]), + package_dir={'automat': 'automat'}, + setup_requires=[ + 'setuptools-scm', +- 'm2r', + ], + install_requires=[ + "attrs>=16.1.0", diff --git a/meta-python/recipes-devtools/python/python3-automat_0.8.0.bb b/meta-python/recipes-devtools/python/python3-automat_0.8.0.bb index 2c747643ff..f8981bcb19 100644 --- a/meta-python/recipes-devtools/python/python3-automat_0.8.0.bb +++ b/meta-python/recipes-devtools/python/python3-automat_0.8.0.bb @@ -1,2 +1,21 @@ -inherit setuptools3 -require python-automat.inc +DESCRIPTION = "Self-service finite-state machines for the programmer on the go" +HOMEPAGE = "https://github.com/glyph/Automat" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=4ad213bcca81688e94593e5f60c87477" + +SRC_URI[md5sum] = "47e980a48201a1dabe37fa11f0187013" +SRC_URI[sha256sum] = "269a09dfb063a3b078983f4976d83f0a0d3e6e7aaf8e27d8df1095e09dc4a484" + +DEPENDS += "${PYTHON_PN}-setuptools-scm-native" + +SRC_URI_append = " \ + file://0001-setup.py-remove-the-dependency-on-m2r.patch \ +" + +PYPI_PACKAGE = "Automat" +inherit pypi setuptools3 + +RDEPENDS_${PN} += "\ + ${PYTHON_PN}-attrs \ + ${PYTHON_PN}-six \ +" -- cgit v1.2.3-54-g00ecf