diff --git a/pkgs/development/python-modules/catalogue/default.nix b/pkgs/development/python-modules/catalogue/default.nix index d07b7f29dc3..fbbaf92f4eb 100644 --- a/pkgs/development/python-modules/catalogue/default.nix +++ b/pkgs/development/python-modules/catalogue/default.nix @@ -2,23 +2,20 @@ , buildPythonPackage , fetchPypi , pythonOlder -, importlib-metadata , pytestCheckHook }: buildPythonPackage rec { pname = "catalogue"; - version = "2.0.1"; + version = "2.0.4"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "0d01077dbfca7aa53f3ef4adecccce636bce4f82e5b52237703ab2f56478e56e"; + hash = "sha256-ntNF0ShVrzFfFxVYNhKya4YhorCi4775dNxdcS95g6o="; }; - propagatedBuildInputs = [ importlib-metadata ]; - checkInputs = [ pytestCheckHook ]; meta = with lib; { diff --git a/pkgs/development/python-modules/spacy/default.nix b/pkgs/development/python-modules/spacy/default.nix index 672af9f0f7e..3cabc1d6ba2 100644 --- a/pkgs/development/python-modules/spacy/default.nix +++ b/pkgs/development/python-modules/spacy/default.nix @@ -12,13 +12,13 @@ , murmurhash , numpy , pathlib -, plac , preshed , requests , setuptools , srsly , spacy-legacy , thinc +, typer , wasabi , packaging , pathy @@ -27,11 +27,11 @@ buildPythonPackage rec { pname = "spacy"; - version = "3.0.5"; + version = "3.0.6"; src = fetchPypi { inherit pname version; - sha256 = "9f7a09fbad53aac2a3cb7696a902de62b94575a15d249dd5e26a98049328060e"; + hash = "sha256-ViirifH1aAmciAsSqcN/Ts4pq4kmBmDP33KMAnEYecU="; }; propagatedBuildInputs = [ @@ -42,7 +42,6 @@ buildPythonPackage rec { jsonschema murmurhash numpy - plac preshed requests setuptools @@ -53,6 +52,7 @@ buildPythonPackage rec { packaging pathy pydantic + typer ] ++ lib.optional (pythonOlder "3.4") pathlib; checkInputs = [ @@ -67,10 +67,6 @@ buildPythonPackage rec { postPatch = '' substituteInPlace setup.cfg \ --replace "blis>=0.4.0,<0.8.0" "blis>=0.4.0,<1.0" \ - --replace "catalogue>=0.0.7,<1.1.0" "catalogue>=0.0.7,<3.0" \ - --replace "plac>=0.9.6,<1.2.0" "plac>=0.9.6,<2.0" \ - --replace "srsly>=1.0.2,<1.1.0" "srsly>=1.0.2,<3.0" \ - --replace "thinc>=7.4.1,<7.5.0" "thinc>=7.4.1,<8" \ --replace "pydantic>=1.7.1,<1.8.0" "pydantic>=1.7.1,<1.8.3" ''; diff --git a/pkgs/development/python-modules/srsly/default.nix b/pkgs/development/python-modules/srsly/default.nix index c6db32a15e4..86550f99873 100644 --- a/pkgs/development/python-modules/srsly/default.nix +++ b/pkgs/development/python-modules/srsly/default.nix @@ -6,20 +6,19 @@ , catalogue , mock , numpy -, pathlib , pytest -, pytz +, ruamel-yaml }: buildPythonPackage rec { pname = "srsly"; - version = "2.4.0"; + version = "2.4.1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "e29730be53015970e4a59050e8e9f9be44d762108a617df56c9dfc981b515ab7"; + hash = "sha256-sPKuwKMp5ufnQqCmDpmnSWjKKb5x81xcTeIh4ygXaSY="; }; nativeBuildInputs = [ cython ]; @@ -30,13 +29,9 @@ buildPythonPackage rec { mock numpy pytest - pytz + ruamel-yaml ]; - # TypeError: cannot serialize '_io.BufferedRandom' object - # Possibly because of sandbox restrictions. - doCheck = false; - pythonImportsCheck = [ "srsly" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/thinc/default.nix b/pkgs/development/python-modules/thinc/default.nix index a92d349e992..4aac0d756d4 100644 --- a/pkgs/development/python-modules/thinc/default.nix +++ b/pkgs/development/python-modules/thinc/default.nix @@ -24,11 +24,11 @@ buildPythonPackage rec { pname = "thinc"; - version = "8.0.2"; + version = "8.0.3"; src = fetchPypi { inherit pname version; - sha256 = "20f033b3d9fbd02389d8f828cebcd3a42aee3e17ed4c2d56c6d5163af83a9cee"; + hash = "sha256-w3CnpG0BtYjY1fmdjV42s8usRRJjg1b6Qw9/Urs6iJc="; }; buildInputs = [ cython ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [