From 315dbed5abf0663b11522022e9c7abbc1df54dc8 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 18 Jul 2023 03:40:19 +0000 Subject: [PATCH 1/3] Bump dependencies from commit bf9fe6 (#2709) * Dependency updates * Fix IPython tests? --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: EXPLOSION --- docs-requirements.txt | 12 ++++---- test-requirements.txt | 44 ++++++++++++++++++---------- trio/_core/_tests/test_multierror.py | 8 ++--- 3 files changed, 38 insertions(+), 26 deletions(-) diff --git a/docs-requirements.txt b/docs-requirements.txt index 06136fd765..1c1b89e873 100644 --- a/docs-requirements.txt +++ b/docs-requirements.txt @@ -16,9 +16,9 @@ babel==2.12.1 # via sphinx certifi==2023.5.7 # via requests -charset-normalizer==3.1.0 +charset-normalizer==3.2.0 # via requests -click==8.1.3 +click==8.1.5 # via # click-default-group # towncrier @@ -28,7 +28,7 @@ docutils==0.18.1 # via # sphinx # sphinx-rtd-theme -exceptiongroup==1.1.1 +exceptiongroup==1.1.2 # via -r docs-requirements.in idna==3.4 # via @@ -38,9 +38,9 @@ imagesize==1.4.1 # via sphinx immutables==0.19 # via -r docs-requirements.in -importlib-metadata==6.7.0 +importlib-metadata==6.8.0 # via sphinx -importlib-resources==5.12.0 +importlib-resources==6.0.0 # via towncrier incremental==22.10.0 # via towncrier @@ -97,7 +97,7 @@ towncrier==23.6.0 # via -r docs-requirements.in urllib3==2.0.3 # via requests -zipp==3.15.0 +zipp==3.16.2 # via # importlib-metadata # importlib-resources diff --git a/test-requirements.txt b/test-requirements.txt index 17fa0a099a..939bf7a61e 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -6,8 +6,10 @@ # astor==0.8.1 # via -r test-requirements.in -astroid==2.15.5 +astroid==2.15.6 # via pylint +asttokens==2.2.1 + # via stack-data async-generator==1.10 # via -r test-requirements.in attrs==23.1.0 @@ -16,19 +18,19 @@ attrs==23.1.0 # outcome backcall==0.2.0 # via ipython -black==23.3.0 ; implementation_name == "cpython" +black==23.7.0 ; implementation_name == "cpython" # via -r test-requirements.in build==0.10.0 # via pip-tools cffi==1.15.1 # via cryptography -click==8.1.3 +click==8.1.5 # via # black # pip-tools coverage==7.2.7 # via -r test-requirements.in -cryptography==41.0.1 +cryptography==41.0.2 # via # -r test-requirements.in # pyopenssl @@ -38,11 +40,13 @@ decorator==5.1.1 # via ipython dill==0.3.6 # via pylint -exceptiongroup==1.1.1 ; python_version < "3.11" +exceptiongroup==1.1.2 ; python_version < "3.11" # via # -r test-requirements.in # pytest -flake8==5.0.4 +executing==1.2.0 + # via stack-data +flake8==6.0.0 # via # -r test-requirements.in # flake8-pyproject @@ -54,9 +58,9 @@ idna==3.4 # trustme iniconfig==2.0.0 # via pytest -ipython==7.34.0 +ipython==8.12.2 # via -r test-requirements.in -isort==5.11.5 +isort==5.12.0 # via pylint jedi==0.18.2 # via @@ -94,23 +98,25 @@ pexpect==4.8.0 # via ipython pickleshare==0.7.5 # via ipython -pip-tools==6.14.0 +pip-tools==7.0.0 # via -r test-requirements.in -platformdirs==3.8.0 +platformdirs==3.9.1 # via # black # pylint pluggy==1.2.0 # via pytest -prompt-toolkit==3.0.38 +prompt-toolkit==3.0.39 # via ipython ptyprocess==0.7.0 # via pexpect -pycodestyle==2.9.1 +pure-eval==0.2.2 + # via stack-data +pycodestyle==2.10.0 # via flake8 pycparser==2.21 # via cffi -pyflakes==2.5.0 +pyflakes==3.0.1 # via flake8 pygments==2.15.1 # via ipython @@ -120,14 +126,18 @@ pyopenssl==23.2.0 # via -r test-requirements.in pyproject-hooks==1.0.0 # via build -pyright==1.1.316 +pyright==1.1.317 # via -r test-requirements.in pytest==7.4.0 # via -r test-requirements.in +six==1.16.0 + # via asttokens sniffio==1.3.0 # via -r test-requirements.in sortedcontainers==2.4.0 # via -r test-requirements.in +stack-data==0.6.2 + # via ipython tomli==2.0.1 # via # black @@ -136,6 +146,7 @@ tomli==2.0.1 # mypy # pip-tools # pylint + # pyproject-hooks # pytest tomlkit==0.11.8 # via pylint @@ -143,15 +154,16 @@ traitlets==5.9.0 # via # ipython # matplotlib-inline -trustme==1.0.0 +trustme==1.1.0 # via -r test-requirements.in types-pyopenssl==23.2.0.1 ; implementation_name == "cpython" # via -r test-requirements.in -typing-extensions==4.6.3 +typing-extensions==4.7.1 # via # -r test-requirements.in # astroid # black + # ipython # mypy # pylint wcwidth==0.2.6 diff --git a/trio/_core/_tests/test_multierror.py b/trio/_core/_tests/test_multierror.py index ca98ebf982..7a8bd2f9a8 100644 --- a/trio/_core/_tests/test_multierror.py +++ b/trio/_core/_tests/test_multierror.py @@ -472,10 +472,10 @@ def run_script(name, use_ipython=False): return completed -def check_simple_excepthook(completed, uses_ipython): +def check_simple_excepthook(completed): assert_match_in_seq( [ - "in ", + "in ", "MultiError", "--- 1 ---", "in exc1_fn", @@ -502,14 +502,14 @@ def check_simple_excepthook(completed, uses_ipython): @need_ipython def test_ipython_exc_handler(): completed = run_script("simple_excepthook.py", use_ipython=True) - check_simple_excepthook(completed, True) + check_simple_excepthook(completed) @slow @need_ipython def test_ipython_imported_but_unused(): completed = run_script("simple_excepthook_IPython.py") - check_simple_excepthook(completed, False) + check_simple_excepthook(completed) @slow From 47c1850de82937b24d01438ba5dbadbe83641326 Mon Sep 17 00:00:00 2001 From: Sam McCandlish <30874603+samsamoa@users.noreply.github.com> Date: Wed, 19 Jul 2023 11:54:22 -0700 Subject: [PATCH 2/3] Fix typo in reference-core.rst Normally I wouldn't make such a trivial PR, but this is such an excellent quote that I think it deserves to be fixed. --- docs/source/reference-core.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/reference-core.rst b/docs/source/reference-core.rst index 141e128026..f571d23294 100644 --- a/docs/source/reference-core.rst +++ b/docs/source/reference-core.rst @@ -693,7 +693,7 @@ Errors in multiple child tasks ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Normally, in Python, only one thing happens at a time, which means -that only one thing can wrong at a time. Trio has no such +that only one thing can go wrong at a time. Trio has no such limitation. Consider code like:: async def broken1(): From 11fa77d88d14d2577bec94e36c56391a767e4388 Mon Sep 17 00:00:00 2001 From: EXPLOSION Date: Thu, 20 Jul 2023 19:33:52 +0900 Subject: [PATCH 3/3] Make sure to make GitHub releases (#2710) * Improve documentation to make sure to make GitHub releases --- docs/source/releasing.rst | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/docs/source/releasing.rst b/docs/source/releasing.rst index 27cee864c0..0fe51370d5 100644 --- a/docs/source/releasing.rst +++ b/docs/source/releasing.rst @@ -29,7 +29,7 @@ Things to do for releasing: - review history change - - ``git rm`` changes + - ``git rm`` the now outdated newfragments + commit @@ -53,4 +53,10 @@ Things to do for releasing: * merge the release pull request +* make a GitHub release (go to the tag and press "Create release from tag") + + + paste in the new content in ``history.rst`` and convert it to markdown: turn the parts under section into ``---``, update links to just be the links, and whatever else is necessary. + + + include anything else that might be pertinent, like a link to the commits between the latest and current release. + * announce on gitter