Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package python-pygments-ansi-color for
openSUSE:Factory checked in at 2023-09-08 21:15:10
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-pygments-ansi-color (Old)
and /work/SRC/openSUSE:Factory/.python-pygments-ansi-color.new.1766 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-pygments-ansi-color"
Fri Sep 8 21:15:10 2023 rev:7 rq:1109534 version:0.3.0
Changes:
--------
---
/work/SRC/openSUSE:Factory/python-pygments-ansi-color/python-pygments-ansi-color.changes
2023-05-11 12:31:30.850121556 +0200
+++
/work/SRC/openSUSE:Factory/.python-pygments-ansi-color.new.1766/python-pygments-ansi-color.changes
2023-09-08 21:15:33.426505059 +0200
@@ -1,0 +2,7 @@
+Thu Sep 7 11:46:08 UTC 2023 - Dirk Müller <[email protected]>
+
+- update to 0.3.0:
+ * Set default style theme
+ * update tests
+
+-------------------------------------------------------------------
Old:
----
v0.2.0.tar.gz
New:
----
v0.3.0.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-pygments-ansi-color.spec ++++++
--- /var/tmp/diff_new_pack.XW8G4x/_old 2023-09-08 21:15:34.482542802 +0200
+++ /var/tmp/diff_new_pack.XW8G4x/_new 2023-09-08 21:15:34.486542944 +0200
@@ -16,10 +16,9 @@
#
-%{?!python_module:%define python_module() python-%{**} python3-%{**}}
%{?sle15_python_module_pythons}
Name: python-pygments-ansi-color
-Version: 0.2.0
+Version: 0.3.0
Release: 0
Summary: ANSI color-code highlighting for Pygments
License: Apache-2.0
++++++ v0.2.0.tar.gz -> v0.3.0.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pygments-ansi-color-0.2.0/.pre-commit-config.yaml
new/pygments-ansi-color-0.3.0/.pre-commit-config.yaml
--- old/pygments-ansi-color-0.2.0/.pre-commit-config.yaml 2023-02-22
20:03:20.000000000 +0100
+++ new/pygments-ansi-color-0.3.0/.pre-commit-config.yaml 2023-05-19
00:43:56.000000000 +0200
@@ -13,14 +13,14 @@
- id: check-added-large-files
- id: check-byte-order-marker
- repo: https://github.com/pre-commit/mirrors-autopep8
- rev: v2.0.1
+ rev: v2.0.2
hooks:
- id: autopep8
- repo: https://github.com/PyCQA/flake8
rev: 6.0.0
hooks:
- id: flake8
-- repo: https://github.com/asottile/reorder_python_imports
+- repo: https://github.com/asottile/reorder-python-imports
rev: v3.9.0
hooks:
- id: reorder-python-imports
@@ -29,7 +29,7 @@
'--add-import', 'from __future__ import annotations',
]
- repo: https://github.com/asottile/pyupgrade
- rev: v3.3.1
+ rev: v3.4.0
hooks:
- id: pyupgrade
args: ['--py37-plus']
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pygments-ansi-color-0.2.0/README.md
new/pygments-ansi-color-0.3.0/README.md
--- old/pygments-ansi-color-0.2.0/README.md 2023-02-22 20:03:20.000000000
+0100
+++ new/pygments-ansi-color-0.3.0/README.md 2023-05-19 00:43:56.000000000
+0200
@@ -1,5 +1,5 @@
pygments-ansi-color
---------
+-------------------
[](https://travis-ci.org/chriskuehl/pygments-ansi-color)
[](https://coveralls.io/github/chriskuehl/pygments-ansi-color?branch=master)
@@ -10,49 +10,37 @@
-### Usage
+### Basic usage
-1. `pip install pygments-ansi-color`
+1. Install `pygments-ansi-color`:
-2. Configure your Pygments style with the appropriate color tokens. It's
- necessary to add additional tokens because existing Pygments lexers are
- built around contextual tokens (think "Comment" or "String") rather than
- actual colors.
+ ```shell-session
+ $ pip install pygments-ansi-color
+ ```
- In the case of ANSI escape sequences, colors have no context beyond the
- color themselves; we'd always want a "red" rendered as "red", regardless of
- your particular theme.
+2. `pygments-ansi-color` is not magic (yet?), so you need to [choose an exising
+ Pygments style](https://pygments.org/styles/), which will be used as a base
+ for your own style.
+
+ For example, let's choose `pygments.styles.xcode.XcodeStyle`, which looks
+ great to use. And then we will augment this reference style with
+ `pygments-ansi-color`'s color tokens thanks to the `color_tokens` function,
+ to make our final `MyStyle` custom style.
- Here's an example:
+ Here is how the code looks like:
```python
from pygments_ansi_color import color_tokens
- # Note: You can use different background colors for improved readability.
- fg_colors = bg_colors = {
- 'Black': '#000000',
- 'Red': '#EF2929',
- 'Green': '#8AE234',
- 'Yellow': '#FCE94F',
- 'Blue': '#3465A4',
- 'Magenta': '#c509c5',
- 'Cyan': '#34E2E2',
- 'White': '#F5F5F5',
- 'BrightBlack': '#676767',
- 'BrightRed': '#FF6D67',
- 'BrightGreen': '#5FF967',
- 'BrightYellow': '#FEFB67',
- 'BrightBlue': '#6871FF',
- 'BrightMagenta': '#FF76FF',
- 'BrightCyan': '#5FFDFF',
- 'BrightWhite': '#FEFFFF',
- }
class MyStyle(pygments.styles.xcode.XcodeStyle):
styles = dict(pygments.styles.xcode.XcodeStyle.styles)
- styles.update(color_tokens(fg_colors, bg_colors))
+ styles.update(color_tokens())
```
-3. Render your code!
+ That's all the custom code you need to integrate with `pygments-ansi-color`.
+
+3. Now you can highlight your content with the dedicated ANSI lexer and your
+ custom style, with the Pygments regular API:
```python
import pygments
@@ -64,8 +52,62 @@
print(pygments.highlight('your text', lexer, formatter))
```
+### Design
+
+We had to configure above a custom Pygments style with the appropriate color
+tokens. That's because existing Pygments lexers are built around contextual
+tokens (think `Comment` or `Punctuation`) rather than actual colors.
+
+In the case of ANSI escape sequences, colors have no context beyond the color
+themselves; we'd always want a `red` rendered as `red`, regardless of your
+particular theme.
+
+
+### Custom theme
+
+By default, `pygments-ansi-color` maps ANSI codes to its own set of colors.
+They have been carefully crafted for readability, and are [loosely based on the
+color scheme used by iTerm2
+](https://github.com/chriskuehl/pygments-ansi-color/pull/27#discussion_r1113790011).
+
+Default colors are hard-coded by the `pygments_ansi_color.DEFAULT_STYLE`
+constant as such:
+- `Black`: `#000000`
+- `Red`: `#ef2929`
+- `Green`: `#8ae234`
+- `Yellow`: `#fce94f`
+- `Blue`: `#3465a4`
+- `Magenta`: `#c509c5`
+- `Cyan`: `#34e2e2`
+- `White`: `#f5f5f5`
+- `BrightBlack`: `#676767`
+- `BrightRed`: `#ff6d67`
+- `BrightGreen`: `#5ff967`
+- `BrightYellow`: `#fefb67`
+- `BrightBlue`: `#6871ff`
+- `BrightMagenta`: `#ff76ff`
+- `BrightCyan`: `#5ffdff`
+- `BrightWhite`: `#feffff`
+
+Still, you may want to use your own colors, to tweak the rendering to your
+background color, or to match your own theme.
+
+For that you can override each color individually, by passing them as
+arguments to the `color_tokens` function:
+
+```python
+from pygments_ansi_color import color_tokens
+
+class MyStyle(pygments.styles.xcode.XcodeStyle):
+ styles = dict(pygments.styles.xcode.XcodeStyle.styles)
+ styles.update(color_tokens(
+ fg_colors={'Cyan': '#00ffff', 'BrightCyan': '#00ffff'},
+ bg_colors={'BrightWhite': '#000000'},
+ ))
+```
+
-### Example
+### Used by
You can see an example [on fluffy][fluffy-example], the project that this lexer
was originally developed for.
@@ -101,7 +143,7 @@
1. When calling `color_tokens`, pass `enable_256color=True`:
```python
- styles.update(color_tokens(fg_colors, bg_colors, enable_256color=True))
+ styles.update(color_tokens(enable_256color=True))
```
This change is what causes your CSS to have the appropriate classes in it.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/pygments-ansi-color-0.2.0/pygments_ansi_color/__init__.py
new/pygments-ansi-color-0.3.0/pygments_ansi_color/__init__.py
--- old/pygments-ansi-color-0.2.0/pygments_ansi_color/__init__.py
2023-02-22 20:03:20.000000000 +0100
+++ new/pygments-ansi-color-0.3.0/pygments_ansi_color/__init__.py
2023-05-19 00:43:56.000000000 +0200
@@ -95,9 +95,29 @@
return token
+DEFAULT_STYLE = {
+ 'Black': '#000000',
+ 'Red': '#ef2929',
+ 'Green': '#8ae234',
+ 'Yellow': '#fce94f',
+ 'Blue': '#3465a4',
+ 'Magenta': '#c509c5',
+ 'Cyan': '#34e2e2',
+ 'White': '#f5f5f5',
+ 'BrightBlack': '#676767',
+ 'BrightRed': '#ff6d67',
+ 'BrightGreen': '#5ff967',
+ 'BrightYellow': '#fefb67',
+ 'BrightBlue': '#6871ff',
+ 'BrightMagenta': '#ff76ff',
+ 'BrightCyan': '#5ffdff',
+ 'BrightWhite': '#feffff',
+}
+
+
def color_tokens(
- fg_colors: dict[str, str],
- bg_colors: dict[str, str],
+ fg_colors: dict[str, str] = DEFAULT_STYLE,
+ bg_colors: dict[str, str] = DEFAULT_STYLE,
enable_256color: bool = False,
) -> dict[pygments.token._TokenType, str]:
"""Return color tokens for a given set of colors.
@@ -122,30 +142,31 @@
Usage:
- fg_colors = bg_colors = {
- 'Black': '#000000',
- 'Red': '#EF2929',
- 'Green': '#8AE234',
- 'Yellow': '#FCE94F',
- 'Blue': '#3465A4',
- 'Magenta': '#c509c5',
- 'Cyan': '#34E2E2',
- 'White': '#F5F5F5',
- 'BrightBlack': '#676767',
- 'BrightRed': '#FF6D67',
- 'BrightGreen': '#5FF967',
- 'BrightYellow': '#FEFB67',
- 'BrightBlue': '#6871FF',
- 'BrightMagenta': '#FF76FF',
- 'BrightCyan': '#5FFDFF',
- 'BrightWhite': '#FEFFFF',
- }
- class MyStyle(pygments.styles.SomeStyle):
- styles = dict(pygments.styles.SomeStyle.styles)
- styles.update(color_tokens(fg_colors, bg_colors))
+ .. code-block:: python
+ from pygments_ansi_color import color_tokens
+
+ class MyStyle(pygments.styles.SomeStyle):
+ styles = dict(pygments.styles.SomeStyle.styles)
+ styles.update(color_tokens())
"""
styles: dict[pygments.token._TokenType, str] = {}
+ # Validates custom color IDs.
+ if not set(fg_colors).issubset(DEFAULT_STYLE): # pragma: no cover
(trivial)
+ raise ValueError(
+ f'Unrecognized {set(fg_colors).difference(DEFAULT_STYLE)}'
+ ' foreground color',
+ )
+ if not set(bg_colors).issubset(DEFAULT_STYLE): # pragma: no cover
(trivial)
+ raise ValueError(
+ f'Unrecognized {set(bg_colors).difference(DEFAULT_STYLE)}'
+ ' background color',
+ )
+
+ # Merge the default colors with the user-provided colors.
+ fg_colors = {**DEFAULT_STYLE, **fg_colors}
+ bg_colors = {**DEFAULT_STYLE, **bg_colors}
+
if enable_256color:
styles[pygments.token.Token.C.Bold] = 'bold'
styles[pygments.token.Token.C.Faint] = ''
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pygments-ansi-color-0.2.0/setup.py
new/pygments-ansi-color-0.3.0/setup.py
--- old/pygments-ansi-color-0.2.0/setup.py 2023-02-22 20:03:20.000000000
+0100
+++ new/pygments-ansi-color-0.3.0/setup.py 2023-05-19 00:43:56.000000000
+0200
@@ -5,7 +5,7 @@
setup(
name='pygments-ansi-color',
- version='0.2.0',
+ version='0.3.0',
classifiers=[
'License :: OSI Approved :: Apache Software License',
'Programming Language :: Python :: 3',
@@ -13,6 +13,7 @@
'Programming Language :: Python :: 3.8',
'Programming Language :: Python :: 3.9',
'Programming Language :: Python :: 3.10',
+ 'Programming Language :: Python :: 3.11',
],
python_requires='>=3.7',
install_requires=['pygments!=2.7.3'],
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/pygments-ansi-color-0.2.0/tests/pygments_ansi_color_test.py
new/pygments-ansi-color-0.3.0/tests/pygments_ansi_color_test.py
--- old/pygments-ansi-color-0.2.0/tests/pygments_ansi_color_test.py
2023-02-22 20:03:20.000000000 +0100
+++ new/pygments-ansi-color-0.3.0/tests/pygments_ansi_color_test.py
2023-05-19 00:43:56.000000000 +0200
@@ -27,10 +27,24 @@
assert ret == expected
-def test_color_tokens():
[email protected]
+def default_color_tokens():
+ return dict(
+ itertools.chain.from_iterable(
+ (
+ (getattr(C, name), value),
+ (getattr(C, f'BG{name}'), f'bg:{value}'),
+ )
+ for name, value in main.DEFAULT_STYLE.items()
+ ),
+ )
+
+
+def test_color_tokens(default_color_tokens):
fg_colors = {'Red': '#ff0000'}
bg_colors = {'Green': '#00ff00'}
- assert main.color_tokens(fg_colors, bg_colors) == {
+ ret = main.color_tokens(fg_colors, bg_colors)
+ for key, value in {
Color.BGGreen: 'bg:#00ff00',
Color.Bold: 'bold',
Color.Bold.BGGreen: 'bold bg:#00ff00',
@@ -46,20 +60,23 @@
Color.Faint.BGGreen: 'bg:#00ff00',
Color.Faint.Red: '#ff0000',
Color.Faint.Red.BGGreen: '#ff0000 bg:#00ff00',
- }
+ }.items():
+ assert ret[key] == value
-def test_color_tokens_256color():
+def test_color_tokens_256color(default_color_tokens):
fg_colors = {'Red': '#ff0000'}
bg_colors = {'Green': '#00ff00'}
-
- expected = dict(
- itertools.chain.from_iterable(
- (
- (getattr(C, f'C{i}'), value),
- (getattr(C, f'BGC{i}'), f'bg:{value}'),
- )
- for i, value in main._256_colors.items()
+ expected = dict(default_color_tokens)
+ expected.update(
+ dict(
+ itertools.chain.from_iterable(
+ (
+ (getattr(C, f'C{i}'), value),
+ (getattr(C, f'BGC{i}'), f'bg:{value}'),
+ )
+ for i, value in main._256_colors.items()
+ ),
),
)
expected.update({
