From 01c125358de95879b9c0d7838e7a3205f15f28da Mon Sep 17 00:00:00 2001
From: Leon Anavi <leon.anavi@konsulko.com>
Date: Tue, 6 Oct 2020 12:05:24 +0300
Subject: python3-prettytable: Upgrade 0.7.2 -> 1.0.0

Add a dependency on setuptools-scm and upgrade to release 1.0.0:

- Dropped support for EOL Python 2.4-2.6 and 3.0-3.4.
- Added support for Python 3.5-3.9.
- Added del_column(field_name).
- Added get_csv_string with delimiter option (comma or tab) and
  optional header.
- Use wcwidth for better wide char support.
- New paginate method can be used to produce strings suitable for
  piping to lp/lpr.
- from_html now handles HTML tables with colspan, rather than
  choking on them.
- Added min_width, min_table_width and max_table_width
  attribute/options for better control of table sizing.
- Added "title" attribute/option for table titles.
- When slice syntax is used to create a new sub-table out of an
  existing table, the rows are sorted before, not after, the
  slicing. The old behaviour (slice then sort) can be achieved
  by setting oldsortslice=True.
- The from_csv table factory now accepts CSV format parameters as
  keyword arguments (e.g. delimiter, doublequote, escapechar, etc.)
- Added 0x000f to the list of special characters with width 0, to
  fix problems with coloured strings produced by the Blessings
  library.
- Fixed constructor argument float_format to work as intended.
- Removed print_html() from README.
- Added from_json and get_json_string to PrettyTable.
- Fixed PLAIN_COLUMN to PLAIN_COLUMNS in README.
- Added Markdown and Org mode styles.

License-Update: Use wcwidth for better wide char support

Signed-off-by: Leon Anavi <leon.anavi@konsulko.com>
Acked-by: Trevor Gamblin <trevor.gamblin@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 .../python/python3-prettytable_0.7.2.bb            | 37 --------------------
 .../python/python3-prettytable_1.0.0.bb            | 39 ++++++++++++++++++++++
 2 files changed, 39 insertions(+), 37 deletions(-)
 delete mode 100644 meta-python/recipes-devtools/python/python3-prettytable_0.7.2.bb
 create mode 100644 meta-python/recipes-devtools/python/python3-prettytable_1.0.0.bb

diff --git a/meta-python/recipes-devtools/python/python3-prettytable_0.7.2.bb b/meta-python/recipes-devtools/python/python3-prettytable_0.7.2.bb
deleted file mode 100644
index 18f3390619..0000000000
--- a/meta-python/recipes-devtools/python/python3-prettytable_0.7.2.bb
+++ /dev/null
@@ -1,37 +0,0 @@
-SUMMARY = "Python library for displaying tabular data in a ASCII table format"
-HOMEPAGE = "http://code.google.com/p/prettytable"
-LICENSE = "BSD-3-Clause"
-LIC_FILES_CHKSUM = "file://COPYING;md5=3e73500ffa52de5071cff65990055282"
-
-SRC_URI[md5sum] = "a6b80afeef286ce66733d54a0296b13b"
-SRC_URI[sha256sum] = "2d5460dc9db74a32bcc8f9f67de68b2c4f4d2f01fa3bd518764c69156d9cacd9"
-
-do_install_append() {
-    perm_files=`find "${D}${PYTHON_SITEPACKAGES_DIR}/" -name "*.txt" -o -name "PKG-INFO"`
-    for f in $perm_files; do
-        chmod 644 "${f}"
-    done
-}
-
-UPSTREAM_CHECK_URI = "https://pypi.python.org/pypi/PrettyTable/"
-UPSTREAM_CHECK_REGEX = "/PrettyTable/(?P<pver>(\d+[\.\-_]*)+)"
-
-BBCLASSEXTEND = "native nativesdk"
-inherit pypi ptest setuptools3
-
-SRC_URI += " \
-	file://run-ptest \
-"
-
-RDEPENDS_${PN} += " \
-	${PYTHON_PN}-math \
-	${PYTHON_PN}-html \
-"
-
-RDEPENDS_${PN}-ptest += " \
-	${PYTHON_PN}-pytest \
-"
-
-do_install_ptest() {
-	cp -f ${S}/prettytable_test.py ${D}${PTEST_PATH}/
-}
diff --git a/meta-python/recipes-devtools/python/python3-prettytable_1.0.0.bb b/meta-python/recipes-devtools/python/python3-prettytable_1.0.0.bb
new file mode 100644
index 0000000000..e5688a3866
--- /dev/null
+++ b/meta-python/recipes-devtools/python/python3-prettytable_1.0.0.bb
@@ -0,0 +1,39 @@
+SUMMARY = "Python library for displaying tabular data in a ASCII table format"
+HOMEPAGE = "http://code.google.com/p/prettytable"
+LICENSE = "BSD-3-Clause"
+LIC_FILES_CHKSUM = "file://COPYING;md5=c9a6829fcd174d9535b46211917c7671"
+
+SRC_URI[md5sum] = "fb31d4c94fef42f2caf9784c44d8ea82"
+SRC_URI[sha256sum] = "98a3b74b1980e6a9392498e3a2a5406f6bd836f412843c2be23d9c88671747ac"
+
+do_install_append() {
+    perm_files=`find "${D}${PYTHON_SITEPACKAGES_DIR}/" -name "*.txt" -o -name "PKG-INFO"`
+    for f in $perm_files; do
+        chmod 644 "${f}"
+    done
+}
+
+UPSTREAM_CHECK_URI = "https://pypi.python.org/pypi/PrettyTable/"
+UPSTREAM_CHECK_REGEX = "/PrettyTable/(?P<pver>(\d+[\.\-_]*)+)"
+
+BBCLASSEXTEND = "native nativesdk"
+inherit pypi ptest setuptools3
+
+SRC_URI += " \
+	file://run-ptest \
+"
+
+DEPENDS += "${PYTHON_PN}-setuptools-scm-native"
+
+RDEPENDS_${PN} += " \
+	${PYTHON_PN}-math \
+	${PYTHON_PN}-html \
+"
+
+RDEPENDS_${PN}-ptest += " \
+	${PYTHON_PN}-pytest \
+"
+
+do_install_ptest() {
+	cp -f ${S}/prettytable_test.py ${D}${PTEST_PATH}/
+}
-- 
cgit v1.2.3-54-g00ecf