Merge pull request #305740 from Stunkymonkey/python-spacy-models-normalize

python311Packages.spacy-models: rename from spacy_models
This commit is contained in:
Sandro 2024-04-21 19:54:24 +02:00 committed by GitHub
commit aa7c638706
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 10 additions and 9 deletions

View file

@ -16,7 +16,7 @@
, pyspark , pyspark
, dill , dill
, dask , dask
, spacy_models , spacy-models
}: }:
let let
pname = "snorkel"; pname = "snorkel";
@ -56,7 +56,7 @@ buildPythonPackage {
pyspark pyspark
dill dill
dask dask
spacy_models.en_core_web_sm spacy-models.en_core_web_sm
] ++ dask.optional-dependencies.distributed; ] ++ dask.optional-dependencies.distributed;
meta = with lib; { meta = with lib; {

View file

@ -1,4 +1,4 @@
{ stdenv, pytest, spacy_models }: { stdenv, pytest, spacy-models }:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "spacy-transformers-annotation-test"; name = "spacy-transformers-annotation-test";
@ -9,7 +9,7 @@ stdenv.mkDerivation {
dontBuild = true; dontBuild = true;
doCheck = true; doCheck = true;
nativeCheckInputs = [ pytest spacy_models.en_core_web_trf ]; nativeCheckInputs = [ pytest spacy-models.en_core_web_trf ];
checkPhase = '' checkPhase = ''
pytest annotate.py pytest annotate.py

View file

@ -1,4 +1,4 @@
{ stdenv, pytest, spacy_models }: { stdenv, pytest, spacy-models }:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "spacy-annotation-test"; name = "spacy-annotation-test";
@ -9,7 +9,7 @@ stdenv.mkDerivation {
dontBuild = true; dontBuild = true;
doCheck = true; doCheck = true;
nativeCheckInputs = [ pytest spacy_models.en_core_web_sm ]; nativeCheckInputs = [ pytest spacy-models.en_core_web_sm ];
checkPhase = '' checkPhase = ''
pytest annotate.py pytest annotate.py

View file

@ -123,7 +123,7 @@ buildPythonPackage rec {
nix-update python3Packages.spacy nix-update python3Packages.spacy
# update spacy models as well # update spacy models as well
echo | nix-shell maintainers/scripts/update.nix --argstr package python3Packages.spacy_models.en_core_web_sm echo | nix-shell maintainers/scripts/update.nix --argstr package python3Packages.spacy-models.en_core_web_sm
''; '';
tests.annotation = callPackage ./annotation-test { }; tests.annotation = callPackage ./annotation-test { };
}; };

View file

@ -476,6 +476,7 @@ mapAliases ({
smpp_pdu = smpp-pdu; # added 2024-03-05 smpp_pdu = smpp-pdu; # added 2024-03-05
somecomfort = throw "somecomfort was removed because Home Assistant switched to aiosomecomfort"; # added 2023-02-01 somecomfort = throw "somecomfort was removed because Home Assistant switched to aiosomecomfort"; # added 2023-02-01
sorl_thumbnail = sorl-thumbnail; # added 2023-11-12 sorl_thumbnail = sorl-thumbnail; # added 2023-11-12
spacy_models = spacy-models; # added 2024-04-21
SPARQLWrapper = sparqlwrapper; SPARQLWrapper = sparqlwrapper;
spark_parser = spark-parser; # added 2024-01-07 spark_parser = spark-parser; # added 2024-01-07
sphinx-jquery = sphinxcontrib-jquery; # added 2023-02-24 sphinx-jquery = sphinxcontrib-jquery; # added 2023-02-24

View file

@ -14094,7 +14094,7 @@ self: super: with self; {
spacy-lookups-data = callPackage ../development/python-modules/spacy/lookups-data.nix { }; spacy-lookups-data = callPackage ../development/python-modules/spacy/lookups-data.nix { };
spacy_models = callPackage ../development/python-modules/spacy/models.nix { spacy-models = callPackage ../development/python-modules/spacy/models.nix {
inherit (pkgs) jq; inherit (pkgs) jq;
}; };
@ -14923,7 +14923,7 @@ self: super: with self; {
textacy = callPackage ../development/python-modules/textacy { }; textacy = callPackage ../development/python-modules/textacy { };
textnets = callPackage ../development/python-modules/textnets { textnets = callPackage ../development/python-modules/textnets {
en_core_web_sm = spacy_models.en_core_web_sm; en_core_web_sm = spacy-models.en_core_web_sm;
}; };
texttable = callPackage ../development/python-modules/texttable { }; texttable = callPackage ../development/python-modules/texttable { };