mirrors/xonsh
1
0
Fork 0
mirror of https://github.com/xonsh/xonsh.git synced 2025-03-04 08:24:40 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Update prompt-toolkit to 3.0.29 and remove xfail (#4818)

Browse source 
This fixes the failing test_ptk_prompt() test on Windows.
This commit is contained in:
Peter Ye 2022-05-24 23:46:34 -04:00 • committed by GitHub
parent e7ab9a4eb8
commit 8e1593b6e7
Failed to generate hash of commit
3 changed files with 4 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pyproject.toml
View file

@ -82,7 +82,7 @@ changelog = "https://github.com/xonsh/xonsh/blob/main/CHANGELOG.rst"
[project.optional-dependencies]
ptk = [
"prompt-toolkit>=3.0.27",
"prompt-toolkit>=3.0.29",
"pyperclip",
]
pygments = ["pygments>=2.2"]
@ -108,7 +108,7 @@ lint = [
"types-ujson",
]
bestshell = [
"prompt_toolkit>=3.0.27",
"prompt_toolkit>=3.0.29",
"pygments>=2.2",
]
test = [
@ -120,7 +120,7 @@ test = [
"pytest-timeout",
"pytest-subprocess",
"pytest-rerunfailures",
"prompt-toolkit>=3.0.27",
"prompt-toolkit>=3.0.29",
"pygments>=2.2",
"coverage>=5.3.1",
"pyte>=0.8.0",

5
tests/test_ptk_shell.py
View file

@ -7,7 +7,6 @@ import pytest
from xonsh.platform import minimum_required_ptk_version
from xonsh.ptk_shell.shell import tokenize_ansi
from xonsh.pytest.tools import ON_WINDOWS
from xonsh.shell import Shell
# verify error if ptk not installed or below min
@ -108,10 +107,6 @@ def test_tokenize_ansi(prompt_tokens, ansi_string_parts):
["2 * 3", "6"],
],
)
@pytest.mark.xfail(
ON_WINDOWS,
reason="Recent versions use Proactor event loop. This may need some handling",
)
def test_ptk_prompt(line, exp, ptk_shell, capsys):
inp, out, shell = ptk_shell
inp.send_text(f"{line}\nexit\n") # note: terminate with '\n'

2
xonsh-in-docker.py
View file

@ -11,7 +11,7 @@ parser = argparse.ArgumentParser(description=program_description)
parser.add_argument("env", nargs="*", default=[], metavar="ENV=value")
parser.add_argument("--python", "-p", default="3.6", metavar="python_version")
parser.add_argument("--pypy", default=None, metavar="pypy_version")
parser.add_argument("--ptk", "-t", default="3.0.27", metavar="ptk_version")
parser.add_argument("--ptk", "-t", default="3.0.29", metavar="ptk_version")
parser.add_argument("--keep", action="store_true")
parser.add_argument("--build", action="store_true")
parser.add_argument("--command", "-c", default="xonsh", metavar="command")