Unverified Commit aa7c6387 authored by Sandro Jäckel's avatar Sandro Jäckel Committed by GitHub
Browse files

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

python311Packages.spacy-models: rename from spacy_models
parents c20f878b 8bb35a61

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

+2 −2
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 
, pyspark

, dill

, dask

, spacy_models

, spacy-models

}:

let

  pname = "snorkel";
@@ -56,7 +56,7 @@ buildPythonPackage { 
    pyspark

    dill

    dask

    spacy_models.en_core_web_sm

    spacy-models.en_core_web_sm

  ] ++ dask.optional-dependencies.distributed;



  meta = with lib; {

pkgs/development/python-modules/spacy-transformers/annotation-test/default.nix

+2 −2
Original line number Diff line number Diff line 
{ stdenv, pytest, spacy_models }:

{ stdenv, pytest, spacy-models }:



stdenv.mkDerivation {

  name = "spacy-transformers-annotation-test";
@@ -9,7 +9,7 @@ stdenv.mkDerivation { 
  dontBuild = true;

  doCheck = true;



  nativeCheckInputs = [ pytest spacy_models.en_core_web_trf ];

  nativeCheckInputs = [ pytest spacy-models.en_core_web_trf ];



  checkPhase = ''

    pytest annotate.py

pkgs/development/python-modules/spacy/annotation-test/default.nix

+2 −2
Original line number Diff line number Diff line 
{ stdenv, pytest, spacy_models }:

{ stdenv, pytest, spacy-models }:



stdenv.mkDerivation {

  name = "spacy-annotation-test";
@@ -9,7 +9,7 @@ stdenv.mkDerivation { 
  dontBuild = true;

  doCheck = true;



  nativeCheckInputs = [ pytest spacy_models.en_core_web_sm ];

  nativeCheckInputs = [ pytest spacy-models.en_core_web_sm ];



  checkPhase = ''

    pytest annotate.py

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

+1 −1
Original line number Diff line number Diff line
@@ -123,7 +123,7 @@ buildPythonPackage rec { 
      nix-update python3Packages.spacy



      # 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 { };

  };

pkgs/top-level/python-aliases.nix

+1 −0
Original line number Diff line number Diff line
@@ -476,6 +476,7 @@ mapAliases ({ 
  smpp_pdu = smpp-pdu; # added 2024-03-05

  somecomfort = throw "somecomfort was removed because Home Assistant switched to aiosomecomfort"; # added 2023-02-01

  sorl_thumbnail = sorl-thumbnail; # added 2023-11-12

  spacy_models = spacy-models; # added 2024-04-21

  SPARQLWrapper = sparqlwrapper;

  spark_parser = spark-parser; # added 2024-01-07

  sphinx-jquery = sphinxcontrib-jquery; # added 2023-02-24