From d33f89d32ec62c5a3511c3140093236639abcbcc Mon Sep 17 00:00:00 2001 From: Quentin Pradet Date: Wed, 1 Jun 2022 09:56:26 +0400 Subject: [PATCH 1/4] Bump version to 0.21.0 --- docs/source/history.rst | 8 ++++++++ trio/_version.py | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/docs/source/history.rst b/docs/source/history.rst index 3fb51f346a..e36c9fbd1b 100644 --- a/docs/source/history.rst +++ b/docs/source/history.rst @@ -5,6 +5,14 @@ Release history .. towncrier release notes start +Trio 0.19.0+dev (2022-06-01) +---------------------------- + +- Trio now supports Python 3.11. (`#2270 + `__, `#2318 + `__, `#2319 + `__) + Trio 0.20.0 (2022-02-21) ------------------------ diff --git a/trio/_version.py b/trio/_version.py index 5a02c2e464..d05f3b85fa 100644 --- a/trio/_version.py +++ b/trio/_version.py @@ -1,3 +1,3 @@ # This file is imported from __init__.py and exec'd from setup.py -__version__ = "0.20.0+dev" +__version__ = "0.21.0" From dc454c7a3d404830c49f6d84633ede7cf2ac8e69 Mon Sep 17 00:00:00 2001 From: Quentin Pradet Date: Wed, 1 Jun 2022 10:02:41 +0400 Subject: [PATCH 2/4] Fix release notes --- docs/source/history.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/history.rst b/docs/source/history.rst index e36c9fbd1b..0cc8464394 100644 --- a/docs/source/history.rst +++ b/docs/source/history.rst @@ -5,7 +5,7 @@ Release history .. towncrier release notes start -Trio 0.19.0+dev (2022-06-01) +Trio 0.21.0 (2022-06-01) ---------------------------- - Trio now supports Python 3.11. (`#2270 From 5c03e97ece6ec38cae957c105cef54de872af2a4 Mon Sep 17 00:00:00 2001 From: Quentin Pradet Date: Wed, 1 Jun 2022 10:23:30 +0400 Subject: [PATCH 3/4] Fix compatibility with Python 3.11.0b2 --- ci.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ci.sh b/ci.sh index d4f9df3a94..cc2807b643 100755 --- a/ci.sh +++ b/ci.sh @@ -141,7 +141,9 @@ else # 'coverage xml' to generate the report that it uses, and that will only # apply the ignore patterns in the current directory's .coveragerc. cp ../.coveragerc . - if pytest -r a --junitxml=../test-results.xml --run-slow ${INSTALLDIR} --cov="$INSTALLDIR" --verbose; then + # --assert=plain disables pytest assertion rewrites so that we can test 3.11.0b2 + # https://github.com/pytest-dev/pytest/issues/10008 + if pytest -r a --junitxml=../test-results.xml --run-slow ${INSTALLDIR} --cov="$INSTALLDIR" --verbose --assert-plain; then PASSED=true else PASSED=false From 14f1cea14485035a6f073da4f6a87b76a37bbf80 Mon Sep 17 00:00:00 2001 From: Quentin Pradet Date: Wed, 1 Jun 2022 11:15:16 +0400 Subject: [PATCH 4/4] Fix assert=plain syntax --- ci.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci.sh b/ci.sh index cc2807b643..b3c074e840 100755 --- a/ci.sh +++ b/ci.sh @@ -143,7 +143,7 @@ else cp ../.coveragerc . # --assert=plain disables pytest assertion rewrites so that we can test 3.11.0b2 # https://github.com/pytest-dev/pytest/issues/10008 - if pytest -r a --junitxml=../test-results.xml --run-slow ${INSTALLDIR} --cov="$INSTALLDIR" --verbose --assert-plain; then + if pytest -r a --junitxml=../test-results.xml --run-slow ${INSTALLDIR} --cov="$INSTALLDIR" --verbose --assert=plain; then PASSED=true else PASSED=false