Merge pull request #7776 from aws/dependabot/pip/v2/prompt-toolkit-gte-3.0.24-and-lt-3.0.39

Update prompt-toolkit requirement from <3.0.29,>=3.0.24 to >=3.0.24,<3.0.39

Author: hssyoo

.changes/next-release/enhancement-dependency-84330.json

@@ -0,0 +1,5 @@
+{
+  "type": "enhancement",
+  "category": "dependency",
+  "description": "Bump upper bound of prompt-toolkit to <3.0.39"
+}

pyproject.toml

@@ -37,7 +37,7 @@ dependencies = [
     # a consistent dependency closure across all Python versions,
     # we explicitly include ruamel.yaml.clib as a dependency.
     "ruamel.yaml.clib>=0.2.0,<=0.2.7",
-    "prompt-toolkit>=3.0.24,<3.0.29",
+    "prompt-toolkit>=3.0.24,<3.0.39",
     "distro>=1.5.0,<1.9.0",
     "awscrt>=0.12.4,<0.17.0",
     "python-dateutil>=2.1,<3.0.0",

requirements/download-deps/portable-exe-lock.txt

@@ -151,9 +151,9 @@ macholib==1.16.2 \
     --hash=sha256:44c40f2cd7d6726af8fa6fe22549178d3a4dfecc35a9cd15ea916d9c83a688e0 \
     --hash=sha256:557bbfa1bb255c20e9abafe7ed6cd8046b48d9525db2f9b77d3122a63a2a8bf8
     # via pyinstaller
-prompt-toolkit==3.0.28 \
-    --hash=sha256:30129d870dcb0b3b6a53efdc9d0a83ea96162ffd28ffe077e94215b233dc670c \
-    --hash=sha256:9f1cd16b1e86c2968f2519d7fb31dd9d669916f515612c269d14e9ed52b51650
+prompt-toolkit==3.0.38 \
+    --hash=sha256:23ac5d50538a9a38c8bde05fecb47d0b403ecd0662857a86f886f798563d5b9b \
+    --hash=sha256:45ea77a2f7c60418850331366c81cf6b5b9cf4c7fd34616f733c5427e6abbb1f
     # via awscli (pyproject.toml)
 pycparser==2.21 \
     --hash=sha256:8ee45429555515e1f6b185e78100aea234072576aa43ab53aefcae078162fca9 \

requirements/download-deps/portable-exe-win-lock.txt

@@ -149,9 +149,9 @@ pefile==2023.2.7 \
     --hash=sha256:82e6114004b3d6911c77c3953e3838654b04511b8b66e8583db70c65998017dc \
     --hash=sha256:da185cd2af68c08a6cd4481f7325ed600a88f6a813bad9dea07ab3ef73d8d8d6
     # via pyinstaller
-prompt-toolkit==3.0.28 \
-    --hash=sha256:30129d870dcb0b3b6a53efdc9d0a83ea96162ffd28ffe077e94215b233dc670c \
-    --hash=sha256:9f1cd16b1e86c2968f2519d7fb31dd9d669916f515612c269d14e9ed52b51650
+prompt-toolkit==3.0.38 \
+    --hash=sha256:23ac5d50538a9a38c8bde05fecb47d0b403ecd0662857a86f886f798563d5b9b \
+    --hash=sha256:45ea77a2f7c60418850331366c81cf6b5b9cf4c7fd34616f733c5427e6abbb1f
     # via awscli (pyproject.toml)
 pycparser==2.21 \
     --hash=sha256:8ee45429555515e1f6b185e78100aea234072576aa43ab53aefcae078162fca9 \

requirements/download-deps/system-sandbox-lock.txt

@@ -141,9 +141,9 @@ jmespath==1.0.1 \
     --hash=sha256:02e2e4cc71b5bcab88332eebf907519190dd9e6e82107fa7f83b1003a6252980 \
     --hash=sha256:90261b206d6defd58fdd5e85f478bf633a2901798906be2ad389150c5c60edbe
     # via awscli (pyproject.toml)
-prompt-toolkit==3.0.28 \
-    --hash=sha256:30129d870dcb0b3b6a53efdc9d0a83ea96162ffd28ffe077e94215b233dc670c \
-    --hash=sha256:9f1cd16b1e86c2968f2519d7fb31dd9d669916f515612c269d14e9ed52b51650
+prompt-toolkit==3.0.38 \
+    --hash=sha256:23ac5d50538a9a38c8bde05fecb47d0b403ecd0662857a86f886f798563d5b9b \
+    --hash=sha256:45ea77a2f7c60418850331366c81cf6b5b9cf4c7fd34616f733c5427e6abbb1f
     # via awscli (pyproject.toml)
 pycparser==2.21 \
     --hash=sha256:8ee45429555515e1f6b185e78100aea234072576aa43ab53aefcae078162fca9 \

requirements/download-deps/system-sandbox-win-lock.txt

@@ -141,9 +141,9 @@ jmespath==1.0.1 \
     --hash=sha256:02e2e4cc71b5bcab88332eebf907519190dd9e6e82107fa7f83b1003a6252980 \
     --hash=sha256:90261b206d6defd58fdd5e85f478bf633a2901798906be2ad389150c5c60edbe
     # via awscli (pyproject.toml)
-prompt-toolkit==3.0.28 \
-    --hash=sha256:30129d870dcb0b3b6a53efdc9d0a83ea96162ffd28ffe077e94215b233dc670c \
-    --hash=sha256:9f1cd16b1e86c2968f2519d7fb31dd9d669916f515612c269d14e9ed52b51650
+prompt-toolkit==3.0.38 \
+    --hash=sha256:23ac5d50538a9a38c8bde05fecb47d0b403ecd0662857a86f886f798563d5b9b \
+    --hash=sha256:45ea77a2f7c60418850331366c81cf6b5b9cf4c7fd34616f733c5427e6abbb1f
     # via awscli (pyproject.toml)
 pycparser==2.21 \
     --hash=sha256:8ee45429555515e1f6b185e78100aea234072576aa43ab53aefcae078162fca9 \

tests/conftest.py

@@ -39,10 +39,10 @@ def clear_loggers():
 
 @pytest.fixture
 def ptk_app_session():
-    pipe_input = create_pipe_input()
-    output = DummyOutput()
-    try:
-        with create_app_session(input=pipe_input, output=output) as session:
-            yield session
-    finally:
-        pipe_input.close()
+    with create_pipe_input() as pipe_input:
+        output = DummyOutput()
+        try:
+            with create_app_session(input=pipe_input, output=output) as session:
+                yield session
+        finally:
+            pipe_input.close()

tests/functional/autoprompt/test_prompttoolkit.py

@@ -158,9 +158,11 @@ class TestPromptToolkitPrompterBuffer:
     def test_input_buffer_initialization(
             self, prompter, args, expected_input_buffer_text):
         prompter.args = args
-        prompter.pre_run()
-        actual_input_text = prompter.input_buffer.document.text
-        assert actual_input_text == expected_input_buffer_text
+        app_runner = PromptToolkitAppRunner(
+            app=prompter.app, pre_run=prompter.pre_run)
+        with app_runner.run_app_in_thread():
+            actual_input_text = prompter.input_buffer.document.text
+            assert actual_input_text == expected_input_buffer_text
 
     def test_handle_args_with_spaces(self, app_runner, prompter):
         original_args = ['iam', 'create-role', '--description', 'With spaces']
@@ -241,8 +243,10 @@ def test_doc_buffer_keeps_position_if_content_dont_change(
     )
     def test_doc_panel_content(self, prompter, args, expected_docs):
         prompter.args = args
-        prompter.pre_run()
-        assert expected_docs in prompter.doc_buffer.document.text
+        app_runner = PromptToolkitAppRunner(
+            app=prompter.app, pre_run=prompter.pre_run)
+        with app_runner.run_app_in_thread():
+            assert expected_docs in prompter.doc_buffer.document.text
 
 
 class TestHistoryMode(BasicPromptToolkitTest):

tests/unit/autoprompt/test_factory.py

@@ -24,6 +24,11 @@
 from awscli.testutils import unittest
 
 
+class FakeCLIPromptBuffer(CLIPromptBuffer):
+    def start_completion(self):
+        pass
+
+
 class TestPromptToolkitFactory(unittest.TestCase):
     def setUp(self):
         self.factory = PromptToolkitFactory(completer=DummyCompleter())
@@ -84,7 +89,7 @@ def test_can_create_key_bindings(self):
 
 class TestCLIPromptBuffer(unittest.TestCase):
     def setUp(self):
-        self.buffer = CLIPromptBuffer()
+        self.buffer = FakeCLIPromptBuffer()
 
     def test_history_mode_switching(self):
         self.buffer.switch_history_mode()