Merge pull request #213062 from NickCao/bravado

python3Packages.bravado-core: 5.17.0 -> 5.17.1

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

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 ];
   };
 }