From b9b3b4051aa2a10a9c9b493a0d1c078e2129a1dc Mon Sep 17 00:00:00 2001 From: Adam Hopkins Date: Thu, 24 Dec 2020 21:56:35 +0200 Subject: [PATCH 1/2] Update reqs to get tox running --- setup.py | 14 ++++++++++---- tox.ini | 10 +++++----- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/setup.py b/setup.py index a0e4bf1e..fc19e20a 100644 --- a/setup.py +++ b/setup.py @@ -5,6 +5,7 @@ import codecs import os import re import sys + from distutils.util import strtobool from setuptools import setup @@ -24,6 +25,7 @@ class PyTest(TestCommand): def run_tests(self): import shlex + import pytest errno = pytest.main(shlex.split(self.pytest_args)) @@ -38,7 +40,9 @@ def open_local(paths, mode="r", encoding="utf8"): with open_local(["sanic", "__version__.py"], encoding="latin1") as fp: try: - version = re.findall(r"^__version__ = \"([^']+)\"\r?$", fp.read(), re.M)[0] + version = re.findall( + r"^__version__ = \"([^']+)\"\r?$", fp.read(), re.M + )[0] except IndexError: raise RuntimeError("Unable to determine version.") @@ -72,7 +76,9 @@ setup_kwargs = { "entry_points": {"console_scripts": ["sanic = sanic.__main__:main"]}, } -env_dependency = '; sys_platform != "win32" ' 'and implementation_name == "cpython"' +env_dependency = ( + '; sys_platform != "win32" ' 'and implementation_name == "cpython"' +) ujson = "ujson>=1.35" + env_dependency uvloop = "uvloop>=0.5.3" + env_dependency @@ -89,9 +95,9 @@ requirements = [ tests_require = [ "pytest==5.2.1", "multidict>=5.0,<6.0", - "gunicorn", + "gunicorn==20.0.4", "pytest-cov", - "httpcore==0.3.0", + "httpcore==0.11.*", "beautifulsoup4", uvloop, ujson, diff --git a/tox.ini b/tox.ini index 908f45c8..49998c98 100644 --- a/tox.ini +++ b/tox.ini @@ -7,18 +7,18 @@ setenv = {py36,py37,py38,py39,pyNightly}-no-ext: SANIC_NO_UJSON=1 {py36,py37,py38,py39,pyNightly}-no-ext: SANIC_NO_UVLOOP=1 deps = - coverage + coverage==5.3 pytest==5.2.1 pytest-cov pytest-sanic pytest-sugar pytest-benchmark pytest-dependency - httpcore==0.3.0 + httpcore==0.11.* httpx==0.15.4 - chardet<=2.3.0 + chardet==3.* beautifulsoup4 - gunicorn + gunicorn==20.0.4 uvicorn websockets>=8.1,<9.0 commands = @@ -76,7 +76,7 @@ deps = recommonmark>=0.5.0 docutils pygments - gunicorn + gunicorn==20.0.4 commands = make docs-test From ea9cf365bc0fffda55fb205fe6d95f9690619762 Mon Sep 17 00:00:00 2001 From: Adam Hopkins Date: Thu, 24 Dec 2020 22:09:51 +0200 Subject: [PATCH 2/2] Turn off Appyveyor 3.9 --- .appveyor.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index e983faa0..2d994cf5 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -17,11 +17,11 @@ environment: PYTHON_VERSION: "3.8.x" PYTHON_ARCH: "64" - - TOXENV: py39-no-ext - PYTHON: "C:\\Python39-x64\\python" - PYTHONPATH: "C:\\Python39-x64" - PYTHON_VERSION: "3.9.x" - PYTHON_ARCH: "64" + # - TOXENV: py39-no-ext + # PYTHON: "C:\\Python39-x64\\python" + # PYTHONPATH: "C:\\Python39-x64" + # PYTHON_VERSION: "3.9.x" + # PYTHON_ARCH: "64" init: SET "PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%"