Upgrade Python dependencies

Author: Perlence

requirements/dev.txt

@@ -10,51 +10,52 @@ appdirs==1.4.4
     # via virtualenv
 atomicwrites==1.4.0
     # via pytest
-attrs==20.3.0
+attrs==21.2.0
     # via pytest
-babel==2.9.0
+babel==2.9.1
     # via sphinx
-certifi==2020.12.5
+certifi==2021.5.30
     # via requests
-cfgv==3.2.0
+cfgv==3.3.0
     # via pre-commit
 chardet==4.0.0
     # via requests
-click==7.1.2
+click==8.0.1
     # via pip-tools
 colorama==0.4.4
     # via
+    #   click
     #   pytest
     #   sphinx
     #   sphinx-autobuild
     #   tox
-distlib==0.3.1
+distlib==0.3.2
     # via virtualenv
-docutils==0.16
+docutils==0.17.1
     # via sphinx
 filelock==3.0.12
     # via
     #   tox
     #   virtualenv
-flake8==3.9.0
+flake8==3.9.2
     # via -r .\requirements\dev.in
-identify==2.2.0
+identify==2.2.9
     # via pre-commit
 idna==2.10
     # via requests
 imagesize==1.2.0
     # via sphinx
 iniconfig==1.1.1
     # via pytest
-jinja2==2.11.3
+jinja2==3.0.1
     # via sphinx
 livereload==2.6.3
     # via sphinx-autobuild
-markupsafe==1.1.1
+markupsafe==2.0.1
     # via jinja2
 mccabe==0.6.1
     # via flake8
-nodeenv==1.5.0
+nodeenv==1.6.0
     # via pre-commit
 packaging==20.9
     # via
@@ -63,41 +64,41 @@ packaging==20.9
     #   tox
 pep517==0.10.0
     # via pip-tools
-pip-tools==6.0.1
+pip-tools==6.1.0
     # via -r .\requirements\dev.in
 pluggy==0.13.1
     # via
     #   pytest
     #   tox
-pre-commit==2.11.1
+pre-commit==2.13.0
     # via -r .\requirements\dev.in
 py==1.10.0
     # via
     #   pytest
     #   tox
 pycodestyle==2.7.0
     # via flake8
-pyflakes==2.3.0
+pyflakes==2.3.1
     # via flake8
-pygments==2.8.1
+pygments==2.9.0
     # via sphinx
 pyparsing==2.4.7
     # via packaging
-pytest-mock==3.5.1
+pytest-mock==3.6.1
     # via -r .\requirements\tests.in
-pytest==6.2.2
+pytest==6.2.4
     # via
     #   -r .\requirements\tests.in
     #   pytest-mock
 pytz==2021.1
     # via babel
-pywinpty==0.5.7
+pywinpty==1.1.1
     # via -r .\requirements\tests.in
 pyyaml==5.4.1
     # via pre-commit
 requests==2.25.1
     # via sphinx
-six==1.15.0
+six==1.16.0
     # via
     #   livereload
     #   tox
@@ -106,21 +107,21 @@ snowballstemmer==2.1.0
     # via sphinx
 sphinx-autobuild==2021.3.14
     # via -r .\requirements\dev.in
-sphinx==3.5.2
+sphinx==4.0.2
     # via
     #   -r .\requirements\docs.in
     #   sphinx-autobuild
 sphinxcontrib-applehelp==1.0.2
     # via sphinx
 sphinxcontrib-devhelp==1.0.2
     # via sphinx
-sphinxcontrib-htmlhelp==1.0.3
+sphinxcontrib-htmlhelp==2.0.0
     # via sphinx
 sphinxcontrib-jsmath==1.0.1
     # via sphinx
 sphinxcontrib-qthelp==1.0.3
     # via sphinx
-sphinxcontrib-serializinghtml==1.1.4
+sphinxcontrib-serializinghtml==1.1.5
     # via sphinx
 toml==0.10.2
     # via
@@ -130,11 +131,11 @@ toml==0.10.2
     #   tox
 tornado==6.1
     # via livereload
-tox==3.23.0
+tox==3.23.1
     # via -r .\requirements\dev.in
-urllib3==1.26.4
+urllib3==1.26.5
     # via requests
-virtualenv==20.4.3
+virtualenv==20.4.7
     # via
     #   pre-commit
     #   tox

requirements/docs.txt

@@ -6,27 +6,27 @@
 #
 alabaster==0.7.12
     # via sphinx
-babel==2.9.0
+babel==2.9.1
     # via sphinx
-certifi==2020.12.5
+certifi==2021.5.30
     # via requests
 chardet==4.0.0
     # via requests
 colorama==0.4.4
     # via sphinx
-docutils==0.16
+docutils==0.17.1
     # via sphinx
 idna==2.10
     # via requests
 imagesize==1.2.0
     # via sphinx
-jinja2==2.11.3
+jinja2==3.0.1
     # via sphinx
-markupsafe==1.1.1
+markupsafe==2.0.1
     # via jinja2
 packaging==20.9
     # via sphinx
-pygments==2.8.1
+pygments==2.9.0
     # via sphinx
 pyparsing==2.4.7
     # via packaging
@@ -36,21 +36,21 @@ requests==2.25.1
     # via sphinx
 snowballstemmer==2.1.0
     # via sphinx
-sphinx==3.5.2
+sphinx==4.0.2
     # via -r .\requirements\docs.in
 sphinxcontrib-applehelp==1.0.2
     # via sphinx
 sphinxcontrib-devhelp==1.0.2
     # via sphinx
-sphinxcontrib-htmlhelp==1.0.3
+sphinxcontrib-htmlhelp==2.0.0
     # via sphinx
 sphinxcontrib-jsmath==1.0.1
     # via sphinx
 sphinxcontrib-qthelp==1.0.3
     # via sphinx
-sphinxcontrib-serializinghtml==1.1.4
+sphinxcontrib-serializinghtml==1.1.5
     # via sphinx
-urllib3==1.26.4
+urllib3==1.26.5
     # via requests
 
 # The following packages are considered to be unsafe in a requirements file:

requirements/tests.txt

@@ -6,7 +6,7 @@
 #
 atomicwrites==1.4.0
     # via pytest
-attrs==20.3.0
+attrs==21.2.0
     # via pytest
 colorama==0.4.4
     # via pytest
@@ -20,13 +20,13 @@ py==1.10.0
     # via pytest
 pyparsing==2.4.7
     # via packaging
-pytest-mock==3.5.1
+pytest-mock==3.6.1
     # via -r .\requirements\tests.in
-pytest==6.2.2
+pytest==6.2.4
     # via
     #   -r .\requirements\tests.in
     #   pytest-mock
-pywinpty==0.5.7
+pywinpty==1.1.1
     # via -r .\requirements\tests.in
 toml==0.10.2
     # via pytest

tests/test_cli.py

@@ -1,3 +1,4 @@
+import os
 import subprocess
 from textwrap import dedent
 
@@ -14,6 +15,10 @@
 
 skip_if_winpty_is_missing = pytest.mark.skipif(winpty is None, reason="winpty is missing")
 
+# Force WinPTY backend instead of ConPTY. The latter doesn't seem to send
+# SIGINTs properly when the tests are run via tox.
+os.environ['PYWINPTY_BACKEND'] = '1'
+
 
 def test_stdin(child_ahk):
     code = "import ahkpy as ahk, sys; print(__name__, __file__, sys.argv)"
@@ -242,27 +247,27 @@ def test_interactive_mode(request):
     assert "Python 3" in proc.readline()
     assert 'Type "help"' in proc.readline()
     assert "(InteractiveConsole)" in proc.readline()
-    assert proc.read(3) == ">>>"
+    assert ">>>" in proc.read()
 
     proc.write("import sys; sys.argv\r\n")
     assert "import sys; sys.argv" in proc.readline()
     assert "['']" in proc.readline()
-    assert proc.read(3) == ">>>"
+    assert ">>>" in proc.read()
 
     proc.write("nonexistent\r\n")
     assert "nonexistent" in proc.readline()
     assert "Traceback" in proc.readline()
     assert "  File" in proc.readline()
     assert "NameError: name 'nonexistent' is not defined" in proc.readline()
-    assert proc.read(3) == ">>>"
+    assert ">>>" in proc.read()
 
     proc.write("!\r\n")
     assert "!" in proc.readline()
     assert '  File "<console>"' in proc.readline()
     assert "    !" in proc.readline()
     assert "    ^" in proc.readline()
     assert "SyntaxError: invalid syntax" in proc.readline()
-    assert proc.read(3) == ">>>"
+    assert ">>>" in proc.read()
 
     proc.write("exit()\r\n")
     proc.wait()
@@ -324,7 +329,6 @@ def code():
     proc.sendintr()
     proc.wait()
     assert proc.exitstatus == STATUS_CONTROL_C_EXIT
-    assert "KeyboardInterrupt" in proc.read()
 
 
 @skip_if_winpty_is_missing