From bd8959459ba88a22db17ad8280553656cee87c96 Mon Sep 17 00:00:00 2001 From: Derek Straka Date: Tue, 26 Dec 2017 09:19:11 -0500 Subject: python-automat: fix build dependencies to avoid download during do_compile Add the correct version of python{3}-setuptools-scm-native Remove the dependency on m2r Signed-off-by: Derek Straka Signed-off-by: Armin Kuster --- .../recipes-devtools/python/python-automat.inc | 8 ++++ ...001-setup.py-remove-the-dependency-on-m2r.patch | 52 ++++++++++++++++++++++ 2 files changed, 60 insertions(+) create mode 100644 meta-python/recipes-devtools/python/python-automat/0001-setup.py-remove-the-dependency-on-m2r.patch diff --git a/meta-python/recipes-devtools/python/python-automat.inc b/meta-python/recipes-devtools/python/python-automat.inc index 1ac5d3b323..43b9ce9e3c 100644 --- a/meta-python/recipes-devtools/python/python-automat.inc +++ b/meta-python/recipes-devtools/python/python-automat.inc @@ -3,6 +3,8 @@ HOMEPAGE = "https://github.com/glyph/Automat" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=4ad213bcca81688e94593e5f60c87477" +FILESEXTRAPATHS_prepend := "${THISDIR}/python-automat:" + SRC_URI[md5sum] = "ad7bba58d262d8956d732330cb5ef53d" SRC_URI[sha256sum] = "3c1fd04ecf08ac87b4dd3feae409542e9bf7827257097b2b6ed5692f69d6f6a8" @@ -10,6 +12,12 @@ 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 new file mode 100644 index 0000000000..0ebb220756 --- /dev/null +++ b/meta-python/recipes-devtools/python/python-automat/0001-setup.py-remove-the-dependency-on-m2r.patch @@ -0,0 +1,52 @@ +From d5ebe479fc8fe11c5c75e7f35484849320349222 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", +-- +2.7.4 + -- cgit 1.2.3-korg