Skip to content

Commit 16a1cd3

Browse files
committed
Require Python 3.7 for start_tls support.
Support start_tls is required to allow proxying HTTPS connections, since the unencrypted HTTP connection gets upgraded to HTTPS in-place right after the CONNECT succeeds. Remove 3.6 configurations for CI and such, add 3.8 where it was missing, bump 3.8 images for CircleCI to the final ones.
1 parent ad3aa46 commit 16a1cd3

6 files changed

Lines changed: 10 additions & 23 deletions

File tree

.appveyor.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ branches:
55
skip_branch_with_pr: true
66

77
environment:
8-
# websockets only works on Python >= 3.6.
9-
CIBW_SKIP: cp27-* cp33-* cp34-* cp35-*
8+
# websockets only works on Python >= 3.7.
9+
CIBW_SKIP: cp27-* cp33-* cp34-* cp35-* cp36-*
1010
CIBW_TEST_COMMAND: python -W default -m unittest
1111
WEBSOCKETS_TESTS_TIMEOUT_FACTOR: 100
1212

.circleci/config.yml

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,6 @@ jobs:
1111
- run: sudo pip install tox codecov
1212
- run: tox -e coverage,black,flake8,isort,mypy
1313
- run: codecov
14-
py36:
15-
docker:
16-
- image: circleci/python:3.6
17-
steps:
18-
# Remove IPv6 entry for localhost in Circle CI containers because it doesn't work anyway.
19-
- run: sudo cp /etc/hosts /tmp; sudo sed -i '/::1/d' /tmp/hosts; sudo cp /tmp/hosts /etc
20-
- checkout
21-
- run: sudo pip install tox
22-
- run: tox -e py36
2314
py37:
2415
docker:
2516
- image: circleci/python:3.7
@@ -31,7 +22,7 @@ jobs:
3122
- run: tox -e py37
3223
py38:
3324
docker:
34-
- image: circleci/python:3.8.0rc1
25+
- image: circleci/python:3.8
3526
steps:
3627
# Remove IPv6 entry for localhost in Circle CI containers because it doesn't work anyway.
3728
- run: sudo cp /etc/hosts /tmp; sudo sed -i '/::1/d' /tmp/hosts; sudo cp /tmp/hosts /etc
@@ -44,9 +35,6 @@ workflows:
4435
build:
4536
jobs:
4637
- main
47-
- py36:
48-
requires:
49-
- main
5038
- py37:
5139
requires:
5240
- main

.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
env:
22
global:
3-
# websockets only works on Python >= 3.6.
4-
- CIBW_SKIP="cp27-* cp33-* cp34-* cp35-*"
3+
# websockets only works on Python >= 3.7.
4+
- CIBW_SKIP="cp27-* cp33-* cp34-* cp35-*" cp36-*
55
- CIBW_TEST_COMMAND="python3 -W default -m unittest"
66
- WEBSOCKETS_TESTS_TIMEOUT_FACTOR=100
77

setup.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[bdist_wheel]
2-
python-tag = py36.py37
2+
python-tag = py37.py38
33

44
[metadata]
55
license_file = LICENSE

setup.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121

2222
exec((root_dir / 'src' / 'websockets' / 'version.py').read_text(encoding='utf-8'))
2323

24-
if sys.version_info[:3] < (3, 6, 1):
25-
raise Exception("websockets requires Python >= 3.6.1.")
24+
if sys.version_info[:3] < (3, 7):
25+
raise Exception("websockets requires Python >= 3.7.")
2626

2727
packages = ['websockets', 'websockets/extensions']
2828

@@ -51,7 +51,6 @@
5151
'Operating System :: OS Independent',
5252
'Programming Language :: Python',
5353
'Programming Language :: Python :: 3',
54-
'Programming Language :: Python :: 3.6',
5554
'Programming Language :: Python :: 3.7',
5655
'Programming Language :: Python :: 3.8',
5756
],
@@ -61,6 +60,6 @@
6160
ext_modules=ext_modules,
6261
include_package_data=True,
6362
zip_safe=False,
64-
python_requires='>=3.6.1',
63+
python_requires='>=3.7',
6564
test_loader='unittest:TestLoader',
6665
)

tox.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[tox]
2-
envlist = py36,py37,py38,coverage,black,flake8,isort,mypy
2+
envlist = py37,py38,coverage,black,flake8,isort,mypy
33

44
[testenv]
55
commands = python -W default -m unittest {posargs}

0 commit comments

Comments
 (0)