python/prettytable: update to 3.10.0

OpenIndiana · Feb 20, 2024 · bb5f8fb · bb5f8fb
1 parent e96c56c
commit bb5f8fb
Show file tree

Hide file tree

Showing 5 changed files with 47 additions and 57 deletions.
diff --git a/components/python/prettytable/Makefile b/components/python/prettytable/Makefile
@@ -19,13 +19,11 @@ BUILD_STYLE = pyproject
 include ../../../make-rules/shared-macros.mk
 
 COMPONENT_NAME =		prettytable
-HUMAN_VERSION =			3.9.0
+HUMAN_VERSION =			3.10.0
 COMPONENT_SUMMARY =		prettytable - A simple Python library for easily displaying tabular data in a visually appealing ASCII table format
 COMPONENT_PROJECT_URL =		https://github.com/jazzband/prettytable
-COMPONENT_ARCHIVE_URL =		\
-	https://files.pythonhosted.org/packages/e1/c0/5e9c4d2a643a00a6f67578ef35485173de273a4567279e4f0c200c01386b/prettytable-3.9.0.tar.gz
 COMPONENT_ARCHIVE_HASH =	\
-	sha256:f4ed94803c23073a90620b201965e5dc0bccf1760b7a7eaf3158cab8aaffdf34
+	sha256:9665594d137fb08a1117518c25551e0ede1687197cf353a4fdc78d27e1073568
 COMPONENT_LICENSE =		BSD-3-Clause
 
 include $(WS_MAKE_RULES)/common.mk
@@ -37,4 +35,4 @@ PYTHON_REQUIRED_PACKAGES += library/python/wcwidth
 PYTHON_REQUIRED_PACKAGES += runtime/python
 TEST_REQUIRED_PACKAGES.python += library/python/pytest
 TEST_REQUIRED_PACKAGES.python += library/python/pytest-cov
-TEST_REQUIRED_PACKAGES.python += library/python/pytest-lazy-fixture
+TEST_REQUIRED_PACKAGES.python += library/python/pytest-lazy-fixtures
diff --git a/components/python/prettytable/history b/components/python/prettytable/history
@@ -1,4 +1,4 @@
-library/python/[email protected],5.11-2021.0.0.4 noincorporate
+library/python/[email protected],5.11-2021.0.0.5
 library/python/[email protected]
-library/python/[email protected],5.11-2021.0.0.4 noincorporate
-library/python/[email protected],5.11-2023.0.0.2 noincorporate
+library/python/[email protected],5.11-2021.0.0.5
+library/python/[email protected],5.11-2023.0.0.3
diff --git a/components/python/prettytable/manifests/sample-manifest.p5m b/components/python/prettytable/manifests/sample-manifest.p5m
@@ -10,7 +10,7 @@
 #
 
 #
-# Copyright 2023 <contributor>
+# Copyright 2024 <contributor>
 #
 
 set name=pkg.fmri value=pkg:/$(COMPONENT_FMRI)-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)

diff --git a/components/python/prettytable/pkg5 b/components/python/prettytable/pkg5
@@ -6,8 +6,8 @@
         "runtime/python-39"
     ],
     "fmris": [
-        "library/python/prettytable-39",
-        "library/python/prettytable"
+        "library/python/prettytable",
+        "library/python/prettytable-39"
     ],
     "name": "prettytable"
-}
+}
diff --git a/components/python/prettytable/test/results-all.master b/components/python/prettytable/test/results-all.master
@@ -1,10 +1,10 @@
 py$(PYV): remove tox env folder $(@D)/.tox/py$(PYV)
-py$(PYV): commands[0]> $(PYTHON) -m pytest --cov prettytable --cov tests --cov-report xml
+py$(PYV): commands[0]> $(PYTHON) -m pytest --cov prettytable --cov tests --cov-report html --cov-report term --cov-report xml
 ============================= test session starts ==============================
 platform sunos5 -- Python $(PYTHON_VERSION).X -- $(PYTHON)
 cachedir: .tox/py$(PYV)/.pytest_cache
 rootdir: $(@D)
-collecting ... collected 164 items
+collecting ... collected 166 items
 
 tests/test_colortable.py::TestColorTable::test_theme_setter PASSED
 tests/test_colortable.py::TestColorTable::test_themeless PASSED
@@ -43,14 +43,14 @@ tests/test_prettytable.py::TestBasic::test_no_blank_lines_with_title PASSED
 tests/test_prettytable.py::TestBasic::test_no_blank_lines_without_border PASSED
 tests/test_prettytable.py::TestBasic::test_no_blank_lines_without_header PASSED
 tests/test_prettytable.py::TestBasic::test_table_rows PASSED
-tests/test_prettytable.py::TestBreakLine::test_break_line_ASCII[rows0-1-\n+---------+-------------+\n| Field 1 |   Field 2   |\n+---------+-------------+\n| value 1 |    value2   |\n|         | second line |\n+---------+-------------+\n| value 3 |    value4   |\n+---------+-------------+\n] PASSED
-tests/test_prettytable.py::TestBreakLine::test_break_line_ASCII[rows1-1-\n+------------+-------------+\n|  Field 1   |   Field 2   |\n+------------+-------------+\n|  value 1   |    value2   |\n|            | second line |\n+------------+-------------+\n|  value 3   |    value4   |\n|            |             |\n| other line |             |\n|            |    value5   |\n+------------+-------------+\n] PASSED
-tests/test_prettytable.py::TestBreakLine::test_break_line_ASCII[rows2-0-\n+------------+-------------+\n|  Field 1   |   Field 2   |\n+------------+-------------+\n|  value 1   |    value2   |\n|            | second line |\n|  value 3   |    value4   |\n|            |             |\n| other line |             |\n|            |    value5   |\n+------------+-------------+\n] PASSED
-tests/test_prettytable.py::TestBreakLine::test_break_line_HTML PASSED
-tests/test_prettytable.py::TestBuildEquivalence::test_equivalence_ASCII[row_prettytable-col_prettytable] PASSED
-tests/test_prettytable.py::TestBuildEquivalence::test_equivalence_ASCII[row_prettytable-mix_prettytable] PASSED
-tests/test_prettytable.py::TestBuildEquivalence::test_equivalence_HTML[row_prettytable-col_prettytable] PASSED
-tests/test_prettytable.py::TestBuildEquivalence::test_equivalence_HTML[row_prettytable-mix_prettytable] PASSED
+tests/test_prettytable.py::TestBreakLine::test_break_line_ascii[rows0-1-\n+---------+-------------+\n| Field 1 |   Field 2   |\n+---------+-------------+\n| value 1 |    value2   |\n|         | second line |\n+---------+-------------+\n| value 3 |    value4   |\n+---------+-------------+\n] PASSED
+tests/test_prettytable.py::TestBreakLine::test_break_line_ascii[rows1-1-\n+------------+-------------+\n|  Field 1   |   Field 2   |\n+------------+-------------+\n|  value 1   |    value2   |\n|            | second line |\n+------------+-------------+\n|  value 3   |    value4   |\n|            |             |\n| other line |             |\n|            |    value5   |\n+------------+-------------+\n] PASSED
+tests/test_prettytable.py::TestBreakLine::test_break_line_ascii[rows2-0-\n+------------+-------------+\n|  Field 1   |   Field 2   |\n+------------+-------------+\n|  value 1   |    value2   |\n|            | second line |\n|  value 3   |    value4   |\n|            |             |\n| other line |             |\n|            |    value5   |\n+------------+-------------+\n] PASSED
+tests/test_prettytable.py::TestBreakLine::test_break_line_html PASSED
+tests/test_prettytable.py::TestBuildEquivalence::test_equivalence_ascii[row_prettytable-col_prettytable] PASSED
+tests/test_prettytable.py::TestBuildEquivalence::test_equivalence_ascii[row_prettytable-mix_prettytable] PASSED
+tests/test_prettytable.py::TestBuildEquivalence::test_equivalence_html[row_prettytable-col_prettytable] PASSED
+tests/test_prettytable.py::TestBuildEquivalence::test_equivalence_html[row_prettytable-mix_prettytable] PASSED
 tests/test_prettytable.py::TestBuildEquivalence::test_equivalence_latex[row_prettytable-col_prettytable] PASSED
 tests/test_prettytable.py::TestBuildEquivalence::test_equivalence_latex[row_prettytable-mix_prettytable] PASSED
 tests/test_prettytable.py::TestClearing::test_clear PASSED
@@ -71,32 +71,33 @@ tests/test_prettytable.py::TestEmptyTable::test_interaction_with_border PASSED
 tests/test_prettytable.py::TestEmptyTable::test_print_empty_false PASSED
 tests/test_prettytable.py::TestEmptyTable::test_print_empty_true PASSED
 tests/test_prettytable.py::TestFieldNameLessTable::test_add_field_names_later PASSED
-tests/test_prettytable.py::TestFieldNameLessTable::test_can_string_ASCII PASSED
-tests/test_prettytable.py::TestFieldNameLessTable::test_can_string_HTML PASSED
+tests/test_prettytable.py::TestFieldNameLessTable::test_can_string_ascii PASSED
+tests/test_prettytable.py::TestFieldNameLessTable::test_can_string_html PASSED
 tests/test_prettytable.py::TestFieldNameLessTable::test_can_string_latex PASSED
 tests/test_prettytable.py::TestFloatFormat::test_no_decimals PASSED
-tests/test_prettytable.py::TestFloatFormat::test_pad_with_2Zeroes PASSED
-tests/test_prettytable.py::TestFloatFormat::test_round_to_5DP PASSED
+tests/test_prettytable.py::TestFloatFormat::test_pad_with_2zeroes PASSED
+tests/test_prettytable.py::TestFloatFormat::test_round_to_5dp PASSED
 tests/test_prettytable.py::TestFromDB::test_non_select_cursor PASSED
+tests/test_prettytable.py::TestGeneralOutput::test_copy PASSED
 tests/test_prettytable.py::TestGeneralOutput::test_csv PASSED
 tests/test_prettytable.py::TestGeneralOutput::test_html PASSED
 tests/test_prettytable.py::TestGeneralOutput::test_invalid PASSED
 tests/test_prettytable.py::TestGeneralOutput::test_json PASSED
 tests/test_prettytable.py::TestGeneralOutput::test_latex PASSED
 tests/test_prettytable.py::TestGeneralOutput::test_text PASSED
-tests/test_prettytable.py::TestHtmlConstructor::test_HtmlAndBack PASSED
-tests/test_prettytable.py::TestHtmlConstructor::test_HtmlOneAndBack PASSED
-tests/test_prettytable.py::TestHtmlConstructor::test_HtmlOneFailOnMany PASSED
-tests/test_prettytable.py::TestHtmlOutput::test_HtmlOutput PASSED
-tests/test_prettytable.py::TestHtmlOutput::test_HtmlOutputFormatted PASSED
-tests/test_prettytable.py::TestHtmlOutput::test_HtmlOutputFormattedWithTitle PASSED
-tests/test_prettytable.py::TestHtmlOutput::test_HtmlOutputWithTitle PASSED
-tests/test_prettytable.py::TestJSONConstructor::test_JSONAndBack PASSED
-tests/test_prettytable.py::TestJSONOutput::test_JSON_output PASSED
-tests/test_prettytable.py::TestJSONOutput::test_JSON_output_options PASSED
-tests/test_prettytable.py::TestLatexOutput::testLatexOutput PASSED
-tests/test_prettytable.py::TestLatexOutput::testLatexOutputFormatted PASSED
-tests/test_prettytable.py::TestLatexOutput::testLatexOutputHeader PASSED
+tests/test_prettytable.py::TestHtmlConstructor::test_html_and_back PASSED
+tests/test_prettytable.py::TestHtmlConstructor::test_html_one_and_back PASSED
+tests/test_prettytable.py::TestHtmlConstructor::test_html_one_fail_on_many PASSED
+tests/test_prettytable.py::TestHtmlOutput::test_html_output PASSED
+tests/test_prettytable.py::TestHtmlOutput::test_html_output_formatted PASSED
+tests/test_prettytable.py::TestHtmlOutput::test_html_output_formatted_with_title PASSED
+tests/test_prettytable.py::TestHtmlOutput::test_html_output_with_title PASSED
+tests/test_prettytable.py::TestJSONConstructor::test_json_and_back PASSED
+tests/test_prettytable.py::TestJSONOutput::test_json_output PASSED
+tests/test_prettytable.py::TestJSONOutput::test_json_output_options PASSED
+tests/test_prettytable.py::TestLatexOutput::test_latex_output PASSED
+tests/test_prettytable.py::TestLatexOutput::test_latex_output_formatted PASSED
+tests/test_prettytable.py::TestLatexOutput::test_latex_output_header PASSED
 tests/test_prettytable.py::TestMaxTableWidth::test_max_table_width PASSED
 tests/test_prettytable.py::TestMinTableWidth::test_min_table_width[15-fields0-20-True-False] PASSED
 tests/test_prettytable.py::TestMinTableWidth::test_min_table_width[16-fields1-21-True-False] PASSED
@@ -135,13 +136,13 @@ tests/test_prettytable.py::TestOptionOverride::test_border PASSED
 tests/test_prettytable.py::TestOptionOverride::test_header PASSED
 tests/test_prettytable.py::TestOptionOverride::test_hrules_all PASSED
 tests/test_prettytable.py::TestOptionOverride::test_hrules_none PASSED
-tests/test_prettytable.py::TestPositionalJunctions::test_Default PASSED
-tests/test_prettytable.py::TestPositionalJunctions::test_HruleAll PASSED
-tests/test_prettytable.py::TestPositionalJunctions::test_NoHeader PASSED
-tests/test_prettytable.py::TestPositionalJunctions::test_VrulesFrameWithTitle PASSED
-tests/test_prettytable.py::TestPositionalJunctions::test_VrulesNone PASSED
-tests/test_prettytable.py::TestPositionalJunctions::test_WithTitle PASSED
-tests/test_prettytable.py::TestPositionalJunctions::test_WithTitleNoHeader PASSED
+tests/test_prettytable.py::TestPositionalJunctions::test_default PASSED
+tests/test_prettytable.py::TestPositionalJunctions::test_hrule_all PASSED
+tests/test_prettytable.py::TestPositionalJunctions::test_no_header PASSED
+tests/test_prettytable.py::TestPositionalJunctions::test_vrules_frame_with_title PASSED
+tests/test_prettytable.py::TestPositionalJunctions::test_vrules_none PASSED
+tests/test_prettytable.py::TestPositionalJunctions::test_with_title PASSED
+tests/test_prettytable.py::TestPositionalJunctions::test_with_title_no_header PASSED
 tests/test_prettytable.py::TestPreservingInternalBorders::test_internal_border_preserved PASSED
 tests/test_prettytable.py::TestPreservingInternalBorders::test_internal_border_preserved_html PASSED
 tests/test_prettytable.py::TestPreservingInternalBorders::test_internal_border_preserved_latex PASSED
@@ -170,18 +171,9 @@ tests/test_prettytable.py::TestUnpaddedTable::test_unbordered PASSED
 tests/test_prettytable.py::test_add_rows PASSED
 tests/test_prettytable.py::test_autoindex PASSED
 tests/test_prettytable.py::test_paginate PASSED
+tests/test_prettytable.py::test_version PASSED
 
 
-======== 164 passed ========
-py$(PYV): commands[1]> python -m coverage report
-Name                                                                                                                                           Stmts   Miss  Cover
-------------------------------------------------------------------------------------------------------------------------------------------------------------------
-$(PROTO_DIR)$(PYTHON_DIR)/vendor-packages/prettytable/__init__.py          5      0   100%
-$(PROTO_DIR)$(PYTHON_DIR)/vendor-packages/prettytable/colortable.py       45      2    96%
-$(PROTO_DIR)$(PYTHON_DIR)/vendor-packages/prettytable/prettytable.py    1406    118    92%
-tests/test_colortable.py                                                                                                                          59      0   100%
-tests/test_prettytable.py                                                                                                                        845      0   100%
-------------------------------------------------------------------------------------------------------------------------------------------------------------------
-TOTAL                                                                                                                                           2360    120    95%
+======== 166 passed ========
   py$(PYV): OK
   congratulations :)
-Original file line number
+Diff line change
@@ Expand Up / @@ -10,7 +10,7 @@ @@
     #
     #
-    # Copyright 2023 <contributor>
+    # Copyright 2024 <contributor>
     #
     set name=pkg.fmri value=pkg:/$(COMPONENT_FMRI)-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
@@ Expand Down @@