Skip to content

Commit 096fb21

Browse files
authored
Merge branch 'master' into fix/progress-type
2 parents ae4a70c + d5dcc74 commit 096fb21

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

101 files changed

+2090
-1536
lines changed

.github/workflows/codeql.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,11 @@ jobs:
2929

3030
steps:
3131
- name: Checkout repository
32-
uses: actions/checkout@v3
32+
uses: actions/checkout@v4
3333

3434
# Initializes the CodeQL tools for scanning.
3535
- name: Initialize CodeQL
36-
uses: github/codeql-action/init@v2
36+
uses: github/codeql-action/init@v3
3737
with:
3838
languages: ${{ matrix.language }}
3939
# If you wish to specify custom queries, you can do so here or in a config file.
@@ -47,7 +47,7 @@ jobs:
4747
# Autobuild attempts to build any compiled languages (C/C++, C#, Go, Java, or Swift).
4848
# If this step fails, then you should remove it and run the build manually (see below)
4949
- name: Autobuild
50-
uses: github/codeql-action/autobuild@v2
50+
uses: github/codeql-action/autobuild@v3
5151

5252
# ℹ️ Command-line programs to run using the OS shell.
5353
# 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
@@ -60,6 +60,6 @@ jobs:
6060
# ./location_of_script_within_repo/buildscript.sh
6161

6262
- name: Perform CodeQL Analysis
63-
uses: github/codeql-action/analyze@v2
63+
uses: github/codeql-action/analyze@v3
6464
with:
6565
category: "/language:${{matrix.language}}"

.github/workflows/codespell.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ jobs:
44
codespell:
55
runs-on: ubuntu-latest
66
steps:
7-
- uses: actions/checkout@v3
7+
- uses: actions/checkout@v4
88
- run: python3 -m pip install codespell
99
- run: codespell --ignore-words-list="ba,fo,hel,revered,womens"
1010
--skip="./README.*.md,*.svg,*.ai,./benchmarks/snippets.py,./tests,./tools"

.github/workflows/newissue.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
permissions:
99
issues: write
1010
steps:
11-
- uses: actions/checkout@v3
11+
- uses: actions/checkout@v4
1212
with:
1313
ref: master
1414
- name: Install FAQtory

.github/workflows/pythonpackage.yml

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,22 +6,25 @@ jobs:
66
build:
77
runs-on: ${{ matrix.os }}
88
strategy:
9+
fail-fast: false
910
matrix:
1011
os: [windows-latest, ubuntu-latest, macos-latest]
11-
python-version: ["3.7", "3.8", "3.9", "3.10", "3.11.0"]
12+
python-version: ["3.8", "3.9", "3.10", "3.11", "3.12", "3.13"]
13+
exclude:
14+
- { os: windows-latest, python-version: "3.13" }
1215
defaults:
1316
run:
1417
shell: bash
1518
steps:
16-
- uses: actions/checkout@v3
19+
- uses: actions/checkout@v4
1720
- name: Set up Python ${{ matrix.python-version }}
18-
uses: actions/setup-python@v4
21+
uses: actions/setup-python@v5
1922
with:
2023
python-version: ${{ matrix.python-version }}
21-
architecture: x64
24+
allow-prereleases: true
2225
- name: Install and configure Poetry
2326
# TODO: workaround for https://github.com/snok/install-poetry/issues/94
24-
uses: snok/install-poetry@v1.3.3
27+
uses: snok/install-poetry@v1.3.4
2528
with:
2629
version: 1.3.1
2730
virtualenvs-in-project: true
@@ -41,7 +44,7 @@ jobs:
4144
source $VENV
4245
pytest tests -v --cov=./rich --cov-report=xml:./coverage.xml --cov-report term-missing
4346
- name: Upload code coverage
44-
uses: codecov/codecov-action@v3
47+
uses: codecov/codecov-action@v4
4548
with:
4649
token: ${{ secrets.CODECOV_TOKEN }}
4750
file: ./coverage.xml

.github/workflows/readmechanged.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
send_notification:
1212
runs-on: ubuntu-latest
1313
steps:
14-
- uses: actions/checkout@v2
14+
- uses: actions/checkout@v4
1515
- name: Send notification to README Authors
1616
env:
1717
GITHUB_TOKEN: ${{ secrets.GHP_README_WORKFLOW }}

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,3 +117,5 @@ venv.bak/
117117
# airspeed velocity
118118
benchmarks/env/
119119
benchmarks/html/
120+
121+
sandbox/

.pre-commit-config.yaml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,11 @@
33
exclude: benchmarks/
44
repos:
55
- repo: https://github.com/pre-commit/pre-commit-hooks
6-
rev: v4.0.1
6+
rev: v4.4.0
77
hooks:
88
- id: check-ast
99
- id: check-builtin-literals
1010
- id: check-case-conflict
11-
- id: check-docstring-first
1211
- id: check-merge-conflict
1312
- id: check-json
1413
- id: check-toml
@@ -17,28 +16,29 @@ repos:
1716
- id: mixed-line-ending
1817
- id: check-vcs-permalinks
1918
- id: check-shebang-scripts-are-executable
19+
- id: trailing-whitespace
2020
- repo: https://github.com/pre-commit/pygrep-hooks
21-
rev: v1.9.0
21+
rev: v1.10.0
2222
hooks:
2323
- id: python-check-mock-methods
2424
- id: python-no-log-warn
2525
- id: python-use-type-annotations
2626
- id: rst-directive-colons
2727
- id: rst-inline-touching-normal
2828
- repo: https://github.com/hadialqattan/pycln
29-
rev: v1.2.5
29+
rev: v2.2.2
3030
hooks:
3131
- id: pycln
3232
args: [--all]
33-
- repo: https://github.com/psf/black
34-
rev: 22.3.0
33+
- repo: https://github.com/psf/black-pre-commit-mirror
34+
rev: 23.11.0
3535
hooks:
3636
- id: black
3737
exclude: ^benchmarks/
38-
- repo: https://github.com/pycqa/isort
38+
- repo: https://github.com/PyCQA/isort
3939
rev: 5.12.0
4040
hooks:
4141
- id: isort
4242
name: isort (python)
43-
language_version: '3.11'
43+
language_version: "3.11"
4444
args: ["--profile", "black"]

CHANGELOG.md

Lines changed: 93 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,93 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
77

88
## Unreleased
99

10+
11+
### Changed
12+
13+
- Rich will display tracebacks with finely grained error locations on python 3.11+ https://github.com/Textualize/rich/pull/3486
14+
15+
1016
### Fixed
1117

12-
- Fix the return type of `Progress.__enter__`
18+
- Fixed issue with Segment._split_cells https://github.com/Textualize/rich/pull/3506
19+
20+
## [13.8.1] - 2024-09-10
21+
22+
### Fixed
23+
24+
- Added support for Python 3.13 https://github.com/Textualize/rich/pull/3481
25+
- Fixed infinite loop when appending Text to same instance https://github.com/Textualize/rich/pull/3480
26+
27+
## [13.8.0] - 2024-08-26
28+
29+
### Fixed
30+
31+
- Fixed `Table` rendering of box elements so "footer" elements truly appear at bottom of table, "mid" elements in main table body.
32+
- Fixed styles in Panel when Text objects are used for title https://github.com/Textualize/rich/pull/3401
33+
- Fix pretty repr for `collections.deque` https://github.com/Textualize/rich/pull/2864
34+
- Thread used in progress.track will exit if an exception occurs in a generator https://github.com/Textualize/rich/pull/3402
35+
- Progress track thread is now a daemon thread https://github.com/Textualize/rich/pull/3402
36+
- Fixed cached hash preservation upon clearing meta and links https://github.com/Textualize/rich/issues/2942
37+
- Fixed overriding the `background_color` of `Syntax` not including padding https://github.com/Textualize/rich/issues/3295
38+
- Fixed pretty printing of dataclasses with a default repr in Python 3.13 https://github.com/Textualize/rich/pull/3455
39+
- Fixed selective enabling of highlighting when disabled in the `Console` https://github.com/Textualize/rich/issues/3419
40+
- Fixed BrokenPipeError writing an error message https://github.com/Textualize/rich/pull/3468
41+
- Fixed superfluous space above Markdown tables https://github.com/Textualize/rich/pull/3469
42+
- Fixed issue with record and capture interaction https://github.com/Textualize/rich/pull/3470
43+
- Fixed control codes breaking in `append_tokens` https://github.com/Textualize/rich/pull/3471
44+
- Fixed exception pretty printing a dataclass with missing fields https://github.com/Textualize/rich/pull/3472
45+
46+
### Changed
47+
48+
- `RichHandler` errors and warnings will now use different colors (red and yellow) https://github.com/Textualize/rich/issues/2825
49+
- Removed the empty line printed in jupyter while using `Progress` https://github.com/Textualize/rich/pull/2616
50+
- Running tests in environment with `FORCE_COLOR` or `NO_COLOR` environment variables
51+
- ansi decoder will now strip problematic private escape sequences (like `\x1b7`) https://github.com/Textualize/rich/pull/3278/
52+
- Tree's ASCII_GUIDES and TREE_GUIDES constants promoted to class attributes
53+
54+
### Added
55+
56+
- Adds a `case_sensitive` parameter to `prompt.Prompt`. This determines if the
57+
response is treated as case-sensitive. Defaults to `True`.
58+
- Added `Console.on_broken_pipe` https://github.com/Textualize/rich/pull/3468
59+
60+
## [13.7.1] - 2024-02-28
61+
62+
63+
### Fixed
64+
65+
- Updated the widths of some characters https://github.com/Textualize/rich/pull/3289
66+
67+
## [13.7.0] - 2023-11-15
68+
69+
### Added
70+
71+
- Adds missing parameters to Panel.fit https://github.com/Textualize/rich/issues/3142
72+
73+
### Fixed
74+
75+
- Some text goes missing during wrapping when it contains double width characters https://github.com/Textualize/rich/issues/3176
76+
- Ensure font is correctly inherited in exported HTML https://github.com/Textualize/rich/issues/3104
77+
- Fixed typing for `FloatPrompt`.
78+
79+
## [13.6.0] - 2023-09-30
80+
81+
### Added
82+
83+
- Added Python 3.12 to classifiers.
84+
85+
## [13.5.3] - 2023-09-17
86+
87+
### Fixed
88+
89+
- Markdown table rendering issue with inline styles and links https://github.com/Textualize/rich/issues/3115
90+
- Fix Markdown code blocks on a light background https://github.com/Textualize/rich/issues/3123
1391

1492
## [13.5.2] - 2023-08-01
1593

1694
### Fixed
1795

18-
- Fixed Text.expand_tab assertion error
96+
- Fixed Text.expand_tabs assertion error
1997

2098
## [13.5.1] - 2023-07-31
2199

@@ -30,7 +108,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
30108
- Fixed Text.expand_tabs not expanding spans.
31109
- Fixed TimeElapsedColumn from showing negative.
32110
- Fix for escaping strings with a trailing backslash https://github.com/Textualize/rich/issues/2987
33-
- Fixed exception in Markdown with partial table https://github.com/Textualize/rich/issues/3053
111+
- Fixed exception in Markdown with partial table https://github.com/Textualize/rich/issues/3053
34112
- Fixed the HTML export template so that the `<html>` tag comes before the `<head>` tag https://github.com/Textualize/rich/issues/3021
35113
- Fixed issue with custom classes overwriting `__eq__` https://github.com/Textualize/rich/issues/2875
36114
- Fix rich.pretty.install breakage in iPython https://github.com/Textualize/rich/issues/3013
@@ -44,7 +122,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
44122

45123
- Text.tab_size now defaults to `None` to indicate that Console.tab_size should be used.
46124

47-
48125
## [13.4.2] - 2023-06-12
49126

50127
### Changed
@@ -99,6 +176,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
99176

100177
- Added Polish README
101178

179+
102180
### Changed
103181

104182
- `rich.progress.track()` will now show the elapsed time after finishing the task https://github.com/Textualize/rich/pull/2659
@@ -977,7 +1055,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
9771055
### Added
9781056

9791057
- Added rich.live https://github.com/textualize/rich/pull/382
980-
- Added algin parameter to Rule and Console.rule
1058+
- Added align parameter to Rule and Console.rule
9811059
- Added rich.Status class and Console.status
9821060
- Added getitem to Text
9831061
- Added style parameter to Console.log
@@ -2000,12 +2078,18 @@ Major version bump for a breaking change to `Text.stylize signature`, which corr
20002078

20012079
- First official release, API still to be stabilized
20022080

2081+
[13.8.1]: https://github.com/textualize/rich/compare/v13.8.0...v13.8.1
2082+
[13.8.0]: https://github.com/textualize/rich/compare/v13.7.1...v13.8.0
2083+
[13.7.1]: https://github.com/textualize/rich/compare/v13.7.0...v13.7.1
2084+
[13.7.0]: https://github.com/textualize/rich/compare/v13.6.0...v13.7.0
2085+
[13.6.0]: https://github.com/textualize/rich/compare/v13.5.3...v13.6.0
2086+
[13.5.3]: https://github.com/textualize/rich/compare/v13.5.2...v13.5.3
20032087
[13.5.2]: https://github.com/textualize/rich/compare/v13.5.1...v13.5.2
20042088
[13.5.1]: https://github.com/textualize/rich/compare/v13.5.0...v13.5.1
2005-
[13.5.0]: https://github.com/textualize/rich/compare/v13.4.2...v13.5.0
2006-
[13.4.2]: https://github.com/textualize/rich/compare/v13.4.1...v13.4.2
2007-
[13.4.1]: https://github.com/textualize/rich/compare/v13.4.0...v13.4.1
2008-
[13.4.0]: https://github.com/textualize/rich/compare/v13.3.5...v13.4.0
2089+
[13.5.0]: https://github.com/textualize/rich/compare/v13.4.2...v13.5.0
2090+
[13.4.2]: https://github.com/textualize/rich/compare/v13.4.1...v13.4.2
2091+
[13.4.1]: https://github.com/textualize/rich/compare/v13.4.0...v13.4.1
2092+
[13.4.0]: https://github.com/textualize/rich/compare/v13.3.5...v13.4.0
20092093
[13.3.5]: https://github.com/textualize/rich/compare/v13.3.4...v13.3.5
20102094
[13.3.4]: https://github.com/textualize/rich/compare/v13.3.3...v13.3.4
20112095
[13.3.3]: https://github.com/textualize/rich/compare/v13.3.2...v13.3.3

CODE_OF_CONDUCT.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ In the interest of fostering an open and welcoming environment, we as
66
contributors and maintainers pledge to making participation in our project and
77
our community a harassment-free experience for everyone, regardless of age, body
88
size, disability, ethnicity, sex characteristics, gender identity and expression,
9-
level of experience, education, socio-economic status, nationality, personal
9+
level of experience, education, socioeconomic status, nationality, personal
1010
appearance, race, religion, or sexual identity and orientation.
1111

1212
## Our Standards

CONTRIBUTORS.md

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,29 +7,38 @@ The following people have contributed to the development of Rich:
77
- [Patrick Arminio](https://github.com/patrick91)
88
- [Gregory Beauregard](https://github.com/GBeauregard/pyffstream)
99
- [Artur Borecki](https://github.com/pufereq)
10+
- [Pedro Aaron](https://github.com/paaaron)
11+
- [Robin Bowes](https://github.com/yo61)
1012
- [Dennis Brakhane](https://github.com/brakhane)
1113
- [Darren Burns](https://github.com/darrenburns)
14+
- [Ceyda Cinarel](https://github.com/cceyda)
1215
- [Jim Crist-Harif](https://github.com/jcrist)
1316
- [Ed Davis](https://github.com/davised)
1417
- [Pete Davison](https://github.com/pd93)
1518
- [James Estevez](https://github.com/jstvz)
19+
- [Jonathan Eunice](https://github.com/jonathan-3play)
1620
- [Aryaz Eghbali](https://github.com/AryazE)
1721
- [Oleksis Fraga](https://github.com/oleksis)
1822
- [Andy Gimblett](https://github.com/gimbo)
23+
- [Tom Gooding](https://github.com/TomJGooding)
1924
- [Michał Górny](https://github.com/mgorny)
2025
- [Nok Lam Chan](https://github.com/noklam)
2126
- [Leron Gray](https://github.com/daddycocoaman)
2227
- [Andre Hora](https://github.com/andrehora)
2328
- [Kenneth Hoste](https://github.com/boegel)
2429
- [Lanqing Huang](https://github.com/lqhuang)
2530
- [Finn Hughes](https://github.com/finnhughes)
31+
- [Logan Hunt](https://github.com/dosisod)
32+
- [JP Hutchins](https://github.com/JPhutchins)
2633
- [Ionite](https://github.com/ionite34)
2734
- [Josh Karpel](https://github.com/JoshKarpel)
2835
- [Jan Katins](https://github.com/jankatins)
2936
- [Hugo van Kemenade](https://github.com/hugovk)
3037
- [Andrew Kettmann](https://github.com/akettmann)
38+
- [Alexander Krasnikov](https://github.com/askras)
3139
- [Martin Larralde](https://github.com/althonos)
3240
- [Hedy Li](https://github.com/hedythedev)
41+
- [Henry Mai](https://github.com/tanducmai)
3342
- [Luka Mamukashvili](https://github.com/UltraStudioLTD)
3443
- [Alexander Mancevice](https://github.com/amancevice)
3544
- [Will McGugan](https://github.com/willmcgugan)
@@ -46,20 +55,24 @@ The following people have contributed to the development of Rich:
4655
- [Kylian Point](https://github.com/p0lux)
4756
- [Kyle Pollina](https://github.com/kylepollina)
4857
- [Sebastián Ramírez](https://github.com/tiangolo)
58+
- [Grant Ramsay](https://github.com/seapagan)
4959
- [Felipe Guedes](https://github.com/guedesfelipe)
5060
- [Min RK](https://github.com/minrk)
5161
- [Clément Robert](https://github.com/neutrinoceros)
5262
- [Brian Rutledge](https://github.com/bhrutledge)
5363
- [Tushar Sadhwani](https://github.com/tusharsadhwani)
5464
- [Luca Salvarani](https://github.com/LukeSavefrogs)
5565
- [Paul Sanders](https://github.com/sanders41)
66+
- [Louis Sautier](https://github.com/sbraz)
5667
- [Tim Savage](https://github.com/timsavage)
5768
- [Anthony Shaw](https://github.com/tonybaloney)
5869
- [Nicolas Simonds](https://github.com/0xDEC0DE)
5970
- [Aaron Stephens](https://github.com/aaronst)
71+
- [Karolina Surma](https://github.com/befeleme)
6072
- [Gabriele N. Tornetta](https://github.com/p403n1x87)
6173
- [Nils Vu](https://github.com/nilsvu)
6274
- [Arian Mollik Wasi](https://github.com/wasi-master)
75+
- [Jan van Wijk](https://github.com/jdvanwijk)
6376
- [Handhika Yanuar Pratama](https://github.com/theDreamer911)
6477
- [za](https://github.com/za)
6578
- [Motahhar Mokfi](https://github.com/motahhar)
@@ -70,4 +83,7 @@ The following people have contributed to the development of Rich:
7083
- [Ke Sun](https://github.com/ksun212)
7184
- [Qiming Xu](https://github.com/xqm32)
7285
- [James Addison](https://github.com/jayaddison)
73-
- [Pierro](https://github.com/xpierroz)
86+
- [Pierro](https://github.com/xpierroz)
87+
- [Bernhard Wagner](https://github.com/bwagner)
88+
- [Aaron Beaudoin](https://github.com/AaronBeaudoin)
89+
- [Jonathan Helmus](https://github.com/jjhelmus)

0 commit comments

Comments
 (0)