From 37f0a510639f6acbea2f44ab59be2fc5c2939ceb Mon Sep 17 00:00:00 2001 From: Adam Hopkins Date: Sun, 21 Feb 2021 23:28:28 +0200 Subject: [PATCH 1/2] Remove Python 3.6 support --- .travis.yml | 20 -------------------- README.rst | 1 + sanic/server.py | 6 ++---- setup.py | 5 ++--- tests/test_app.py | 9 --------- tests/test_asgi.py | 12 ++---------- 6 files changed, 7 insertions(+), 46 deletions(-) diff --git a/.travis.yml b/.travis.yml index ac5770116f..fd20da4ce7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,12 +5,6 @@ cache: - $HOME/.cache/pip matrix: include: - - env: TOX_ENV=py36 - python: 3.6 - name: "Python 3.6 with Extensions" - - env: TOX_ENV=py36-no-ext - python: 3.6 - name: "Python 3.6 without Extensions" - env: TOX_ENV=py37 python: 3.7 dist: xenial @@ -41,9 +35,6 @@ matrix: dist: bionic sudo: true name: "Python 3.9 without Extensions" - - env: TOX_ENV=type-checking - python: 3.6 - name: "Python 3.6 Type checks" - env: TOX_ENV=type-checking python: 3.7 name: "Python 3.7 Type checks" @@ -54,17 +45,6 @@ matrix: python: 3.9 dist: bionic name: "Python 3.9 Type checks" - - env: TOX_ENV=lint - python: 3.6 - name: "Python 3.6 Linter checks" - - env: TOX_ENV=check - python: 3.6 - name: "Python 3.6 Package checks" - - env: TOX_ENV=security - python: 3.6 - dist: xenial - sudo: true - name: "Python 3.6 Bandit security scan" - env: TOX_ENV=security python: 3.7 dist: xenial diff --git a/README.rst b/README.rst index 2472a076c2..844a91443d 100644 --- a/README.rst +++ b/README.rst @@ -130,6 +130,7 @@ And, we can verify it is working: ``curl localhost:8000 -i`` **Now, let's go build something fast!** +Minimum Python version is 3.7. If you need Python 3.6 support, please use v20.12LTS. Documentation ------------- diff --git a/sanic/server.py b/sanic/server.py index 3564f4fac4..adc865a064 100644 --- a/sanic/server.py +++ b/sanic/server.py @@ -4,7 +4,6 @@ import secrets import socket import stat -import sys from asyncio import CancelledError from functools import partial @@ -125,7 +124,6 @@ def __init__( ): asyncio.set_event_loop(loop) self.loop = loop - deprecated_loop = self.loop if sys.version_info < (3, 7) else None self.app = app self.url = None self.transport = None @@ -147,8 +145,8 @@ def __init__( self.state = state if state else {} if "requests_count" not in self.state: self.state["requests_count"] = 0 - self._data_received = asyncio.Event(loop=deprecated_loop) - self._can_write = asyncio.Event(loop=deprecated_loop) + self._data_received = asyncio.Event() + self._can_write = asyncio.Event() self._can_write.set() self._exception = None self._unix = unix diff --git a/setup.py b/setup.py index 31f2c119b4..265e681e47 100644 --- a/setup.py +++ b/setup.py @@ -64,12 +64,11 @@ def open_local(paths, mode="r", encoding="utf8"): "packages": ["sanic"], "package_data": {"sanic": ["py.typed"]}, "platforms": "any", - "python_requires": ">=3.6", + "python_requires": ">=3.7", "classifiers": [ "Development Status :: 4 - Beta", "Environment :: Web Environment", "License :: OSI Approved :: MIT License", - "Programming Language :: Python :: 3.6", "Programming Language :: Python :: 3.7", "Programming Language :: Python :: 3.8", "Programming Language :: Python :: 3.9", @@ -81,7 +80,7 @@ def open_local(paths, mode="r", encoding="utf8"): '; sys_platform != "win32" ' 'and implementation_name == "cpython"' ) ujson = "ujson>=1.35" + env_dependency -uvloop = "uvloop>=0.5.3,<0.15.0" + env_dependency +uvloop = "uvloop>=0.5.3" + env_dependency requirements = [ "sanic-routing", diff --git a/tests/test_app.py b/tests/test_app.py index f82eb5da42..b5810000e9 100644 --- a/tests/test_app.py +++ b/tests/test_app.py @@ -32,9 +32,6 @@ async def handler(request): assert response.text == "pass" -@pytest.mark.skipif( - sys.version_info < (3, 7), reason="requires python3.7 or higher" -) def test_create_asyncio_server(app): if not uvloop_installed(): loop = asyncio.get_event_loop() @@ -44,9 +41,6 @@ def test_create_asyncio_server(app): assert srv.is_serving() is True -@pytest.mark.skipif( - sys.version_info < (3, 7), reason="requires python3.7 or higher" -) def test_asyncio_server_no_start_serving(app): if not uvloop_installed(): loop = asyncio.get_event_loop() @@ -59,9 +53,6 @@ def test_asyncio_server_no_start_serving(app): assert srv.is_serving() is False -@pytest.mark.skipif( - sys.version_info < (3, 7), reason="requires python3.7 or higher" -) def test_asyncio_server_start_serving(app): if not uvloop_installed(): loop = asyncio.get_event_loop() diff --git a/tests/test_asgi.py b/tests/test_asgi.py index d5111c8719..1859560dc4 100644 --- a/tests/test_asgi.py +++ b/tests/test_asgi.py @@ -86,11 +86,7 @@ def install_signal_handlers(self): with pytest.warns(UserWarning): server.run() - all_tasks = ( - asyncio.Task.all_tasks() - if sys.version_info < (3, 7) - else asyncio.all_tasks(asyncio.get_event_loop()) - ) + all_tasks = asyncio.all_tasks(asyncio.get_event_loop()) for task in all_tasks: task.cancel() @@ -140,11 +136,7 @@ def install_signal_handlers(self): with pytest.warns(UserWarning): server.run() - all_tasks = ( - asyncio.Task.all_tasks() - if sys.version_info < (3, 7) - else asyncio.all_tasks(asyncio.get_event_loop()) - ) + all_tasks = asyncio.all_tasks(asyncio.get_event_loop()) for task in all_tasks: task.cancel() From 8f3e076661d79ba2e5efbf92261ae789d71550c3 Mon Sep 17 00:00:00 2001 From: Adam Hopkins Date: Sun, 21 Feb 2021 23:42:32 +0200 Subject: [PATCH 2/2] trivial --- sanic/server.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sanic/server.py b/sanic/server.py index adc865a064..8497d3ba4d 100644 --- a/sanic/server.py +++ b/sanic/server.py @@ -36,7 +36,9 @@ class Signal: class ConnInfo: - """Local and remote addresses and SSL status info.""" + """ + Local and remote addresses and SSL status info. + """ __slots__ = ( "sockname",