Hello community,
here is the log from the commit of package python-pygments-ansi-color for
openSUSE:Leap:15.2 checked in at 2020-03-29 14:55:44
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Leap:15.2/python-pygments-ansi-color (Old)
and /work/SRC/openSUSE:Leap:15.2/.python-pygments-ansi-color.new.3160
(New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-pygments-ansi-color"
Sun Mar 29 14:55:44 2020 rev:2 rq:789143 version:0.0.5
Changes:
--------
---
/work/SRC/openSUSE:Leap:15.2/python-pygments-ansi-color/python-pygments-ansi-color.changes
2020-02-22 18:49:35.200378231 +0100
+++
/work/SRC/openSUSE:Leap:15.2/.python-pygments-ansi-color.new.3160/python-pygments-ansi-color.changes
2020-03-29 14:55:45.171160708 +0200
@@ -1,0 +2,7 @@
+Fri Mar 20 10:41:33 UTC 2020 - Marketa Calabkova <[email protected]>
+
+- Update to 0.0.5
+ * Replace hardcoded 256 color palette with some math
+ * Add support for faint
+
+-------------------------------------------------------------------
Old:
----
v0.0.3.tar.gz
New:
----
v0.0.5.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-pygments-ansi-color.spec ++++++
--- /var/tmp/diff_new_pack.LzCStr/_old 2020-03-29 14:55:45.519160980 +0200
+++ /var/tmp/diff_new_pack.LzCStr/_new 2020-03-29 14:55:45.523160983 +0200
@@ -1,7 +1,7 @@
#
# spec file for package python-pygments-ansi-color
#
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -18,12 +18,12 @@
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
Name: python-pygments-ansi-color
-Version: 0.0.3
+Version: 0.0.5
Release: 0
Summary: ANSI color-code highlighting for Pygments
License: Apache-2.0
Group: Development/Languages/Python
-Url: https://github.com/chriskuehl/pygments-ansi-color
+URL: https://github.com/chriskuehl/pygments-ansi-color
Source:
https://github.com/chriskuehl/pygments-ansi-color/archive/v%{version}.tar.gz
BuildRequires: %{python_module pygments}
BuildRequires: %{python_module pytest}
++++++ v0.0.3.tar.gz -> v0.0.5.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pygments-ansi-color-0.0.3/.pre-commit-config.yaml
new/pygments-ansi-color-0.0.5/.pre-commit-config.yaml
--- old/pygments-ansi-color-0.0.3/.pre-commit-config.yaml 2019-07-24
23:23:57.000000000 +0200
+++ new/pygments-ansi-color-0.0.5/.pre-commit-config.yaml 2020-01-07
20:36:45.000000000 +0100
@@ -1,22 +1,28 @@
repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
- sha: v0.7.1
+ rev: v2.4.0
hooks:
- id: trailing-whitespace
- id: end-of-file-fixer
- - id: autopep8-wrapper
- id: check-docstring-first
- id: check-merge-conflict
- id: check-yaml
- id: debug-statements
- id: double-quote-string-fixer
- id: name-tests-test
- - id: flake8
- id: check-added-large-files
- id: check-byte-order-marker
- id: fix-encoding-pragma
+- repo: https://github.com/pre-commit/mirrors-autopep8
+ rev: v1.4.4
+ hooks:
+ - id: autopep8
+- repo: https://gitlab.com/pycqa/flake8
+ rev: 3.7.9
+ hooks:
+ - id: flake8
- repo: https://github.com/asottile/reorder_python_imports
- sha: v0.3.1
+ rev: v1.8.0
hooks:
- id: reorder-python-imports
args: [
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pygments-ansi-color-0.0.3/README.md
new/pygments-ansi-color-0.0.5/README.md
--- old/pygments-ansi-color-0.0.3/README.md 2019-07-24 23:23:57.000000000
+0200
+++ new/pygments-ansi-color-0.0.5/README.md 2020-01-07 20:36:45.000000000
+0100
@@ -120,5 +120,5 @@
Once these two changes have been made, you can use pygments-ansi-color as
normal.
-[fluffy-example]: https://i.fluffy.cc/zr9RVt0gcrVtKH06hkqRCJPP1S91z3Mz.html
+[fluffy-example]: https://i.fluffy.cc/3Gq7Fg86mv3dX30Qx9LHMWcKMqsQLCtd.html
[256-color]: https://en.wikipedia.org/wiki/ANSI_escape_code#8-bit
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pygments-ansi-color-0.0.3/pygments_ansi_color.py
new/pygments-ansi-color-0.0.5/pygments_ansi_color.py
--- old/pygments-ansi-color-0.0.3/pygments_ansi_color.py 2019-07-24
23:23:57.000000000 +0200
+++ new/pygments-ansi-color-0.0.5/pygments_ansi_color.py 2020-01-07
20:36:45.000000000 +0100
@@ -42,250 +42,19 @@
13: '#ff00ff',
14: '#00ffff',
15: '#ffffff',
- 16: '#000000',
- 17: '#00005f',
- 18: '#000087',
- 19: '#0000af',
- 20: '#0000d7',
- 21: '#0000ff',
- 22: '#005f00',
- 23: '#005f5f',
- 24: '#005f87',
- 25: '#005faf',
- 26: '#005fd7',
- 27: '#005fff',
- 28: '#008700',
- 29: '#00875f',
- 30: '#008787',
- 31: '#0087af',
- 32: '#0087d7',
- 33: '#0087ff',
- 34: '#00af00',
- 35: '#00af5f',
- 36: '#00af87',
- 37: '#00afaf',
- 38: '#00afd7',
- 39: '#00afff',
- 40: '#00d700',
- 41: '#00d75f',
- 42: '#00d787',
- 43: '#00d7af',
- 44: '#00d7d7',
- 45: '#00d7ff',
- 46: '#00ff00',
- 47: '#00ff5f',
- 48: '#00ff87',
- 49: '#00ffaf',
- 50: '#00ffd7',
- 51: '#00ffff',
- 52: '#5f0000',
- 53: '#5f005f',
- 54: '#5f0087',
- 55: '#5f00af',
- 56: '#5f00d7',
- 57: '#5f00ff',
- 58: '#5f5f00',
- 59: '#5f5f5f',
- 60: '#5f5f87',
- 61: '#5f5faf',
- 62: '#5f5fd7',
- 63: '#5f5fff',
- 64: '#5f8700',
- 65: '#5f875f',
- 66: '#5f8787',
- 67: '#5f87af',
- 68: '#5f87d7',
- 69: '#5f87ff',
- 70: '#5faf00',
- 71: '#5faf5f',
- 72: '#5faf87',
- 73: '#5fafaf',
- 74: '#5fafd7',
- 75: '#5fafff',
- 76: '#5fd700',
- 77: '#5fd75f',
- 78: '#5fd787',
- 79: '#5fd7af',
- 80: '#5fd7d7',
- 81: '#5fd7ff',
- 82: '#5fff00',
- 83: '#5fff5f',
- 84: '#5fff87',
- 85: '#5fffaf',
- 86: '#5fffd7',
- 87: '#5fffff',
- 88: '#870000',
- 89: '#87005f',
- 90: '#870087',
- 91: '#8700af',
- 92: '#8700d7',
- 93: '#8700ff',
- 94: '#875f00',
- 95: '#875f5f',
- 96: '#875f87',
- 97: '#875faf',
- 98: '#875fd7',
- 99: '#875fff',
- 100: '#878700',
- 101: '#87875f',
- 102: '#878787',
- 103: '#8787af',
- 104: '#8787d7',
- 105: '#8787ff',
- 106: '#87af00',
- 107: '#87af5f',
- 108: '#87af87',
- 109: '#87afaf',
- 110: '#87afd7',
- 111: '#87afff',
- 112: '#87d700',
- 113: '#87d75f',
- 114: '#87d787',
- 115: '#87d7af',
- 116: '#87d7d7',
- 117: '#87d7ff',
- 118: '#87ff00',
- 119: '#87ff5f',
- 120: '#87ff87',
- 121: '#87ffaf',
- 122: '#87ffd7',
- 123: '#87ffff',
- 124: '#af0000',
- 125: '#af005f',
- 126: '#af0087',
- 127: '#af00af',
- 128: '#af00d7',
- 129: '#af00ff',
- 130: '#af5f00',
- 131: '#af5f5f',
- 132: '#af5f87',
- 133: '#af5faf',
- 134: '#af5fd7',
- 135: '#af5fff',
- 136: '#af8700',
- 137: '#af875f',
- 138: '#af8787',
- 139: '#af87af',
- 140: '#af87d7',
- 141: '#af87ff',
- 142: '#afaf00',
- 143: '#afaf5f',
- 144: '#afaf87',
- 145: '#afafaf',
- 146: '#afafd7',
- 147: '#afafff',
- 148: '#afd700',
- 149: '#afd75f',
- 150: '#afd787',
- 151: '#afd7af',
- 152: '#afd7d7',
- 153: '#afd7ff',
- 154: '#afff00',
- 155: '#afff5f',
- 156: '#afff87',
- 157: '#afffaf',
- 158: '#afffd7',
- 159: '#afffff',
- 160: '#d70000',
- 161: '#d7005f',
- 162: '#d70087',
- 163: '#d700af',
- 164: '#d700d7',
- 165: '#d700ff',
- 166: '#d75f00',
- 167: '#d75f5f',
- 168: '#d75f87',
- 169: '#d75faf',
- 170: '#d75fd7',
- 171: '#d75fff',
- 172: '#d78700',
- 173: '#d7875f',
- 174: '#d78787',
- 175: '#d787af',
- 176: '#d787d7',
- 177: '#d787ff',
- 178: '#d7af00',
- 179: '#d7af5f',
- 180: '#d7af87',
- 181: '#d7afaf',
- 182: '#d7afd7',
- 183: '#d7afff',
- 184: '#d7d700',
- 185: '#d7d75f',
- 186: '#d7d787',
- 187: '#d7d7af',
- 188: '#d7d7d7',
- 189: '#d7d7ff',
- 190: '#d7ff00',
- 191: '#d7ff5f',
- 192: '#d7ff87',
- 193: '#d7ffaf',
- 194: '#d7ffd7',
- 195: '#d7ffff',
- 196: '#ff0000',
- 197: '#ff005f',
- 198: '#ff0087',
- 199: '#ff00af',
- 200: '#ff00d7',
- 201: '#ff00ff',
- 202: '#ff5f00',
- 203: '#ff5f5f',
- 204: '#ff5f87',
- 205: '#ff5faf',
- 206: '#ff5fd7',
- 207: '#ff5fff',
- 208: '#ff8700',
- 209: '#ff875f',
- 210: '#ff8787',
- 211: '#ff87af',
- 212: '#ff87d7',
- 213: '#ff87ff',
- 214: '#ffaf00',
- 215: '#ffaf5f',
- 216: '#ffaf87',
- 217: '#ffafaf',
- 218: '#ffafd7',
- 219: '#ffafff',
- 220: '#ffd700',
- 221: '#ffd75f',
- 222: '#ffd787',
- 223: '#ffd7af',
- 224: '#ffd7d7',
- 225: '#ffd7ff',
- 226: '#ffff00',
- 227: '#ffff5f',
- 228: '#ffff87',
- 229: '#ffffaf',
- 230: '#ffffd7',
- 231: '#ffffff',
- 232: '#080808',
- 233: '#121212',
- 234: '#1c1c1c',
- 235: '#262626',
- 236: '#303030',
- 237: '#3a3a3a',
- 238: '#444444',
- 239: '#4e4e4e',
- 240: '#585858',
- 241: '#626262',
- 242: '#6c6c6c',
- 243: '#767676',
- 244: '#808080',
- 245: '#8a8a8a',
- 246: '#949494',
- 247: '#9e9e9e',
- 248: '#a8a8a8',
- 249: '#b2b2b2',
- 250: '#bcbcbc',
- 251: '#c6c6c6',
- 252: '#d0d0d0',
- 253: '#dadada',
- 254: '#e4e4e4',
- 255: '#eeeeee',
}
+_vals = (0, 95, 135, 175, 215, 255)
+_256_colors.update({
+ 16 + i: '#{:02x}{:02x}{:02x}'.format(*rgb)
+ for i, rgb in enumerate(itertools.product(_vals, _vals, _vals))
+})
+_256_colors.update({
+ 232 + i: '#{0:02x}{0:02x}{0:02x}'.format(10 * i + 8)
+ for i in range(24)
+})
-def _token_from_lexer_state(bold, fg_color, bg_color):
+def _token_from_lexer_state(bold, faint, fg_color, bg_color):
"""Construct a token given the current lexer state.
We can only emit one token even though we have a multiple-tuple state.
@@ -296,6 +65,9 @@
if bold:
components += ('Bold',)
+ if faint:
+ components += ('Faint',)
+
if fg_color:
components += (fg_color,)
@@ -352,6 +124,7 @@
if enable_256color:
styles[pygments.token.Token.C.Bold] = 'bold'
+ styles[pygments.token.Token.C.Faint] = ''
for i, color in _256_colors.items():
styles[getattr(pygments.token.Token.C, 'C{}'.format(i))] = color
styles[getattr(pygments.token.Token.C, 'BGC{}'.format(i))] =
'bg:{}'.format(color)
@@ -362,12 +135,13 @@
for color, value in bg_colors.items():
styles[getattr(C, 'BG{}'.format(color))] = 'bg:{}'.format(value)
else:
- for bold, fg_color, bg_color in itertools.product(
+ for bold, faint, fg_color, bg_color in itertools.product(
+ (False, True),
(False, True),
{None} | set(fg_colors),
{None} | set(bg_colors),
):
- token = _token_from_lexer_state(bold, fg_color, bg_color)
+ token = _token_from_lexer_state(bold, faint, fg_color, bg_color)
if token is not pygments.token.Text:
value = []
if bold:
@@ -392,13 +166,14 @@
def reset_state(self):
self.bold = False
+ self.faint = False
self.fg_color = None
self.bg_color = None
@property
def current_token(self):
return _token_from_lexer_state(
- self.bold, self.fg_color, self.bg_color,
+ self.bold, self.faint, self.fg_color, self.bg_color,
)
def process(self, match):
@@ -451,8 +226,11 @@
self.bg_color = bg_color
elif value == 1:
self.bold = True
+ elif value == 2:
+ self.faint = True
elif value == 22:
self.bold = False
+ self.faint = False
elif value == 39:
self.fg_color = None
elif value == 49:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pygments-ansi-color-0.0.3/setup.py
new/pygments-ansi-color-0.0.5/setup.py
--- old/pygments-ansi-color-0.0.3/setup.py 2019-07-24 23:23:57.000000000
+0200
+++ new/pygments-ansi-color-0.0.5/setup.py 2020-01-07 20:36:45.000000000
+0100
@@ -7,7 +7,7 @@
setup(
name='pygments-ansi-color',
- version='0.0.3',
+ version='0.0.5',
classifiers=[
'License :: OSI Approved :: Apache Software License',
'Programming Language :: Python :: 2',
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/pygments-ansi-color-0.0.3/tests/pygments_ansi_color_test.py
new/pygments-ansi-color-0.0.5/tests/pygments_ansi_color_test.py
--- old/pygments-ansi-color-0.0.3/tests/pygments_ansi_color_test.py
2019-07-24 23:23:57.000000000 +0200
+++ new/pygments-ansi-color-0.0.5/tests/pygments_ansi_color_test.py
2020-01-07 20:36:45.000000000 +0100
@@ -15,16 +15,18 @@
@pytest.mark.parametrize(
- ('bold', 'fg_color', 'bg_color', 'expected'),
+ ('bold', 'faint', 'fg_color', 'bg_color', 'expected'),
(
- (False, False, False, Text),
- (True, False, False, Color.Bold),
- (True, 'Red', False, Color.Bold.Red),
- (True, 'Red', 'Blue', Color.Bold.Red.BGBlue),
+ (False, False, False, False, Text),
+ (True, False, False, False, Color.Bold),
+ (True, False, 'Red', False, Color.Bold.Red),
+ (True, False, 'Red', 'Blue', Color.Bold.Red.BGBlue),
+ (True, True, 'Red', 'Blue', Color.Bold.Faint.Red.BGBlue),
),
)
-def test_token_from_lexer_state(bold, fg_color, bg_color, expected):
- assert main._token_from_lexer_state(bold, fg_color, bg_color) == expected
+def test_token_from_lexer_state(bold, faint, fg_color, bg_color, expected):
+ ret = main._token_from_lexer_state(bold, faint, fg_color, bg_color)
+ assert ret == expected
def test_color_tokens():
@@ -36,8 +38,16 @@
Color.Bold.BGGreen: 'bold bg:#00ff00',
Color.Bold.Red: 'bold #ff0000',
Color.Bold.Red.BGGreen: 'bold #ff0000 bg:#00ff00',
+ Color.Bold.Faint: 'bold',
+ Color.Bold.Faint.BGGreen: 'bold bg:#00ff00',
+ Color.Bold.Faint.Red: 'bold #ff0000',
+ Color.Bold.Faint.Red.BGGreen: 'bold #ff0000 bg:#00ff00',
Color.Red: '#ff0000',
Color.Red.BGGreen: '#ff0000 bg:#00ff00',
+ Color.Faint: '',
+ Color.Faint.BGGreen: 'bg:#00ff00',
+ Color.Faint.Red: '#ff0000',
+ Color.Faint.Red.BGGreen: '#ff0000 bg:#00ff00',
}
@@ -56,6 +66,7 @@
C.Red: '#ff0000',
C.BGGreen: 'bg:#00ff00',
C.Bold: 'bold',
+ C.Faint: '',
})
assert main.color_tokens(fg_colors, bg_colors,
enable_256color=True) == expected
@@ -81,6 +92,7 @@
'\x1b[1mbold text\n'
'\x1b[43mbold from previous line with yellow bg\n'
'\x1b[49mbg color turned off\n'
+ '\x1b[2mfaint turned on\n'
'\x1b[22mbold turned off\n'
) == (
(Text, 'plain text\n'),
@@ -91,6 +103,7 @@
(Color.Bold, 'bold text\n'),
(Color.Bold.BGYellow, 'bold from previous line with yellow bg\n'),
(Color.Bold, 'bg color turned off\n'),
+ (Color.Bold.Faint, 'faint turned on\n'),
(Text, 'bold turned off\n'),
)
