Unverified Commit b1ef5d34 authored by Fabian Affolter's avatar Fabian Affolter Committed by GitHub
Browse files

Merge pull request #281532 from fabaff/marshmallow-bump 

python311Packages.marshmallow: 3.20.1 -> 3.20.2
parents 8a49f2a5 e927b3b5

pkgs/development/python-modules/dataprep-ml/default.nix

+20 −11
Original line number Diff line number Diff line 
{ lib

, buildPythonPackage

, colorlog

, dataclasses-json

, fetchPypi

, pythonOlder

, poetry-core

, nltk-data

, numpy

, pandas

, poetry-core

, pydantic

, pydateinfer

, python-dateutil

, pythonOlder

, pythonRelaxDepsHook

, scipy

, type-infer

, dataclasses-json

, colorlog

, pydantic

, nltk-data

, symlinkJoin

, type-infer

}:

let

  testNltkData = symlinkJoin {

    name = "nltk-test-data";

    paths = [ nltk-data.punkt nltk-data.stopwords ];

    paths = [

      nltk-data.punkt

      nltk-data.stopwords

    ];

  };

in

buildPythonPackage rec {
@@ -35,20 +39,25 @@ buildPythonPackage rec { 
    hash = "sha256-BtnRmj5JtgNdCFowgNdpIZn5vUdw8QYCWneHfDgC4/c=";

  };



  pythonRelaxDeps = [

    "pydantic"

  ];



  nativeBuildInputs = [

    poetry-core

    pythonRelaxDepsHook

  ];



  propagatedBuildInputs = [

    colorlog

    dataclasses-json

    numpy

    pandas

    pydantic

    pydateinfer

    python-dateutil

    scipy

    type-infer

    dataclasses-json

    colorlog

    pydantic

  ];



  # PyPI tarball has no tests

pkgs/development/python-modules/json-schema-for-humans/default.nix

+8 −2
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
, pygments

, pytestCheckHook

, pythonOlder

, pythonRelaxDepsHook

, pytz

, pyyaml

, requests
@@ -19,19 +20,24 @@ 
buildPythonPackage rec {

  pname = "json-schema-for-humans";

  version = "0.46";

  format = "pyproject";

  pyproject = true;



  disabled = pythonOlder "3.7";



  src = fetchFromGitHub {

    owner = "coveooss";

    repo = pname;

    repo = "json-schema-for-humans";

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

    hash = "sha256-wTO+d0O3SKT2jJ2zNubT2q76PdJ7+kT9RBEw5MMH1yg=";

  };



  pythonRelaxDeps = [

    "dataclasses-json"

  ];



  nativeBuildInputs = [

    poetry-core

    pythonRelaxDepsHook

  ];



  propagatedBuildInputs = [

pkgs/development/python-modules/marshmallow-polyfield/default.nix

+15 −10
Original line number Diff line number Diff line
@@ -4,22 +4,32 @@ 
, marshmallow

, pythonOlder

, pytestCheckHook

, setuptools

}:



buildPythonPackage rec {

  pname = "marshmallow-polyfield";

  version = "5.10";

  format = "setuptools";

  version = "5.11";

  pyproject = true;



  disabled = pythonOlder "3.6";



  src = fetchFromGitHub {

    owner = "Bachmann1234";

    repo = pname;

    rev = "v${version}";

    hash = "sha256-oF5LBuDK4kqsAcKwidju+wFjigjy4CNbJ6bfWpGO1yQ=";

    repo = "marshmallow-polyfield";

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

    hash = "sha256-jbpeyih2Ccw1Rk+QcXRO9AfN5B/DhZmxa/M6FzXHqqs=";

  };



  postPatch = ''

    substituteInPlace setup.cfg \

      --replace "--cov=marshmallow_polyfield" ""

  '';



  nativeBuildInputs = [

    setuptools

  ];



  propagatedBuildInputs = [

    marshmallow

  ];
@@ -28,11 +38,6 @@ buildPythonPackage rec { 
    pytestCheckHook

  ];



  postPatch = ''

    substituteInPlace setup.cfg \

      --replace "--cov=marshmallow_polyfield" ""

  '';



  pythonImportsCheck = [

    "marshmallow"

  ];

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

+9 −4
Original line number Diff line number Diff line
@@ -6,22 +6,27 @@ 
, pytz

, simplejson

, packaging

, setuptools

}:



buildPythonPackage rec {

  pname = "marshmallow";

  version = "3.20.1";

  format = "setuptools";

  version = "3.20.2";

  pyproject = true;



  disabled = pythonOlder "3.8";



  src = fetchFromGitHub {

    owner = "marshmallow-code";

    repo = pname;

    repo = "marshmallow";

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

    hash = "sha256-sPYiup7ontnubtBxv+rIT0up4IHPJNCUlH9J4FlHsss=";

    hash = "sha256-z6Quf6uTelGwB/uYayVXtVmculwaoI5LL8I0kKiM/e8=";

  };



  nativeBuildInputs = [

    setuptools

  ];



  propagatedBuildInputs = [

    packaging

  ];

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

+6 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ 
, marshmallow-dataclass

, pytestCheckHook

, pythonOlder

, pythonRelaxDepsHook

, requests

, responses

, setuptools
@@ -26,7 +27,12 @@ buildPythonPackage rec { 
    hash = "sha256-ybl6QOLb1xE6v0D1C2wKMsSU+r2gWzj24Q4pPIMBsCY=";

  };



  pythonRelaxDeps = [

    "marshmallow-dataclass"

  ];



  nativeBuildInputs = [

    pythonRelaxDepsHook

    setuptools

  ];