Skip to content

Commit d794221

Browse files
AnteruAnteru
authored
Merge branch 'master' into pillow92
2 parents 14f84f6 + d6968f8 commit d794221

20 files changed

+1429
-125
lines changed

‎.github/workflows/build.yaml‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,7 @@ jobs:
2323
pip install -r requirements.txt
2424
pip install .
2525
- name: Test package
26-
run: make test TEST=-v
27-
if: runner.os == 'Linux'
28-
- name: Test package
29-
run: pytest
30-
if: runner.os != 'Linux'
26+
run: pytest -W error
3127

3228
check:
3329
runs-on: ubuntu-latest

‎CHANGES‎

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Version 2.13.0
1010
- Added lexers:
1111

1212
* COMAL-80 (#2180)
13-
* JMESPath (#2175, #2182)
13+
* JMESPath (#2174, #2175, #2179, #2182)
1414
* Sql+Jinja (#2148)
1515

1616
- Updated lexers:
@@ -24,26 +24,36 @@ Version 2.13.0
2424
* Coq: add some common keywords, improve recognition of ``Set``
2525
and qualified identifiers (#2158)
2626
* F*: Allow C-style comments anywhere in a line
27+
* Fortran: fix catastrophic backtracking with backslashes in strings
28+
(#2194)
2729
* Go: add support for generics (#2167)
2830
* Inform: update for version 6.40 (#2190)
2931
* Isabelle: recognize cartouches (#2089)
3032
* Java: support multiline strings aka. text blocks (#2132)
3133
* Kotlin: add ``value`` modifier (#2142)
34+
* LilyPond: add some missing builtins
3235
* Macaulay2: update builtins (#2139)
3336
* Matlab session: fix traceback when a line continuation ellipsis
3437
appears in the output (#2166)
3538
* .NET: add aliases for LibreOffice Basic, OpenOfficeBasic and
3639
StarOffice Basic (#2170)
3740
* Nim: use ``Name.Builtin`` instead of ``Keyword.Type`` (#2136)
3841
* PHP: fix `\"$var\"` inside strings (#2105)
42+
* Python: only recognize ``\N``, ``\u`` and ``\U`` escape sequences
43+
in string literals, but not in bytes literals where they are
44+
not supported (#2204)
3945
* Tcl: support ``${name}`` variables (#2145)
4046
* Terraform: accept leading whitespace for `<<` heredoc
4147
delimiters (#2162)
48+
* Teraterm: Various improvements (#2165)
49+
* Spice: add support for the recently added features including more
50+
builtin functions and bin, oct, hex number formats (#2206)
4251

4352
- Added styles:
4453

54+
* GitHub dark (#2192)
4555
* StarOffice (#2168)
46-
* Nord (`nord` and `nord-darker`; #2189)
56+
* Nord (`nord` and `nord-darker`; #2189, #1799, #1678)
4757

4858
- Pygments now tries to use the ``importlib.metadata`` module to
4959
discover plugins instead of the slower ``pkg_resources`` (#2155). In
@@ -64,6 +74,8 @@ Version 2.13.0
6474
``importlib.metadata`` nor ``importlib_metadata`` is found, but it
6575
will be slower.
6676

77+
- Silently ignore ``BrokenPipeError`` in the command-line interface
78+
(#2193).
6779
- The ``HtmlFormatter`` now uses the ``linespans`` attribute for
6880
``anchorlinenos`` if the ``lineanchors`` attribute is unset (#2026).
6981
- The ``highlight``, ``lex`` and ``format`` functions no longer
@@ -78,7 +90,8 @@ Version 2.13.0
7890
- Remove redundant caches for filename patterns (#2153)
7991
- Use new non-deprecated Pillow API for text bounding box in ``ImageFormatter``
8092
(#2198)
81-
93+
- Remove ``default_style`` (#930, #2183)
94+
- Stop treating ``DeprecationWarnings`` as errors in the unit tests (#2196)
8295

8396
Version 2.12.0
8497
--------------

‎external/lilypond-builtins-generator.ly‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -347,11 +347,19 @@
347347
print-all-headers
348348
system-separator-markup
349349
footnote-separator-markup
350-
; Let's view these four as \paper variables.
350+
;; Let's view these four as \paper variables.
351351
basic-distance
352352
minimum-distance
353353
padding
354-
stretchability))
354+
stretchability
355+
;; These were forgotten in the documentation.
356+
evenHeaderMarkup
357+
oddHeaderMarkup
358+
evenFooterMarkup
359+
oddFooterMarkup
360+
bookTitleMarkup
361+
scoreTitleMarkup
362+
))
355363

356364
#(dump-py-list 'paper_variables all-paper-variables)
357365

‎pygments/cmdline.py‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -638,6 +638,9 @@ def main(args=sys.argv):
638638

639639
try:
640640
return main_inner(parser, argns)
641+
except BrokenPipeError:
642+
# someone closed our stdout, e.g. by quitting a pager.
643+
return 0
641644
except Exception:
642645
if argns.v:
643646
print(file=sys.stderr)

0 commit comments

Comments
 (0)