From 1b04d30353f0bc222e0d3a3a75b51dcd3cb6248c Mon Sep 17 00:00:00 2001 From: Daniel Grossmann-Kavanagh Date: Wed, 11 Dec 2019 18:23:32 -0800 Subject: [PATCH] remove check for python versions less than 3.5 --- connexion/__init__.py | 15 +++++++-------- setup.py | 15 ++++----------- 2 files changed, 11 insertions(+), 19 deletions(-) diff --git a/connexion/__init__.py b/connexion/__init__.py index 902e0be54..8009f4aef 100755 --- a/connexion/__init__.py +++ b/connexion/__init__.py @@ -37,14 +37,13 @@ def _required_lib(exec_info, *args, **kwargs): App = FlaskApp Api = FlaskApi -if sys.version_info >= (3, 5, 3): # pragma: no cover - try: - from .apis.aiohttp_api import AioHttpApi - from .apps.aiohttp_app import AioHttpApp - except ImportError: # pragma: no cover - _aiohttp_not_installed_error = not_installed_error() - AioHttpApi = _aiohttp_not_installed_error - AioHttpApp = _aiohttp_not_installed_error +try: + from .apis.aiohttp_api import AioHttpApi + from .apps.aiohttp_app import AioHttpApp +except ImportError: # pragma: no cover + _aiohttp_not_installed_error = not_installed_error() + AioHttpApi = _aiohttp_not_installed_error + AioHttpApp = _aiohttp_not_installed_error # This version is replaced during release process. __version__ = '2018.0.dev1' diff --git a/setup.py b/setup.py index 2de1a6ada..118427f47 100755 --- a/setup.py +++ b/setup.py @@ -47,10 +47,9 @@ def read_version(package): swagger_ui_require ] -if sys.version_info >= (3, 5, 3): - tests_require.extend(aiohttp_require) - tests_require.append('pytest-aiohttp') - tests_require.append('aiohttp-remotes') +tests_require.extend(aiohttp_require) +tests_require.append('pytest-aiohttp') +tests_require.append('aiohttp-remotes') class PyTest(TestCommand): @@ -61,13 +60,7 @@ def initialize_options(self): TestCommand.initialize_options(self) self.cov = None self.pytest_args = ['--cov', 'connexion', '--cov-report', 'term-missing', '-v'] - - if sys.version_info < (3, 5, 3): - self.pytest_args.append('--cov-config=py2-coveragerc') - self.pytest_args.append('--ignore=tests/aiohttp') - else: - self.pytest_args.append('--cov-config=py3-coveragerc') - + self.pytest_args.append('--cov-config=py3-coveragerc') self.cov_html = False def finalize_options(self):