diff --git a/connexion/__init__.py b/connexion/__init__.py index 902e0be..8009f4a 100755 --- a/connexion/__init__.py +++ b/connexion/__init__.py @@ -37,14 +37,13 @@ except ImportError: # pragma: no cover 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 2de1a6a..f2895cf 100755 --- a/setup.py +++ b/setup.py @@ -47,10 +47,9 @@ tests_require = [ 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): @@ -60,14 +59,8 @@ class PyTest(TestCommand): 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 = ['--cov', 'connexion', '--cov-report', 'term-missing', + '--cov-config=py3-coveragerc', '-v'] self.cov_html = False def finalize_options(self):