Skip to content

Commit 641f506

Browse files
committed
Merge remote-tracking branch 'upstream/master' into feat/text-autocomplete
2 parents b30e70b + 830c5a0 commit 641f506

File tree

12 files changed

+39
-36
lines changed

12 files changed

+39
-36
lines changed

.github/workflows/constraints.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
pip==22.2.2
1+
pip==22.3.1
22
nox==2022.8.7
3-
nox-poetry==1.0.1
3+
nox-poetry==1.0.2
44
poetry==1.1.15
5-
virtualenv==20.16.5
5+
virtualenv==20.16.6

.github/workflows/documentation.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ jobs:
1818
name: Build documentation & check links
1919
runs-on: ubuntu-latest
2020
steps:
21-
- uses: actions/checkout@v3.0.2
22-
- uses: actions/setup-python@v4.2.0
21+
- uses: actions/checkout@v3.1.0
22+
- uses: actions/setup-python@v4.3.0
2323
with:
2424
python-version: "3.10"
2525

@@ -40,7 +40,7 @@ jobs:
4040
run: nox --force-color --session=docs-build
4141

4242
- name: Upload documentation
43-
uses: actions/upload-artifact@v3.1.0
43+
uses: actions/upload-artifact@v3.1.1
4444
with:
4545
name: docs
4646
path: docs/_build

.github/workflows/labeler.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ jobs:
1212
runs-on: ubuntu-latest
1313
steps:
1414
- name: Check out the repository
15-
uses: actions/checkout@v3.0.2
15+
uses: actions/checkout@v3.1.0
1616

1717
- name: Run Labeler
18-
uses: crazy-max/ghaction-github-labeler@v4.0.0
18+
uses: crazy-max/ghaction-github-labeler@v4.1.0
1919
with:
2020
skip-delete: true

.github/workflows/release.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@ jobs:
1313
runs-on: ubuntu-latest
1414
steps:
1515
- name: Check out the repository
16-
uses: actions/checkout@v3.0.2
16+
uses: actions/checkout@v3.1.0
1717
with:
1818
fetch-depth: 2
1919

2020
- name: Set up Python
21-
uses: actions/setup-python@v4.2.0
21+
uses: actions/setup-python@v4.3.0
2222
with:
2323
python-version: "3.10"
2424

@@ -64,7 +64,7 @@ jobs:
6464
password: ${{ secrets.PYPI_API_TOKEN }}
6565

6666
- name: Publish the release notes
67-
uses: release-drafter/release-drafter@v5.21.0
67+
uses: release-drafter/release-drafter@v5.21.1
6868
with:
6969
publish: ${{ steps.check-version.outputs.tag != '' }}
7070
tag: ${{ steps.check-version.outputs.tag }}

.github/workflows/tests.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@ jobs:
2828

2929
steps:
3030
- name: Check out the repository
31-
uses: actions/checkout@v3.0.2
31+
uses: actions/checkout@v3.1.0
3232

3333
- name: Set up Python ${{ matrix.python }}
34-
uses: actions/setup-python@v4.2.0
34+
uses: actions/setup-python@v4.3.0
3535
with:
3636
python-version: ${{ matrix.python }}
3737

@@ -73,7 +73,7 @@ jobs:
7373
print("::set-output name=result::{}".format(result))
7474
7575
- name: Restore pre-commit cache
76-
uses: actions/cache@v3.0.8
76+
uses: actions/cache@v3.0.11
7777
if: matrix.session == 'pre-commit'
7878
with:
7979
path: ~/.cache/pre-commit
@@ -87,7 +87,7 @@ jobs:
8787
8888
- name: Upload coverage data
8989
if: always() && matrix.session == 'tests'
90-
uses: "actions/upload-artifact@v3.1.0"
90+
uses: "actions/upload-artifact@v3.1.1"
9191
with:
9292
name: coverage-data
9393
path: ".coverage.*"
@@ -97,10 +97,10 @@ jobs:
9797
needs: tests
9898
steps:
9999
- name: Check out the repository
100-
uses: actions/checkout@v3.0.2
100+
uses: actions/checkout@v3.1.0
101101

102102
- name: Set up Python
103-
uses: actions/setup-python@v4.2.0
103+
uses: actions/setup-python@v4.3.0
104104
with:
105105
python-version: "3.10"
106106

docs/requirements.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
furo==2022.9.15
2-
sphinx==5.2.2
1+
furo==2022.9.29
2+
sphinx==5.3.0

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[tool.poetry]
22
name = "inquirer"
3-
version = "2.10.0"
3+
version = "2.10.1"
44
description = "Collection of common interactive command line user interfaces, based on Inquirer.js"
55
authors = ["Miguel Ángel García <miguelangel.garcia@gmail.com>"]
66
license = "MIT"

src/inquirer/questions.py

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,19 +44,18 @@ def __init__(
4444
show_default=False,
4545
other=False,
4646
):
47-
if other:
48-
choices = choices or []
49-
choices.append(GLOBAL_OTHER_CHOICE)
50-
5147
self.name = name
52-
self._other = other
5348
self._message = message
5449
self._choices = choices or []
5550
self._default = default
5651
self._ignore = ignore
5752
self._validate = validate
5853
self.answers = {}
5954
self.show_default = show_default
55+
self._other = other
56+
57+
if self._other:
58+
self._choices.append(GLOBAL_OTHER_CHOICE)
6059

6160
def add_choice(self, choice):
6261
try:
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
class OtherChoice:
22
def __str__(self):
3-
return "Other..."
3+
return "Other"
44

55

66
GLOBAL_OTHER_CHOICE = OtherChoice()

src/inquirer/themes.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,10 +89,10 @@ def __init__(self):
8989
self.Editor.opening_prompt_color = term.bright_black
9090
self.Checkbox.selection_color = term.blue
9191
self.Checkbox.selection_icon = ">"
92-
self.Checkbox.selected_icon = "X"
92+
self.Checkbox.selected_icon = "[X]"
9393
self.Checkbox.selected_color = term.yellow + term.bold
9494
self.Checkbox.unselected_color = term.normal
95-
self.Checkbox.unselected_icon = "o"
95+
self.Checkbox.unselected_icon = "[ ]"
9696
self.List.selection_color = term.blue
9797
self.List.selection_cursor = ">"
9898
self.List.unselected_color = term.normal

0 commit comments

Comments
 (0)