aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorzangrc <zangrc.fnst@fujitsu.com>2021-07-05 09:55:08 +0800
committerKhem Raj <raj.khem@gmail.com>2021-07-06 09:40:42 -0700
commitf7f1c9fb2d63ae4f5e06e91355295a17016b7502 (patch)
tree77571dd8346e1ef5b1116ccb14c9e214b51e8dc8
parent21333f74fe2f9a6e93e1c6ed5910af436d5a610c (diff)
downloadmeta-openembedded-contrib-f7f1c9fb2d63ae4f5e06e91355295a17016b7502.tar.gz
meta-openembedded-contrib-f7f1c9fb2d63ae4f5e06e91355295a17016b7502.tar.bz2
meta-openembedded-contrib-f7f1c9fb2d63ae4f5e06e91355295a17016b7502.zip
python3-haversine: upgrade 2.3.0 -> 2.3.1
0001-setup.py-Correct-the-license-assignment.patch Removed since this is included in 2.3.1 Signed-off-by: Zang Ruochen <zangrc.fnst@fujitsu.com> Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Trevor Gamblin <trevor.gamblin@windriver.com>
-rw-r--r--meta-python/recipes-devtools/python/python3-haversine/0001-setup.py-Correct-the-license-assignment.patch32
-rw-r--r--meta-python/recipes-devtools/python/python3-haversine_2.3.1.bb (renamed from meta-python/recipes-devtools/python/python3-haversine_2.3.0.bb)5
2 files changed, 1 insertions, 36 deletions
diff --git a/meta-python/recipes-devtools/python/python3-haversine/0001-setup.py-Correct-the-license-assignment.patch b/meta-python/recipes-devtools/python/python3-haversine/0001-setup.py-Correct-the-license-assignment.patch
deleted file mode 100644
index bb5955a44e..0000000000
--- a/meta-python/recipes-devtools/python/python3-haversine/0001-setup.py-Correct-the-license-assignment.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 56b421a18ef8acb41ab9e4bde7e1f5452ec67da9 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Mon, 17 May 2021 22:17:07 -0700
-Subject: [PATCH] setup.py: Correct the license assignment
-
-latest python/2.9 + setuptools bail out otherwise
-
-lines = header.split('\n')
-| AttributeError: 'list' object has no attribute 'split'
-
-Upstream-Status: Submitted [https://github.com/mapado/haversine/pull/38]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- setup.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/setup.py b/setup.py
-index 549436d..9e7fb00 100755
---- a/setup.py
-+++ b/setup.py
-@@ -15,7 +15,7 @@ setup(
- maintainer_email='julien.deniau@mapado.com',
- url='https://github.com/mapado/haversine',
- packages=['haversine'],
-- license=['MIT'],
-+ license='MIT',
- classifiers=[
- 'Development Status :: 4 - Beta',
- 'Intended Audience :: Developers',
---
-2.31.1
-
diff --git a/meta-python/recipes-devtools/python/python3-haversine_2.3.0.bb b/meta-python/recipes-devtools/python/python3-haversine_2.3.1.bb
index 624d30ca01..c3251624f5 100644
--- a/meta-python/recipes-devtools/python/python3-haversine_2.3.0.bb
+++ b/meta-python/recipes-devtools/python/python3-haversine_2.3.1.bb
@@ -2,10 +2,7 @@ SUMMARY = "Calculate the distance between 2 points on Earth"
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
-SRC_URI += "file://0001-setup.py-Correct-the-license-assignment.patch"
-
-SRC_URI[md5sum] = "ff2d43a74195ec00c42ccd5da2a3f3de"
-SRC_URI[sha256sum] = "72c76855ac25e6ad054c7ed380e95c1a96803185f005dd11f40ccaa9620b551f"
+SRC_URI[sha256sum] = "75a7f859b3fb6df746564ca66ad1fd5b4052cdbab3d74ff16e8f1a7c3d4a26a5"
inherit pypi setuptools3