diff options
author | Nick Cao <nickcao@nichi.co> | 2023-01-29 15:20:05 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-01-29 15:20:05 +0800 |
commit | afc0a0b55d45f9b7763ae8f7c74b31e5b53a7de5 (patch) | |
tree | 0fe1b4c60b73de30eb234a9cacc7c3659033a8b0 /pkgs | |
parent | 4ed11a5c79db2e0629b8837d23a2c99bfa521a03 (diff) | |
parent | 77580982b09a9d54db428fd8cc740e061c51b8f8 (diff) |
Merge pull request #213062 from NickCao/bravado
python3Packages.bravado-core: 5.17.0 -> 5.17.1
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/applications/networking/powerdns-admin/default.nix | 8 | ||||
-rw-r--r-- | pkgs/development/python-modules/bravado-core/default.nix | 86 |
2 files changed, 25 insertions, 69 deletions
diff --git a/pkgs/applications/networking/powerdns-admin/default.nix b/pkgs/applications/networking/powerdns-admin/default.nix index 1fc698fe19003..fe0112a4aaef0 100644 --- a/pkgs/applications/networking/powerdns-admin/default.nix +++ b/pkgs/applications/networking/powerdns-admin/default.nix @@ -9,13 +9,7 @@ let hash = "sha256-e11u0jdJr+2TDXvBAPlDfnuuDwSfBq+JtvnDUTNKp/c="; }; - python = python3.override { - packageOverrides = self: super: { - # The bravado-core dependency is incompatible with jschonschema 4.0: - # https://github.com/Yelp/bravado-core/pull/385 - jsonschema = super.jsonschema_3; - }; - }; + python = python3; pythonDeps = with python.pkgs; [ flask flask_assets flask-login flask-sqlalchemy flask_migrate flask-seasurf flask_mail flask-session flask-sslify diff --git a/pkgs/development/python-modules/bravado-core/default.nix b/pkgs/development/python-modules/bravado-core/default.nix index 3e3af5d4cfaa6..7f34a3c48bc76 100644 --- a/pkgs/development/python-modules/bravado-core/default.nix +++ b/pkgs/development/python-modules/bravado-core/default.nix @@ -2,34 +2,26 @@ , stdenv , buildPythonPackage , fetchFromGitHub -, fqdn -, idna -, isoduration -, jsonpointer +, pythonOlder + # build inputs , jsonref , jsonschema -, mock -, msgpack -, mypy-extensions -, pytest-benchmark -, pytestCheckHook , python-dateutil -, pythonOlder -, pytz , pyyaml -, rfc3987 -, rfc3339-validator +, requests , simplejson , six -, strict-rfc3339 , swagger-spec-validator -, uri-template -, webcolors +, pytz +, msgpack + # check inputs +, pytestCheckHook +, mock }: buildPythonPackage rec { pname = "bravado-core"; - version = "5.17.0"; + version = "5.17.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -38,76 +30,46 @@ buildPythonPackage rec { owner = "Yelp"; repo = pname; rev = "v${version}"; - hash = "sha256-okQA4YJq0lyVJuDzD8mMRlOS/K3gf1qRUpw/5M0LlZE="; + hash = "sha256-7LnKNR1/YIzw2iIPYXAuoC6G7fdm4D3frkSl/wJhYG4="; }; propagatedBuildInputs = [ jsonref - jsonschema - msgpack + jsonschema # with optional dependencies for format python-dateutil - pytz pyyaml + requests simplejson six swagger-spec-validator - - # the following packages are included when jsonschema (3.2) is installed - # as jsonschema[format], which reflects what happens in setup.py - fqdn - idna - isoduration - jsonpointer - rfc3987 - rfc3339-validator - strict-rfc3339 - uri-template - webcolors - ]; + pytz + msgpack + ] ++ jsonschema.optional-dependencies.format; nativeCheckInputs = [ - mypy-extensions pytestCheckHook + ]; + + checkInputs = [ mock - pytest-benchmark ]; pythonImportsCheck = [ "bravado_core" ]; - pytestFlagsArray = [ - "--benchmark-skip" - ]; - disabledTestPaths = [ - # Tests are out-dated (not supporting later modules releases, e.g., jsonschema) - "tests/_decorators_test.py" - "tests/formatter" - "tests/marshal" - "tests/model" - "tests/operation" - "tests/param" - "tests/request" - "tests/resource" - "tests/response" - "tests/schema" - "tests/security_test.py" - "tests/spec" - "tests/swagger20_validator" - "tests/unmarshal" - "tests/validate" - ]; - - disabledTests = [ - "test_petstore_spec" + # skip benchmarks + "tests/profiling" + # take too long to run + "tests/spec/Spec" ]; meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin; description = "Library for adding Swagger support to clients and servers"; homepage = "https://github.com/Yelp/bravado-core"; + changelog = "https://github.com/Yelp/bravado-core/blob/v${version}/CHANGELOG.rst"; license = licenses.bsd3; - maintainers = with maintainers; [ vanschelven ]; + maintainers = with maintainers; [ vanschelven nickcao ]; }; } |