Skip to content

Commit ac9fe69

Browse files
authored
Merge pull request #673 from addyess/feature/py3.10-support
support python3.10 with later versions of websockets (manually merged because the bot was getting ghprb request failures)
2 parents 276ecf2 + f6c0807 commit ac9fe69

3 files changed

Lines changed: 18 additions & 4 deletions

File tree

.github/workflows/tox.yaml

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,13 @@ jobs:
88
runs-on: ubuntu-latest
99
strategy:
1010
matrix:
11-
python: [3.5, 3.6, 3.7, 3.8, 3.9]
11+
python:
12+
- "3.5"
13+
- "3.6"
14+
- "3.7"
15+
- "3.8"
16+
- "3.9"
17+
- "3.10"
1218
steps:
1319
- name: Check out code
1420
uses: actions/checkout@v2
@@ -25,7 +31,13 @@ jobs:
2531
runs-on: ubuntu-latest
2632
strategy:
2733
matrix:
28-
python: [3.5, 3.6, 3.7, 3.8, 3.9]
34+
python:
35+
- "3.5"
36+
- "3.6"
37+
- "3.7"
38+
- "3.8"
39+
- "3.9"
40+
- "3.10"
2941
steps:
3042
- uses: actions/checkout@v2
3143
- name: Setup Python

setup.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,8 @@
3636
'pyyaml>=5.1.2,<=6.0',
3737
'theblues>=0.5.1,<1.0',
3838
'websockets>=7.0,<8.0 ; python_version<"3.9"',
39-
'websockets>=8.0,<9.0 ; python_version>="3.9"',
39+
'websockets>=8.0,<9.0 ; python_version=="3.9"',
40+
'websockets>=9.0; python_version>"3.9"',
4041
'paramiko>=2.4.0,<3.0.0',
4142
'pyasn1>=0.4.4',
4243
'toposort>=1.5,<2',
@@ -60,6 +61,7 @@
6061
"Programming Language :: Python :: 3.7",
6162
"Programming Language :: Python :: 3.8",
6263
"Programming Language :: Python :: 3.9",
64+
"Programming Language :: Python :: 3.10",
6365
],
6466
entry_points={
6567
'console_scripts': [

tox.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# and then run "tox" from this directory.
55

66
[tox]
7-
envlist = lint,py3,py35,py36,py37,py38,py39
7+
envlist = lint,py3,py35,py36,py37,py38,py39,py310
88
skipsdist=True
99

1010
[pytest]

0 commit comments

Comments
 (0)