diff options
author | Felix Bühler <Stunkymonkey@users.noreply.github.com> | 2022-01-16 15:43:01 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-01-16 15:43:01 +0100 |
commit | 6dbbf99120162923068f03450bd4ffebd4531700 (patch) | |
tree | f99f5243c80fc270df11fedd4a3f9d8a68287cfe | |
parent | 5c32667d6e1c635dfedca3bc64d01d48f831bdce (diff) | |
parent | 1f3b77cd07246db9dfa75ed25d5ef5c892a2dc98 (diff) |
Merge pull request #153771 from Stunkymonkey/spaCy-3.2.0-fit
python3Packages.spacy: 3.2.1 fix
-rw-r--r-- | pkgs/development/python-modules/spacy-loggers/default.nix | 34 | ||||
-rw-r--r-- | pkgs/development/python-modules/spacy/default.nix | 8 | ||||
-rw-r--r-- | pkgs/top-level/python-packages.nix | 2 |
3 files changed, 42 insertions, 2 deletions
diff --git a/pkgs/development/python-modules/spacy-loggers/default.nix b/pkgs/development/python-modules/spacy-loggers/default.nix new file mode 100644 index 0000000000000..7e4d572e18123 --- /dev/null +++ b/pkgs/development/python-modules/spacy-loggers/default.nix @@ -0,0 +1,34 @@ +{ lib +, callPackage +, fetchPypi +, buildPythonPackage +, wandb +, wasabi +}: + +buildPythonPackage rec { + pname = "spacy-loggers"; + version = "1.0.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-F9DiSbLmxlRsSfxlYaCmhfkajtvySlsrd1nq1EPHRlQ="; + }; + + propagatedBuildInputs = [ + wandb + wasabi + ]; + + pythonImportsCheck = [ "spacy_loggers" ]; + + # skipping the checks, becaus it requires a cycle dependency to spacy as well. + doCheck = false; + + meta = with lib; { + description = "Logging utilities for spaCy"; + homepage = "https://github.com/explosion/spacy-loggers"; + license = licenses.mit; + maintainers = with maintainers; [ stunkymonkey ]; + }; +} diff --git a/pkgs/development/python-modules/spacy/default.nix b/pkgs/development/python-modules/spacy/default.nix index 0d095cfef07e0..05561e995a5c1 100644 --- a/pkgs/development/python-modules/spacy/default.nix +++ b/pkgs/development/python-modules/spacy/default.nix @@ -25,17 +25,19 @@ , python , tqdm , typing-extensions +, spacy-loggers +, langcodes }: buildPythonPackage rec { pname = "spacy"; - version = "3.2.0"; + version = "3.2.1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "68e54b2a14ce74eeecea9bfb0b9bdadf8a4a8157765dbefa7e50d25a1bf0f2f3"; + sha256 = "sha256-9uusURYndAqMorEXuR71UVyPCy+xF6aevgHQEN1PxTw="; }; propagatedBuildInputs = [ @@ -58,6 +60,8 @@ buildPythonPackage rec { tqdm typer wasabi + spacy-loggers + langcodes ] ++ lib.optional (pythonOlder "3.8") typing-extensions; checkInputs = [ diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0a37eb35520f5..eef542e8defe3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9126,6 +9126,8 @@ in { spacy-legacy = callPackage ../development/python-modules/spacy/legacy.nix { }; + spacy-loggers = callPackage ../development/python-modules/spacy-loggers { }; + spacy_models = callPackage ../development/python-modules/spacy/models.nix { }; spacy-pkuseg = callPackage ../development/python-modules/spacy-pkuseg { }; |