From c50367dd4775286cd4c1f60b1c017dec25de0112 Mon Sep 17 00:00:00 2001 From: Thomas Grainger Date: Tue, 10 Aug 2021 07:40:02 +0100 Subject: [PATCH 1/9] update CI and trove to 3.10 --- .github/workflows/test.yaml | 2 +- azure-pipelines/run_test_steps.yml | 1 + setup.cfg | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 6443943934e..4bfa28e136c 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -41,7 +41,7 @@ jobs: # When updating the minimum Python version here, also update the # `python_requires` from `setup.cfg`. # Run on latest minor release of each major python version. - python-version: [3.6, 3.7, 3.8, 3.9, 3.10.0-beta.4] + python-version: [3.6, 3.7, 3.8, 3.9, 3.10.0-rc.1] tox-env: ['alldeps-withcov-posix'] # By default, tests are executed without disabling IPv6. noipv6: [''] diff --git a/azure-pipelines/run_test_steps.yml b/azure-pipelines/run_test_steps.yml index ab464843daa..8181241f60c 100644 --- a/azure-pipelines/run_test_steps.yml +++ b/azure-pipelines/run_test_steps.yml @@ -13,6 +13,7 @@ parameters: - '3.7' - '3.8' - '3.9' + - '3.10.0-rc.1' - name: windowsReactor type: string diff --git a/setup.cfg b/setup.cfg index aca60a2e4d5..f51fbb9e913 100644 --- a/setup.cfg +++ b/setup.cfg @@ -20,6 +20,7 @@ classifiers = Programming Language :: Python :: 3.7 Programming Language :: Python :: 3.8 Programming Language :: Python :: 3.9 + Programming Language :: Python :: 3.10 long_description_content_type = text/x-rst [options] From c74481dd090452b99a560372f5d17b2811d4c2b8 Mon Sep 17 00:00:00 2001 From: Thomas Grainger Date: Tue, 10 Aug 2021 07:40:15 +0100 Subject: [PATCH 2/9] bump cython-test-exception-raiser --- setup.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.cfg b/setup.cfg index f51fbb9e913..07d230b88f9 100644 --- a/setup.cfg +++ b/setup.cfg @@ -49,7 +49,7 @@ packages = find: ; We trust semantic versioning and auto-upgrading to a bugfix release ; should be OK. test = - cython-test-exception-raiser ~= 1.0 + cython-test-exception-raiser >= 1.0.2, <2 PyHamcrest >= 1.9.0 ; List of dependencies required to build the documentation and test the From d6314f527f5735a0532b242c5d50a12622281f6c Mon Sep 17 00:00:00 2001 From: Thomas Grainger Date: Tue, 10 Aug 2021 07:43:17 +0100 Subject: [PATCH 3/9] add newsfragment --- src/twisted/newsfragments/10250.misc | 1 + 1 file changed, 1 insertion(+) create mode 100644 src/twisted/newsfragments/10250.misc diff --git a/src/twisted/newsfragments/10250.misc b/src/twisted/newsfragments/10250.misc new file mode 100644 index 00000000000..527f3f3902d --- /dev/null +++ b/src/twisted/newsfragments/10250.misc @@ -0,0 +1 @@ +official support for Py3.10 From 091831ffbe299d8d7f0b58dbac5177c6daef1b94 Mon Sep 17 00:00:00 2001 From: Thomas Grainger Date: Fri, 13 Aug 2021 07:56:21 +0100 Subject: [PATCH 4/9] pin sphinx from git to work around UnionType missing also sphinx-build is now detected correctly --- setup.cfg | 2 +- tox.ini | 11 ++++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/setup.cfg b/setup.cfg index 07d230b88f9..d668b66e208 100644 --- a/setup.cfg +++ b/setup.cfg @@ -59,7 +59,7 @@ dev_release = pydoctor ~= 21.2.2; python_version >= "3.6" sphinx-rtd-theme ~= 0.5 readthedocs-sphinx-ext ~= 2.1 - sphinx ~= 3.3 + sphinx >= 4.1.2, <6 ; All the extra tools used to help with the development process. dev = diff --git a/tox.ini b/tox.ini index 3ae10814e9e..4f13a362187 100644 --- a/tox.ini +++ b/tox.ini @@ -60,6 +60,8 @@ extras = ;; dependencies that are not specified as extras deps = lint: pre-commit + ; bugfix for https://github.com/sphinx-doc/sphinx/pull/9513/ on py310rc1 + alldeps: sphinx @ https://github.com/sphinx-doc/sphinx/archive/d194e0f4909b0887b37e2a32787f6b4c0fe8862a.tar.gz ; All environment variables are passed. passenv = * @@ -124,8 +126,9 @@ description = Build the full documentation (narrative and apidocs). extras = dev_release -; It looks like tox don't recognize this a deps script. -allowlist_externals = sphinx-build +deps = + ; bugfix for https://github.com/sphinx-doc/sphinx/pull/9513/ on py310rc1 + sphinx @ https://github.com/sphinx-doc/sphinx/archive/d194e0f4909b0887b37e2a32787f6b4c0fe8862a.tar.gz setenv = # Set this to `True` to run similar to Read The Docs. @@ -152,7 +155,9 @@ description = Build the API documentation. extras = dev_release commands = {toxinidir}/bin/admin/build-apidocs {toxinidir}/src/ apidocs - +deps = + ; bugfix for https://github.com/sphinx-doc/sphinx/pull/9513/ on py310rc1 + sphinx @ https://github.com/sphinx-doc/sphinx/archive/d194e0f4909b0887b37e2a32787f6b4c0fe8862a.tar.gz [testenv:mypy] description = run Mypy (static type checker) From 92dcdc3318a83e5a6a8e5064e17ff05cd2c864d2 Mon Sep 17 00:00:00 2001 From: Thomas Grainger Date: Mon, 23 Aug 2021 11:02:00 +0100 Subject: [PATCH 5/9] upgrade tox deps --- tox.ini | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tox.ini b/tox.ini index 4f13a362187..c85768c22af 100644 --- a/tox.ini +++ b/tox.ini @@ -16,9 +16,9 @@ ; See README.rst for example tox commands. ; [tox] -minversion=3.21.4 +minversion=3.24.1 requires= - virtualenv>=20.4.2 + virtualenv>=20.7.2 tox-wheel>=0.6.0 skip_missing_interpreters=True envlist=lint, mypy, From 1da2a3e6094ba37593bdef837ae01ba3fcd1273a Mon Sep 17 00:00:00 2001 From: Thomas Grainger Date: Mon, 23 Aug 2021 13:19:38 +0100 Subject: [PATCH 6/9] bump twisted-iocpsupport to 1.0.2rc0 --- setup.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.cfg b/setup.cfg index d668b66e208..2e2e65cb998 100644 --- a/setup.cfg +++ b/setup.cfg @@ -34,7 +34,7 @@ install_requires = hyperlink >= 17.1.1 attrs >= 19.2.0 typing_extensions >= 3.6.5 - twisted-iocpsupport ~= 1.0.0; platform_system == "Windows" + twisted-iocpsupport >= 1.0.2rc0, <2; platform_system == "Windows" include_package_data = True zip_safe = False package_dir = =src From 5ba9dc861e466b64f6b17bddf6c0086ae50fc52d Mon Sep 17 00:00:00 2001 From: Thomas Grainger Date: Mon, 23 Aug 2021 13:21:14 +0100 Subject: [PATCH 7/9] Update src/twisted/newsfragments/10250.misc --- src/twisted/newsfragments/10250.misc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/twisted/newsfragments/10250.misc b/src/twisted/newsfragments/10250.misc index 527f3f3902d..51ea7eb2690 100644 --- a/src/twisted/newsfragments/10250.misc +++ b/src/twisted/newsfragments/10250.misc @@ -1 +1 @@ -official support for Py3.10 +Document official support for Py3.10. (Metadata change only) From 31e33dca8569b9b61c06f03027c5d4351353777e Mon Sep 17 00:00:00 2001 From: Thomas Grainger Date: Mon, 6 Sep 2021 15:29:26 +0100 Subject: [PATCH 8/9] use the final version of twisted-iocpsupport 1.0.2 --- setup.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.cfg b/setup.cfg index 2e2e65cb998..3c112df7789 100644 --- a/setup.cfg +++ b/setup.cfg @@ -34,7 +34,7 @@ install_requires = hyperlink >= 17.1.1 attrs >= 19.2.0 typing_extensions >= 3.6.5 - twisted-iocpsupport >= 1.0.2rc0, <2; platform_system == "Windows" + twisted-iocpsupport >= 1.0.2, <2; platform_system == "Windows" include_package_data = True zip_safe = False package_dir = =src From 7e63ba1b03fc6ba11262327e890561cfd3cb2700 Mon Sep 17 00:00:00 2001 From: Thomas Grainger Date: Mon, 6 Sep 2021 15:32:06 +0100 Subject: [PATCH 9/9] bump sphinx version --- tox.ini | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tox.ini b/tox.ini index c85768c22af..3c62a5b705d 100644 --- a/tox.ini +++ b/tox.ini @@ -61,7 +61,7 @@ extras = deps = lint: pre-commit ; bugfix for https://github.com/sphinx-doc/sphinx/pull/9513/ on py310rc1 - alldeps: sphinx @ https://github.com/sphinx-doc/sphinx/archive/d194e0f4909b0887b37e2a32787f6b4c0fe8862a.tar.gz + alldeps: sphinx @ https://github.com/sphinx-doc/sphinx/archive/514fca7a407f03fae4c788178555a74256936655.tar.gz ; All environment variables are passed. passenv = * @@ -128,7 +128,7 @@ extras = deps = ; bugfix for https://github.com/sphinx-doc/sphinx/pull/9513/ on py310rc1 - sphinx @ https://github.com/sphinx-doc/sphinx/archive/d194e0f4909b0887b37e2a32787f6b4c0fe8862a.tar.gz + sphinx @ https://github.com/sphinx-doc/sphinx/archive/514fca7a407f03fae4c788178555a74256936655.tar.gz setenv = # Set this to `True` to run similar to Read The Docs. @@ -157,7 +157,7 @@ extras = dev_release commands = {toxinidir}/bin/admin/build-apidocs {toxinidir}/src/ apidocs deps = ; bugfix for https://github.com/sphinx-doc/sphinx/pull/9513/ on py310rc1 - sphinx @ https://github.com/sphinx-doc/sphinx/archive/d194e0f4909b0887b37e2a32787f6b4c0fe8862a.tar.gz + sphinx @ https://github.com/sphinx-doc/sphinx/archive/514fca7a407f03fae4c788178555a74256936655.tar.gz [testenv:mypy] description = run Mypy (static type checker)