Use ruff for linting and formatting.

- Several fixes because of Ruff.
- Updated GitHub workflow to use ruff instead of isort and black.
- Added Python 3.10 to GitHub workflow.
- Ruff formatting.
- Removed unnecessary trailing comma.

Author: jonathanslenders

.github/workflows/test.yaml

@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [3.7, 3.8, 3.9, "3.10"]
+        python-version: [3.7, 3.8, 3.9, "3.10", "3.11"]
 
     steps:
       - uses: actions/checkout@v2
@@ -22,21 +22,22 @@ jobs:
         run: |
           sudo apt remove python3-pip
           python -m pip install --upgrade pip
-          python -m pip install . black coverage codecov flake8 isort==5.6.4 mypy pytest readme_renderer types-contextvars asyncssh
+          python -m pip install . ruff coverage codecov mypy pytest readme_renderer types-contextvars asyncssh
           pip list
-      - name: Run Tests
+      - name: Ruff
+        run: |
+          ruff .
+          ruff format --check .
+      - name: Tests
         run: |
-          flake8 .
           coverage run -m pytest
-      - name: Type Checker
+      - name: Mypy
         # Check wheather the imports were sorted correctly.
         # When this fails, please run ./tools/sort-imports.sh
         run: |
           mypy --strict src/prompt_toolkit --platform win32
           mypy --strict src/prompt_toolkit --platform linux
           mypy --strict src/prompt_toolkit --platform darwin
-          isort -c --profile black src examples tests setup.py
-          black --check src examples tests setup.py
       - name: Validate README.md
         # Ensure that the README renders correctly (required for uploading to PyPI).
         run: |

.travis.yml

@@ -12,7 +12,6 @@
 # serve to show the default.
 
 import os
-import sys
 
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the

docs/conf.py

@@ -49,8 +49,8 @@ def main():
     def accept(buff):
         # Evaluate "calculator" expression.
         try:
-            output = "\n\nIn:  {}\nOut: {}".format(
-                input_field.text, eval(input_field.text)
+            output = (
+                f"\n\nIn:  {input_field.text}\nOut: {eval(input_field.text)}"
             )  # Don't do 'eval' in real code!
         except BaseException as e:
             output = f"\n\n{e}"

examples/full-screen/calculator.py

@@ -60,9 +60,4 @@ async def main():
 
 
 if __name__ == "__main__":
-    try:
-        from asyncio import run
-    except ImportError:
-        asyncio.run_until_complete(main())
-    else:
-        asyncio.run(main())
+    asyncio.run(main())

examples/prompts/asyncio-prompt.py

@@ -9,7 +9,7 @@
 
 class RainbowLexer(Lexer):
     def lex_document(self, document):
-        colors = list(sorted(NAMED_COLORS, key=NAMED_COLORS.get))
+        colors = sorted(NAMED_COLORS, key=NAMED_COLORS.get)
 
         def get_line(lineno):
             return [

examples/prompts/custom-lexer.py

@@ -4,7 +4,6 @@
 """
 import asyncio
 import logging
-from asyncio import run
 
 import asyncssh
 from pygments.lexers.html import HtmlLexer

examples/ssh/asyncssh-server.py

@@ -7,7 +7,7 @@
 That is probably the preferred way if you only need Python 3 support.
 """
 import logging
-from asyncio import Future, run
+from asyncio import run
 
 from prompt_toolkit.contrib.telnet.server import TelnetServer
 from prompt_toolkit.shortcuts import PromptSession, clear

examples/telnet/hello-world.py

@@ -4,7 +4,7 @@
 in the prompt.
 """
 import logging
-from asyncio import Future, run
+from asyncio import run
 
 from prompt_toolkit.completion import WordCompleter
 from prompt_toolkit.contrib.telnet.server import TelnetServer

examples/telnet/toolbar.py

@@ -1,13 +1,38 @@
-[tool.black]
-target-version = ['py36']
-
-
-[tool.isort]
-# isort configuration that is compatible with Black.
-multi_line_output = 3
-include_trailing_comma = true
-known_first_party = "prompt_toolkit"
-known_third_party = "asyncssh,pygments"
-force_grid_wrap = 0
-use_parentheses = true
-line_length = 88
+[tool.ruff]
+target-version = "py37"
+select = [
+    "E",  # pycodestyle errors
+    "W",  # pycodestyle warnings
+    "F",  # pyflakes
+    "C",  # flake8-comprehensions
+    "T",  # Print.
+    "I",  # isort
+    # "B",  # flake8-bugbear
+    "UP",  # pyupgrade
+    "RUF100",  # unused-noqa
+    "Q", # quotes
+]
+ignore = [
+    "E501",  # Line too long, handled by black
+    "C901",  # Too complex
+    "E731",  # Assign lambda.
+    "E402", # Module level import not at the top.
+    "E741", # Ambiguous variable name.
+]
+
+
+[tool.ruff.per-file-ignores]
+"examples/*" = ["T201"]  # Print allowed in examples.
+"src/prompt_toolkit/application/application.py" = ["T100", "T201", "F821"]  # pdb and print allowed.
+"src/prompt_toolkit/contrib/telnet/server.py" = ["T201"]  # Print allowed.
+"src/prompt_toolkit/key_binding/bindings/named_commands.py" = ["T201"]  # Print allowed.
+"src/prompt_toolkit/shortcuts/progress_bar/base.py" = ["T201"]  # Print allowed.
+"tools/*" = ["T201"]  # Print allowed.
+"src/prompt_toolkit/filters/__init__.py" = ["F403", "F405"]  # Possibly undefined due to star import.
+"src/prompt_toolkit/filters/cli.py" = ["F403", "F405"]  # Possibly undefined due to star import.
+"src/prompt_toolkit/shortcuts/progress_bar/formatters.py" = ["UP031"] # %-style formatting.
+
+
+[tool.ruff.isort]
+known-first-party = ["prompt_toolkit"]
+known-third-party = ["pygments", "asyncssh"]