Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

10250 update CI and trove to 3.10 #1659

Merged
merged 10 commits into from
Sep 6, 2021
Merged

10250 update CI and trove to 3.10 #1659

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
c50367d
update CI and trove to 3.10
graingert Aug 10, 2021
c74481d
bump cython-test-exception-raiser
graingert Aug 10, 2021
d6314f5
add newsfragment
graingert Aug 10, 2021
091831f
pin sphinx from git to work around UnionType missing
graingert Aug 13, 2021
92dcdc3
upgrade tox deps
graingert Aug 23, 2021
1da2a3e
bump twisted-iocpsupport to 1.0.2rc0
graingert Aug 23, 2021
5ba9dc8
Update src/twisted/newsfragments/10250.misc
graingert Aug 23, 2021
31e33dc
use the final version of twisted-iocpsupport 1.0.2
graingert Sep 6, 2021
7e63ba1
bump sphinx version
graingert Sep 6, 2021
0c2262b
Merge branch 'trunk' into 310rc1
graingert Sep 6, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can we just set 3.10 and have it automatically updated just like the other version? Just asking.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@altendky made the trio python-version auto pick the latest Python build, but I think it would be better to update it dependabot style

tox-env: ['alldeps-withcov-posix']
# By default, tests are executed without disabling IPv6.
noipv6: ['']
Expand Down
1 change: 1 addition & 0 deletions azure-pipelines/run_test_steps.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ parameters:
- '3.7'
- '3.8'
- '3.9'
- '3.10.0-rc.1'

- name: windowsReactor
type: string
Expand Down
7 changes: 4 additions & 3 deletions setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,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]
Expand All @@ -34,7 +35,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.2, <2; platform_system == "Windows"
include_package_data = True
zip_safe = False
package_dir = =src
Expand All @@ -49,7 +50,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
Expand All @@ -59,7 +60,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 =
Expand Down
1 change: 1 addition & 0 deletions src/twisted/newsfragments/10250.misc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Document official support for Py3.10. (Metadata change only)
15 changes: 10 additions & 5 deletions tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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/514fca7a407f03fae4c788178555a74256936655.tar.gz

; All environment variables are passed.
passenv = *
Expand Down Expand Up @@ -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/514fca7a407f03fae4c788178555a74256936655.tar.gz

setenv =
# Set this to `True` to run similar to Read The Docs.
Expand All @@ -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/514fca7a407f03fae4c788178555a74256936655.tar.gz

[testenv:mypy]
description = run Mypy (static type checker)
Expand Down