diff options
| author | Andrew Geissler <geissonator@yahoo.com> | 2020-04-13 21:39:40 +0300 |
|---|---|---|
| committer | Andrew Geissler <geissonator@yahoo.com> | 2020-05-05 16:30:44 +0300 |
| commit | 82c905dc58a36aeae40b1b273a12f63fb1973cf4 (patch) | |
| tree | 38caf00263451b5036435cdc36e035b25d32e623 /meta-openembedded/meta-python/recipes-devtools/python/python3-robotframework-seriallibrary | |
| parent | 83ecb75644b3d677c274188f9ac0b2374d6f6925 (diff) | |
| download | openbmc-82c905dc58a36aeae40b1b273a12f63fb1973cf4.tar.xz | |
meta-openembedded and poky: subtree updates
Squash of the following due to dependencies among them
and OpenBMC changes:
meta-openembedded: subtree update:d0748372d2..9201611135
meta-openembedded: subtree update:9201611135..17fd382f34
poky: subtree update:9052e5b32a..2e11d97b6c
poky: subtree update:2e11d97b6c..a8544811d7
The change log was too large for the jenkins plugin
to handle therefore it has been removed. Here is
the first and last commit of each subtree:
meta-openembedded:d0748372d2
cppzmq: bump to version 4.6.0
meta-openembedded:17fd382f34
mpv: Remove X11 dependency
poky:9052e5b32a
package_ipk: Remove pointless comment to trigger rebuild
poky:a8544811d7
pbzip2: Fix license warning
Change-Id: If0fc6c37629642ee207a4ca2f7aa501a2c673cd6
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
Diffstat (limited to 'meta-openembedded/meta-python/recipes-devtools/python/python3-robotframework-seriallibrary')
| -rw-r--r-- | meta-openembedded/meta-python/recipes-devtools/python/python3-robotframework-seriallibrary/e31d5fdf2ea00ac6349e64580a20816783064dd4.patch | 45 |
1 files changed, 45 insertions, 0 deletions
diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-robotframework-seriallibrary/e31d5fdf2ea00ac6349e64580a20816783064dd4.patch b/meta-openembedded/meta-python/recipes-devtools/python/python3-robotframework-seriallibrary/e31d5fdf2ea00ac6349e64580a20816783064dd4.patch new file mode 100644 index 000000000..21e97fd93 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-robotframework-seriallibrary/e31d5fdf2ea00ac6349e64580a20816783064dd4.patch @@ -0,0 +1,45 @@ +From e31d5fdf2ea00ac6349e64580a20816783064dd4 Mon Sep 17 00:00:00 2001 +From: Hideki Takeoka <hideki.takeoka@smartfrog.com> +Date: Sun, 25 Aug 2019 19:25:00 +0200 +Subject: [PATCH] Update setup.py for python3.7+ support + +--- + setup.py | 9 +++++---- + src/SerialLibrary/version.py | 3 +++ + 2 files changed, 8 insertions(+), 4 deletions(-) + +diff --git a/setup.py b/setup.py +index 4c34705..70bb1af 100644 +--- a/setup.py ++++ b/setup.py +@@ -1,6 +1,5 @@ + #!/usr/bin/env python + +-from imp import load_source + from os.path import abspath, dirname, join + from sys import platform + +@@ -18,9 +17,11 @@ + + + CURDIR = dirname(abspath(__file__)) +-VERSION = load_source( +- 'version', 'version', +- open(join(CURDIR, 'src', 'SerialLibrary', 'version.py'))).VERSION ++ ++with open(join(CURDIR, 'src', 'SerialLibrary', 'version.py')) as f: ++ exec(f.read()) ++ VERSION = get_version() ++ + README = open(join(CURDIR, 'README.rst')).read() + CLASSIFIERS = '\n'.join( + map(' :: '.join, [ +diff --git a/src/SerialLibrary/version.py b/src/SerialLibrary/version.py +index 6ce65c4..19831bc 100644 +--- a/src/SerialLibrary/version.py ++++ b/src/SerialLibrary/version.py +@@ -1 +1,4 @@ + VERSION = (0, 3, 1) ++ ++def get_version(): ++ return VERSION; |