Skip to content

Commit

Permalink
Merge branch 'stable' into bugfix/OptionsAutoCompletion
Browse files Browse the repository at this point in the history
  • Loading branch information
msaipraneeth authored Dec 5, 2024
2 parents dab6c21 + bed0377 commit f08e133
Show file tree
Hide file tree
Showing 9 changed files with 33 additions and 26 deletions.
6 changes: 1 addition & 5 deletions .github/workflows/publish.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -64,10 +64,6 @@ jobs:
id-token: write
steps:
- uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
- uses: pypa/gh-action-pypi-publish@f7600683efdcb7656dec5b29656edb7bc586e597 # v1.10.3
with:
repository-url: https://test.pypi.org/legacy/
packages-dir: artifact/
- uses: pypa/gh-action-pypi-publish@f7600683efdcb7656dec5b29656edb7bc586e597 # v1.10.3
- uses: pypa/gh-action-pypi-publish@15c56dba361d8335944d31a2ecd17d700fc7bcbc # v1.12.2
with:
packages-dir: artifact/
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
repos:
- repo: https://github.com/astral-sh/ruff-pre-commit
rev: v0.7.1
rev: v0.8.1
hooks:
- id: ruff
- id: ruff-format
Expand Down
9 changes: 9 additions & 0 deletions CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,15 @@ Unreleased
:issue:`2638`
- Cache the help option generated by the ``help_option_names`` setting to
respect its eagerness. :pr:`2811`
- Replace uses of ``os.system`` with ``subprocess.Popen``. :issue:`1476`
- Exceptions generated during a command will use the context's ``color``
setting when being displayed. :issue:`2193`
- Error message when defining option with invalid name is more descriptive.
:issue:`2452`
- Refactor code generating default ``--help`` option to deduplicate code.
:pr:`2563`
- Test ``CLIRunner`` resets patched ``_compat.should_strip_ansi``.
:issue:`2732`
- show correct auto complete value for nargs option in combination with
flag option :issue:`2813`

Expand Down
2 changes: 1 addition & 1 deletion requirements/build.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#
build==1.2.2.post1
# via -r build.in
packaging==24.1
packaging==24.2
# via build
pyproject-hooks==1.2.0
# via build
30 changes: 15 additions & 15 deletions requirements/dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ filelock==3.16.1
# via
# tox
# virtualenv
identify==2.6.1
identify==2.6.3
# via pre-commit
idna==3.10
# via requests
Expand All @@ -49,14 +49,14 @@ jinja2==3.1.4
markupsafe==3.0.2
# via jinja2
mypy==1.13.0
# via -r typing.in
# via -r /Users/david/Projects/click/requirements/typing.in
mypy-extensions==1.0.0
# via mypy
nodeenv==1.9.1
# via
# pre-commit
# pyright
packaging==24.1
packaging==24.2
# via
# build
# pallets-sphinx-themes
Expand All @@ -65,8 +65,8 @@ packaging==24.1
# sphinx
# tox
pallets-sphinx-themes==2.3.0
# via -r docs.in
pip-compile-multi==2.6.4
# via -r /Users/david/Projects/click/requirements/docs.in
pip-compile-multi==2.7.1
# via -r dev.in
pip-tools==7.4.1
# via pip-compile-multi
Expand All @@ -90,10 +90,10 @@ pyproject-hooks==1.2.0
# via
# build
# pip-tools
pyright==1.1.386
# via -r typing.in
pytest==8.3.3
# via -r tests.in
pyright==1.1.390
# via -r /Users/david/Projects/click/requirements/typing.in
pytest==8.3.4
# via -r /Users/david/Projects/click/requirements/tests.in
pyyaml==6.0.2
# via pre-commit
requests==2.32.3
Expand All @@ -102,18 +102,18 @@ snowballstemmer==2.2.0
# via sphinx
sphinx==8.1.3
# via
# -r docs.in
# -r /Users/david/Projects/click/requirements/docs.in
# pallets-sphinx-themes
# sphinx-issues
# sphinx-notfound-page
# sphinx-tabs
# sphinxcontrib-log-cabinet
sphinx-issues==5.0.0
# via -r docs.in
# via -r /Users/david/Projects/click/requirements/docs.in
sphinx-notfound-page==1.0.4
# via pallets-sphinx-themes
sphinx-tabs==3.4.7
# via -r docs.in
# via -r /Users/david/Projects/click/requirements/docs.in
sphinxcontrib-applehelp==2.0.0
# via sphinx
sphinxcontrib-devhelp==2.0.0
Expand All @@ -123,7 +123,7 @@ sphinxcontrib-htmlhelp==2.1.0
sphinxcontrib-jsmath==1.0.1
# via sphinx
sphinxcontrib-log-cabinet==1.0.1
# via -r docs.in
# via -r /Users/david/Projects/click/requirements/docs.in
sphinxcontrib-qthelp==2.0.0
# via sphinx
sphinxcontrib-serializinghtml==2.0.0
Expand All @@ -138,11 +138,11 @@ typing-extensions==4.12.2
# pyright
urllib3==2.2.3
# via requests
virtualenv==20.27.0
virtualenv==20.28.0
# via
# pre-commit
# tox
wheel==0.44.0
wheel==0.45.1
# via pip-tools

# The following packages are considered to be unsafe in a requirements file:
Expand Down
2 changes: 1 addition & 1 deletion requirements/docs.txt
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jinja2==3.1.4
# via sphinx
markupsafe==3.0.2
# via jinja2
packaging==24.1
packaging==24.2
# via
# pallets-sphinx-themes
# sphinx
Expand Down
4 changes: 2 additions & 2 deletions requirements/tests.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
#
iniconfig==2.0.0
# via pytest
packaging==24.1
packaging==24.2
# via pytest
pluggy==1.5.0
# via pytest
pytest==8.3.3
pytest==8.3.4
# via -r tests.in
2 changes: 1 addition & 1 deletion requirements/typing.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ mypy-extensions==1.0.0
# via mypy
nodeenv==1.9.1
# via pyright
pyright==1.1.386
pyright==1.1.390
# via -r typing.in
typing-extensions==4.12.2
# via
Expand Down
2 changes: 2 additions & 0 deletions src/click/testing.py
Original file line number Diff line number Diff line change
Expand Up @@ -312,6 +312,7 @@ def should_strip_ansi(
old_hidden_prompt_func = termui.hidden_prompt_func
old__getchar_func = termui._getchar
old_should_strip_ansi = utils.should_strip_ansi # type: ignore
old__compat_should_strip_ansi = _compat.should_strip_ansi
termui.visible_prompt_func = visible_input
termui.hidden_prompt_func = hidden_input
termui._getchar = _getchar
Expand Down Expand Up @@ -346,6 +347,7 @@ def should_strip_ansi(
termui.hidden_prompt_func = old_hidden_prompt_func
termui._getchar = old__getchar_func
utils.should_strip_ansi = old_should_strip_ansi # type: ignore
_compat.should_strip_ansi = old__compat_should_strip_ansi
formatting.FORCED_WIDTH = old_forced_width

def invoke(
Expand Down

0 comments on commit f08e133

Please sign in to comment.