Unverified Commit 5046c93e authored by Robert Schütz's avatar Robert Schütz Committed by GitHub
Browse files

Merge pull request #219921 from dotlambda/openapi-core-0.17.0 

python310Packages.openapi-core: 0.16.6 -> 0.17.0
parents 76c0e3ef 34f4be4a

pkgs/development/python-modules/apispec/default.nix

+3 −3
Original line number Diff line number Diff line
@@ -13,14 +13,14 @@ 


buildPythonPackage rec {

  pname = "apispec";

  version = "6.1.0";

  version = "6.2.0";

  format = "setuptools";



  disabled = pythonOlder "3.7";



  src = fetchPypi {

    inherit pname version;

    hash = "sha256-iB07kL//3tZZvApL8J6t7t+iVs0nFyaxVV11r54Kmmk=";

    hash = "sha256-GpSaYLtMQr7leqr11DwYTfPi6W2WWORC513UQ1z2CWE=";

  };



  propagatedBuildInputs = [
@@ -37,7 +37,7 @@ buildPythonPackage rec { 
    validation = [

      openapi-spec-validator

      prance

    ];

    ] ++ prance.optional-dependencies.osv;

  };



  nativeCheckInputs = [

pkgs/development/python-modules/openapi-core/default.nix

+3 −7
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ 


buildPythonPackage rec {

  pname = "openapi-core";

  version = "0.16.6";

  version = "0.17.0";

  format = "pyproject";



  disabled = pythonOlder "3.7";
@@ -36,7 +36,7 @@ buildPythonPackage rec { 
    owner = "p1c2u";

    repo = "openapi-core";

    rev = "refs/tags/${version}";

    hash = "sha256-cpWEZ+gX4deTxMQ5BG+Qh863jcqUkOlNSY3KtOwOcBo=";

    hash = "sha256-LxCaP8r+89UmV/VfqtA/mWV/CXd6ZfRQnNnM0Jde7ko=";

  };



  postPatch = ''
@@ -84,11 +84,7 @@ buildPythonPackage rec { 
    pytestCheckHook

    responses

    webob

  ] ++ passthru.optional-dependencies.flask

  ++ passthru.optional-dependencies.falcon

  ++ passthru.optional-dependencies.django

  ++ passthru.optional-dependencies.starlette

  ++ passthru.optional-dependencies.requests;

  ] ++ lib.flatten (lib.attrValues passthru.optional-dependencies);



  disabledTestPaths = [

    # Requires secrets and additional configuration

pkgs/development/python-modules/openapi-schema-validator/default.nix

+14 −7
Original line number Diff line number Diff line
@@ -5,31 +5,38 @@ 
, pytestCheckHook

, isodate

, jsonschema

, pytest-cov

, rfc3339-validator

, six

, strict-rfc3339

}:



buildPythonPackage rec {

  pname = "openapi-schema-validator";

  version = "0.3.4";

  version = "0.4.3";

  format = "pyproject";



  src = fetchFromGitHub {

    owner = "p1c2u";

    repo = pname;

    rev = "refs/tags/${version}";

    sha256 = "sha256-0nKAeqZCfzYFsV18BDsSws/54FmRoy7lQSHguI6m3Sc=";

    hash = "sha256-rp0Oq5WWPpna5rHrq/lfRNxjK5/FLgPZ5uzVfDT/YiI=";

  };



  postPatch = ''

    sed -i "/--cov/d" pyproject.toml

  '';



  nativeBuildInputs = [

    poetry-core

  ];



  propagatedBuildInputs = [ isodate jsonschema six strict-rfc3339 rfc3339-validator ];

  propagatedBuildInputs = [

    jsonschema

    rfc3339-validator

  ];



  nativeCheckInputs = [

    pytestCheckHook

  ];



  nativeCheckInputs = [ pytestCheckHook pytest-cov ];

  pythonImportsCheck = [ "openapi_schema_validator" ];



  meta = with lib; {

pkgs/development/python-modules/openapi-spec-validator/default.nix

+7 −6
Original line number Diff line number Diff line 
{ lib

, buildPythonPackage

, pythonOlder

, fetchFromGitHub

, poetry-core

, setuptools



# propagates

, importlib-resources
@@ -22,29 +22,30 @@ 


buildPythonPackage rec {

  pname = "openapi-spec-validator";

  version = "0.5.1";

  version = "0.5.5";

  format = "pyproject";



  disabled = pythonOlder "3.7";



  # no tests via pypi sdist

  src = fetchFromGitHub {

    owner = "p1c2u";

    repo = pname;

    rev = version;

    hash = "sha256-8VhD57dNG0XrPUdcq39GEfHUAgdDwJ8nv+Lp57OpTLg=";

    hash = "sha256-t7u0p6V2woqIFsqywv7k5s5pbbnmcn45YnlFWH1PEi4=";

  };



  nativeBuildInputs = [

    poetry-core

    setuptools

  ];



  propagatedBuildInputs = [

    importlib-resources

    jsonschema

    jsonschema-spec

    lazy-object-proxy

    openapi-schema-validator

    pyyaml

  ] ++ lib.optionals (pythonOlder "3.9") [

    importlib-resources

  ];



  passthru.optional-dependencies.requests = [

pkgs/development/python-modules/prance/default.nix

+24 −29
Original line number Diff line number Diff line 
{ lib

, buildPythonPackage

, pythonOlder

, fetchFromGitHub

, fetchpatch

, chardet

, click

, flex

, packaging

, pyicu

, requests

, ruamel-yaml

, setuptools-scm

, six

, semver

, swagger-spec-validator

, pytestCheckHook

, openapi-spec-validator

}:



buildPythonPackage rec {

  pname = "prance";

  version = "0.21.8.0";

  version = "0.22.02.22.0";

  format = "pyproject";



  disabled = pythonOlder "3.8";



  src = fetchFromGitHub {

    owner = "RonnyPfannschmidt";

    repo = pname;

    rev = "v${version}";

    fetchSubmodules = true;

    hash = "sha256-kGANMHfWwhW3ZBw2ZVCJZR/bV2EPhcydMKhDeDTVwcQ=";

    hash = "sha256-NtIbZp34IcMYJzaNQVL9GLdNS3NYOCRoWS1wGg/gLVA=";

  };



  patches = [

    # Fix for openapi-spec-validator 0.5.0+:

    # https://github.com/RonnyPfannschmidt/prance/pull/132

    (fetchpatch {

      name = "1-openapi-spec-validator-upgrade.patch";

      url = "https://github.com/RonnyPfannschmidt/prance/commit/55503c9b12b685863c932ededac996369e7d288a.patch";

      hash = "sha256-7SOgFsk2aaaaAYS8WJ9axqQFyEprurn6Zn12NcdQ9Bg=";

    })

    (fetchpatch {

      name = "2-openapi-spec-validator-upgrade.patch";

      url = "https://github.com/RonnyPfannschmidt/prance/commit/7e59cc69c6c62fd04875105773d9d220bb58fea6.patch";

      hash = "sha256-j6vmY3NqDswp7v9682H+/MxMGtFObMxUeL9Wbiv9hYw=";

    })

    (fetchpatch {

      name = "3-openapi-spec-validator-upgrade.patch";

      url = "https://github.com/RonnyPfannschmidt/prance/commit/7e575781d83845d7ea0c2eff57644df9b465c7af.patch";

      hash = "sha256-rexKoQ+TH3QmP20c3bA+7BLMLc+fkVhn7xsq+gle1Aw=";

    })

  ];



  postPatch = ''

    substituteInPlace setup.cfg \

      --replace "--cov=prance --cov-report=term-missing --cov-fail-under=90" "" \

      --replace "chardet>=3.0,<5.0" "chardet"

      --replace "--cov=prance --cov-report=term-missing --cov-fail-under=90" ""

  '';



  SETUPTOOLS_SCM_PRETEND_VERSION = version;
@@ -59,27 +44,37 @@ buildPythonPackage rec { 


  propagatedBuildInputs = [

    chardet

    packaging

    requests

    ruamel-yaml

    six

    semver

  ];



  passthru.optional-dependencies = {

    cli = [ click ];

    flex = [ flex ];

    icu = [ pyicu ];

    osv = [ openapi-spec-validator ];

    ssv = [ swagger-spec-validator ];

  };



  nativeCheckInputs = [

    pytestCheckHook

    openapi-spec-validator

  ];

  ] ++ lib.flatten (lib.attrValues passthru.optional-dependencies);



  # Disable tests that require network

  disabledTestPaths = [

    "tests/test_convert.py"

  ];

  disabledTests = [

    "test_convert_defaults"

    "test_convert_output"

    "test_fetch_url_http"

  ];

  pythonImportsCheck = [ "prance" ];



  meta = with lib; {

    changelog = "https://github.com/RonnyPfannschmidt/prance/blob/${src.rev}/CHANGES.rst";

    description = "Resolving Swagger/OpenAPI 2.0 and 3.0.0 Parser";

    homepage = "https://github.com/RonnyPfannschmidt/prance";

    license = licenses.mit;