Skip to content

Commit be3f129

Browse files
robot-pigletrobot-piglet
committed
Intermediate changes
commit_hash:3686ebe90c261233292d0ccb4dc131386ef2b33a
1 parent 7de4791 commit be3f129

File tree

9 files changed

+695
-369
lines changed

9 files changed

+695
-369
lines changed

‎contrib/python/prettytable/py3/.dist-info/METADATA

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
Metadata-Version: 2.3
22
Name: prettytable
3-
Version: 3.11.0
3+
Version: 3.12.0
44
Summary: A simple Python library for easily displaying tabular data in a visually appealing ASCII table format
5-
Project-URL: Changelog, https://github.com/jazzband/prettytable/releases
6-
Project-URL: Homepage, https://github.com/jazzband/prettytable
7-
Project-URL: Source, https://github.com/jazzband/prettytable
5+
Project-URL: Changelog, https://github.com/prettytable/prettytable/releases
6+
Project-URL: Funding, https://tidelift.com/subscription/pkg/pypi-prettytable?utm_source=pypi-prettytable&utm_medium=pypi
7+
Project-URL: Homepage, https://github.com/prettytable/prettytable
8+
Project-URL: Source, https://github.com/prettytable/prettytable
89
Author-email: Luke Maurits <luke@maurits.id.au>
9-
Maintainer: Jazzband
10-
License: BSD (3 clause)
10+
Maintainer: Hugo van Kemenade
11+
License-Expression: BSD-3-Clause
1112
License-File: LICENSE
1213
Classifier: License :: OSI Approved :: BSD License
1314
Classifier: Programming Language :: Python
1415
Classifier: Programming Language :: Python :: 3 :: Only
15-
Classifier: Programming Language :: Python :: 3.8
1616
Classifier: Programming Language :: Python :: 3.9
1717
Classifier: Programming Language :: Python :: 3.10
1818
Classifier: Programming Language :: Python :: 3.11
@@ -22,7 +22,7 @@ Classifier: Programming Language :: Python :: Implementation :: CPython
2222
Classifier: Programming Language :: Python :: Implementation :: PyPy
2323
Classifier: Topic :: Text Processing
2424
Classifier: Typing :: Typed
25-
Requires-Python: >=3.8
25+
Requires-Python: >=3.9
2626
Requires-Dist: wcwidth
2727
Provides-Extra: tests
2828
Requires-Dist: pytest; extra == 'tests'
@@ -32,13 +32,13 @@ Description-Content-Type: text/markdown
3232

3333
# PrettyTable
3434

35-
[![Jazzband](https://jazzband.co/static/img/badge.svg)](https://jazzband.co/)
3635
[![PyPI version](https://img.shields.io/pypi/v/prettytable.svg?logo=pypi&logoColor=FFE873)](https://pypi.org/project/prettytable/)
3736
[![Supported Python versions](https://img.shields.io/pypi/pyversions/prettytable.svg?logo=python&logoColor=FFE873)](https://pypi.org/project/prettytable/)
3837
[![PyPI downloads](https://img.shields.io/pypi/dm/prettytable.svg)](https://pypistats.org/packages/prettytable)
39-
[![GitHub Actions status](https://github.com/jazzband/prettytable/workflows/Test/badge.svg)](https://github.com/jazzband/prettytable/actions)
40-
[![codecov](https://codecov.io/gh/jazzband/prettytable/branch/main/graph/badge.svg)](https://codecov.io/gh/jazzband/prettytable)
41-
[![Code style: Black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black)
38+
[![GitHub Actions status](https://github.com/prettytable/prettytable/workflows/Test/badge.svg)](https://github.com/prettytable/prettytable/actions)
39+
[![codecov](https://codecov.io/gh/prettytable/prettytable/branch/main/graph/badge.svg)](https://codecov.io/gh/prettytable/prettytable)
40+
[![Code style: Black](https://img.shields.io/badge/code%20style-Black-000000.svg)](https://github.com/psf/black)
41+
[![Tidelift](https://tidelift.com/badges/package/pypi/prettytable)](https://tidelift.com/subscription/pkg/pypi-prettytable?utm_source=pypi-prettytable&utm_medium=badge)
4242

4343
PrettyTable lets you print tables in an attractive ASCII form:
4444

@@ -64,11 +64,11 @@ Install via pip:
6464

6565
Install latest development version:
6666

67-
python -m pip install -U git+https://github.com/jazzband/prettytable
67+
python -m pip install -U git+https://github.com/prettytable/prettytable
6868

6969
Or from `requirements.txt`:
7070

71-
-e git://github.com/jazzband/prettytable.git#egg=prettytable
71+
-e git://github.com/prettytable/prettytable.git#egg=prettytable
7272

7373
## Tutorial on how to use the PrettyTable API
7474

‎contrib/python/prettytable/py3/README.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
# PrettyTable
22

3-
[![Jazzband](https://jazzband.co/static/img/badge.svg)](https://jazzband.co/)
43
[![PyPI version](https://img.shields.io/pypi/v/prettytable.svg?logo=pypi&logoColor=FFE873)](https://pypi.org/project/prettytable/)
54
[![Supported Python versions](https://img.shields.io/pypi/pyversions/prettytable.svg?logo=python&logoColor=FFE873)](https://pypi.org/project/prettytable/)
65
[![PyPI downloads](https://img.shields.io/pypi/dm/prettytable.svg)](https://pypistats.org/packages/prettytable)
7-
[![GitHub Actions status](https://github.com/jazzband/prettytable/workflows/Test/badge.svg)](https://github.com/jazzband/prettytable/actions)
8-
[![codecov](https://codecov.io/gh/jazzband/prettytable/branch/main/graph/badge.svg)](https://codecov.io/gh/jazzband/prettytable)
9-
[![Code style: Black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black)
6+
[![GitHub Actions status](https://github.com/prettytable/prettytable/workflows/Test/badge.svg)](https://github.com/prettytable/prettytable/actions)
7+
[![codecov](https://codecov.io/gh/prettytable/prettytable/branch/main/graph/badge.svg)](https://codecov.io/gh/prettytable/prettytable)
8+
[![Code style: Black](https://img.shields.io/badge/code%20style-Black-000000.svg)](https://github.com/psf/black)
9+
[![Tidelift](https://tidelift.com/badges/package/pypi/prettytable)](https://tidelift.com/subscription/pkg/pypi-prettytable?utm_source=pypi-prettytable&utm_medium=badge)
1010

1111
PrettyTable lets you print tables in an attractive ASCII form:
1212

@@ -32,11 +32,11 @@ Install via pip:
3232

3333
Install latest development version:
3434

35-
python -m pip install -U git+https://github.com/jazzband/prettytable
35+
python -m pip install -U git+https://github.com/prettytable/prettytable
3636

3737
Or from `requirements.txt`:
3838

39-
-e git://github.com/jazzband/prettytable.git#egg=prettytable
39+
-e git://github.com/prettytable/prettytable.git#egg=prettytable
4040

4141
## Tutorial on how to use the PrettyTable API
4242

‎contrib/python/prettytable/py3/prettytable/__init__.py

Lines changed: 25 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,27 @@
22

33
from typing import Any
44

5-
from .prettytable import (
6-
ALL,
7-
DEFAULT,
8-
DOUBLE_BORDER,
9-
FRAME,
10-
HEADER,
11-
MARKDOWN,
12-
MSWORD_FRIENDLY,
13-
NONE,
14-
ORGMODE,
15-
PLAIN_COLUMNS,
16-
RANDOM,
17-
SINGLE_BORDER,
5+
from ._version import __version__
6+
from .prettytable import ( # noqa: F401
7+
_DEPRECATED_ALL,
8+
_DEPRECATED_DEFAULT,
9+
_DEPRECATED_DOUBLE_BORDER,
10+
_DEPRECATED_FRAME,
11+
_DEPRECATED_HEADER,
12+
_DEPRECATED_MARKDOWN,
13+
_DEPRECATED_MSWORD_FRIENDLY,
14+
_DEPRECATED_NONE,
15+
_DEPRECATED_ORGMODE,
16+
_DEPRECATED_PLAIN_COLUMNS,
17+
_DEPRECATED_RANDOM,
18+
_DEPRECATED_SINGLE_BORDER,
19+
HRuleStyle,
1820
PrettyTable,
21+
RowType,
1922
TableHandler,
23+
TableStyle,
24+
VRuleStyle,
25+
_warn_deprecation,
2026
from_csv,
2127
from_db_cursor,
2228
from_html,
@@ -37,21 +43,20 @@
3743
"ORGMODE",
3844
"PLAIN_COLUMNS",
3945
"RANDOM",
46+
"HRuleStyle",
4047
"PrettyTable",
48+
"RowType",
4149
"TableHandler",
50+
"TableStyle",
51+
"VRuleStyle",
4252
"from_csv",
4353
"from_db_cursor",
4454
"from_html",
4555
"from_html_one",
4656
"from_json",
57+
"__version__",
4758
]
4859

4960

5061
def __getattr__(name: str) -> Any:
51-
if name == "__version__":
52-
import importlib.metadata
53-
54-
return importlib.metadata.version(__name__)
55-
56-
msg = f"module '{__name__}' has no attribute '{name}'"
57-
raise AttributeError(msg)
62+
return _warn_deprecation(name, module_globals=globals())

‎contrib/python/prettytable/py3/prettytable/_version.py

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
# file generated by setuptools_scm
2+
# don't change, don't track in version control
3+
TYPE_CHECKING = False
4+
if TYPE_CHECKING:
5+
from typing import Tuple, Union
6+
VERSION_TUPLE = Tuple[Union[int, str], ...]
7+
else:
8+
VERSION_TUPLE = object
9+
10+
version: str
11+
__version__: str
12+
__version_tuple__: VERSION_TUPLE
13+
version_tuple: VERSION_TUPLE
14+
15+
__version__ = version = '3.12.0'
16+
__version_tuple__ = version_tuple = (3, 12, 0)

‎contrib/python/prettytable/py3/prettytable/colortable.py

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,54 @@ def format_code(s: str) -> str:
4545

4646
class Themes:
4747
DEFAULT = Theme()
48+
DYSLEXIA_FRIENDLY = Theme(
49+
default_color="38;5;223",
50+
vertical_color="38;5;22",
51+
horizontal_color="38;5;22",
52+
junction_color="38;5;58",
53+
)
54+
EARTH = Theme(
55+
default_color="33",
56+
vertical_color="38;5;94",
57+
horizontal_color="38;5;22",
58+
junction_color="38;5;130",
59+
)
60+
GLARE_REDUCTION = Theme(
61+
default_color="38;5;252",
62+
vertical_color="38;5;240",
63+
horizontal_color="38;5;240",
64+
junction_color="38;5;246",
65+
)
66+
HIGH_CONTRAST = Theme(
67+
default_color="97",
68+
vertical_color="91",
69+
horizontal_color="94",
70+
junction_color="93",
71+
)
72+
LAVENDER = Theme(
73+
default_color="38;5;183",
74+
vertical_color="35",
75+
horizontal_color="38;5;147",
76+
junction_color="38;5;219",
77+
)
4878
OCEAN = Theme(
4979
default_color="96",
5080
vertical_color="34",
5181
horizontal_color="34",
5282
junction_color="36",
5383
)
84+
OCEAN_DEEP = Theme(
85+
default_color="96",
86+
vertical_color="34",
87+
horizontal_color="36",
88+
junction_color="94",
89+
)
90+
PASTEL = Theme(
91+
default_color="38;5;223",
92+
vertical_color="38;5;152",
93+
horizontal_color="38;5;187",
94+
junction_color="38;5;157",
95+
)
5496

5597

5698
class ColorTable(PrettyTable):

0 commit comments

Comments
 (0)