diff options
Diffstat (limited to 'meta-python')
| -rw-r--r-- | meta-python/recipes-devtools/python/python3-moteus/0001-lib-python-remove-self-import-from-setup.py.patch | 32 | ||||
| -rw-r--r-- | meta-python/recipes-devtools/python/python3-moteus_0.3.68.bb (renamed from meta-python/recipes-devtools/python/python3-moteus_0.3.67.bb) | 4 |
2 files changed, 1 insertions, 35 deletions
diff --git a/meta-python/recipes-devtools/python/python3-moteus/0001-lib-python-remove-self-import-from-setup.py.patch b/meta-python/recipes-devtools/python/python3-moteus/0001-lib-python-remove-self-import-from-setup.py.patch deleted file mode 100644 index 10acd7b8c1..0000000000 --- a/meta-python/recipes-devtools/python/python3-moteus/0001-lib-python-remove-self-import-from-setup.py.patch +++ /dev/null | |||
| @@ -1,32 +0,0 @@ | |||
| 1 | From 7490ac4629c7fe0dc329647e6e000d4bc13c610d Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Richard Leitner <dev@g0hl1n.net> | ||
| 3 | Date: Wed, 24 Jan 2024 00:49:45 +0100 | ||
| 4 | Subject: [PATCH] lib: python: remove self-import from setup.py | ||
| 5 | |||
| 6 | Importing moteus itself within the setup.py creates some kind of a | ||
| 7 | chicken-and-egg problem. Furthermore it isn't used anywhere within | ||
| 8 | setup.py. Therefore remove the corresponding import. | ||
| 9 | |||
| 10 | Signed-off-by: Richard Leitner <dev@g0hl1n.net> | ||
| 11 | |||
| 12 | Upstream-Status: Backport [https://github.com/mjbots/moteus/commit/7490ac4629c7fe0dc329647e6e000d4bc13c610d] | ||
| 13 | --- | ||
| 14 | setup.py | 2 -- | ||
| 15 | 1 file changed, 2 deletions(-) | ||
| 16 | |||
| 17 | diff --git a/setup.py b/setup.py | ||
| 18 | index 2731685..6c6064d 100644 | ||
| 19 | --- a/setup.py | ||
| 20 | +++ b/setup.py | ||
| 21 | @@ -17,8 +17,6 @@ | ||
| 22 | import setuptools | ||
| 23 | import pathlib | ||
| 24 | |||
| 25 | -import moteus | ||
| 26 | - | ||
| 27 | here = pathlib.Path(__file__).parent.resolve() | ||
| 28 | |||
| 29 | # Get the long description from the README file | ||
| 30 | -- | ||
| 31 | 2.40.1 | ||
| 32 | |||
diff --git a/meta-python/recipes-devtools/python/python3-moteus_0.3.67.bb b/meta-python/recipes-devtools/python/python3-moteus_0.3.68.bb index 3c93ee44ff..d99d30e637 100644 --- a/meta-python/recipes-devtools/python/python3-moteus_0.3.67.bb +++ b/meta-python/recipes-devtools/python/python3-moteus_0.3.68.bb | |||
| @@ -5,9 +5,7 @@ LIC_FILES_CHKSUM = "file://setup.py;beginline=3;endline=9;md5=24025d3c660abfc62a | |||
| 5 | 5 | ||
| 6 | inherit pypi setuptools3 | 6 | inherit pypi setuptools3 |
| 7 | 7 | ||
| 8 | SRC_URI += "file://0001-lib-python-remove-self-import-from-setup.py.patch" | 8 | SRC_URI[sha256sum] = "a5c4259ecc20cbb5dea9352f8364300db45eab971fa7bddd1625da9b16d63248" |
| 9 | |||
| 10 | SRC_URI[sha256sum] = "a2122f20f59b8962057cf8d3fb583e0aa19006eaf2cde49e30027a4d1b8bf925" | ||
| 11 | 9 | ||
| 12 | S = "${WORKDIR}/moteus-${PV}" | 10 | S = "${WORKDIR}/moteus-${PV}" |
| 13 | 11 | ||
