From ddfb6c3760559789aad7f09e8edab2e5b982c342 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 11 May 2021 22:02:10 +0200 Subject: [PATCH] python3Packages.connexion: 2.4.0 -> 2.7.0 --- .../python-modules/connexion/default.nix | 79 ++++++------------- 1 file changed, 25 insertions(+), 54 deletions(-) diff --git a/pkgs/development/python-modules/connexion/default.nix b/pkgs/development/python-modules/connexion/default.nix index 25925f56069..0429ee7a507 100644 --- a/pkgs/development/python-modules/connexion/default.nix +++ b/pkgs/development/python-modules/connexion/default.nix @@ -1,89 +1,60 @@ -{ buildPythonPackage -, fetchFromGitHub -, isPy3k -, glibcLocales -, lib -, pythonOlder - +{ lib , aiohttp -, aiohttp-swagger , aiohttp-jinja2 +, aiohttp-remotes +, aiohttp-swagger +, buildPythonPackage , clickclick , decorator -, flake8 +, fetchFromGitHub , flask -, gevent , inflection , jsonschema -, mock , openapi-spec-validator -, pathlib -, pytest , pytest-aiohttp -, pytestcov +, pytestCheckHook +, pythonOlder , pyyaml , requests -, six , swagger-ui-bundle , testfixtures -, typing ? null -, ujson }: buildPythonPackage rec { pname = "connexion"; - version = "2.4.0"; + version = "2.7.0"; + disabled = pythonOlder "3.6"; - # we're fetching from GitHub because tests weren't distributed on PyPi src = fetchFromGitHub { owner = "zalando"; repo = pname; rev = version; - sha256 = "1b9q027wrks0afl7l3a1wxymz3aick26b9fq2m07pc5wb9np0vvg"; + sha256 = "15iflq5403diwda6n6qrpq67wkdcvl3vs0gsg0fapxqnq3a2m7jj"; }; - checkInputs = [ - decorator - mock - pytest - pytestcov - testfixtures - flask - swagger-ui-bundle - ] - ++ lib.optionals isPy3k [ aiohttp aiohttp-jinja2 aiohttp-swagger ujson pytest-aiohttp ] - ++ lib.optional (pythonOlder "3.7") glibcLocales - ; propagatedBuildInputs = [ + aiohttp + aiohttp-jinja2 + aiohttp-swagger clickclick + flask + inflection jsonschema + openapi-spec-validator pyyaml requests - six - inflection - openapi-spec-validator swagger-ui-bundle - flask - ] - ++ lib.optional (pythonOlder "3.4") pathlib - ++ lib.optional (pythonOlder "3.6") typing - ++ lib.optionals isPy3k [ aiohttp aiohttp-jinja2 aiohttp-swagger ujson ] - ; + ]; - preConfigure = lib.optional (pythonOlder "3.7") '' - export LANG=en_US.UTF-8 - ''; + checkInputs = [ + aiohttp-remotes + decorator + pytest-aiohttp + pytestCheckHook + testfixtures + ]; - postPatch = '' - substituteInPlace setup.py --replace "'aiohttp>=2.3.10,<3.5.2'" "'aiohttp>=2.3.10'" - ''; - - checkPhase = if isPy3k then '' - pytest -k "not test_app_get_root_path and \ - not test_verify_oauth_scopes_remote and \ - not test_verify_oauth_scopes_local and \ - not test_run_with_aiohttp_not_installed"'' - else "pytest --ignore=tests/aiohttp"; + pythonImportsCheck = [ "connexion" ]; meta = with lib; { description = "Swagger/OpenAPI First framework on top of Flask";