mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2025-07-19 15:29:08 +02:00
03c0d75d34
WARNING:
Some of the context lines in patches were ignored. This can lead to incorrectly applied patches.
The context lines in the patches can be updated with devtool:
devtool modify <recipe>
devtool finish --force-patch-refresh <recipe> <layer_path>
Then the updated patches and the source tree (in devtool's workspace)
should be reviewed to make sure the patches apply in the correct place
and don't introduce duplicate lines (which can, and does happen
when some of the context is ignored). Further information:
http://lists.openembedded.org/pipermail/openembedded-core/2018-March/148675.html
https://bugzilla.yoctoproject.org/show_bug.cgi?id=10450
Details:
checking file configure.ac
Hunk #1 succeeded at 7 with fuzz 2.
Signed-off-by: Armin Kuster <akuster808@gmail.com>
50 lines
1.5 KiB
Diff
50 lines
1.5 KiB
Diff
From d5ebe479fc8fe11c5c75e7f35484849320349222 Mon Sep 17 00:00:00 2001
|
|
From: Derek Straka <derek@asterius.io>
|
|
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 <derek@asterius.io>
|
|
---
|
|
setup.py | 10 ----------
|
|
1 file changed, 10 deletions(-)
|
|
|
|
Index: Automat-0.6.0/setup.py
|
|
===================================================================
|
|
--- Automat-0.6.0.orig/setup.py
|
|
+++ Automat-0.6.0/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",
|