From 18765a70baf7f508304412b4339f9c708afa01d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Sat, 11 May 2019 15:28:01 +0200 Subject: [PATCH 1/7] pythonPackages.wasabi: init at 0.2.2 --- .../python-modules/wasabi/default.nix | 30 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/development/python-modules/wasabi/default.nix diff --git a/pkgs/development/python-modules/wasabi/default.nix b/pkgs/development/python-modules/wasabi/default.nix new file mode 100644 index 00000000000..01a9a4034d5 --- /dev/null +++ b/pkgs/development/python-modules/wasabi/default.nix @@ -0,0 +1,30 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, pytest +}: + +buildPythonPackage rec { + pname = "wasabi"; + version = "0.2.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "0xxjc9bvvcaz1qq1jyhcxyl2v39jz8d8dz4zhpfbc7dz53kq6b7r"; + }; + + checkInputs = [ + pytest + ]; + + checkPhase = '' + pytest wasabi/tests + ''; + + meta = with stdenv.lib; { + description = "A lightweight console printing and formatting toolkit"; + homepage = https://github.com/ines/wasabi; + license = licenses.mit; + maintainers = with maintainers; [ danieldk ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4c8026ced43..251c0e91c60 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5431,6 +5431,8 @@ in { thinc = callPackage ../development/python-modules/thinc { }; + wasabi = callPackage ../development/python-modules/wasabi { }; + yahooweather = callPackage ../development/python-modules/yahooweather { }; spacy = callPackage ../development/python-modules/spacy { }; From b631c266ee2fba9fefdf1a634a729b0639772102 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Sat, 11 May 2019 15:29:14 +0200 Subject: [PATCH 2/7] pythonPackages.srsly: init at 0.0.5 --- .../python-modules/srsly/default.nix | 41 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 43 insertions(+) create mode 100644 pkgs/development/python-modules/srsly/default.nix diff --git a/pkgs/development/python-modules/srsly/default.nix b/pkgs/development/python-modules/srsly/default.nix new file mode 100644 index 00000000000..ca5909f02f6 --- /dev/null +++ b/pkgs/development/python-modules/srsly/default.nix @@ -0,0 +1,41 @@ +{ stdenv +, lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, mock +, numpy +, pathlib +, pytest +, pytz +}: + +buildPythonPackage rec { + pname = "srsly"; + version = "0.0.5"; + + src = fetchPypi { + inherit pname version; + sha256 = "0apgm8znc3k79ifja16fvxsxwgpy3n2fvbp7iwf9szizzpjscylp"; + }; + + propagatedBuildInputs = lib.optional (pythonOlder "3.4") pathlib; + + checkInputs = [ + mock + numpy + pytest + pytz + ]; + + # TypeError: cannot serialize '_io.BufferedRandom' object + # Possibly because of sandbox restrictions. + doCheck = false; + + meta = with stdenv.lib; { + description = "Modern high-performance serialization utilities for Python"; + homepage = https://github.com/explosion/srsly; + license = licenses.mit; + maintainers = with maintainers; [ danieldk ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 251c0e91c60..63a1f7f0d69 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5429,6 +5429,8 @@ in { backports_weakref = callPackage ../development/python-modules/backports_weakref { }; + srsly = callPackage ../development/python-modules/srsly { }; + thinc = callPackage ../development/python-modules/thinc { }; wasabi = callPackage ../development/python-modules/wasabi { }; From 54f9e90e4f9da32e0b00590de710e7f344a32ec9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Sat, 11 May 2019 15:30:13 +0200 Subject: [PATCH 3/7] pythonPackages.blis: init at 0.2.4 --- .../python-modules/blis/default.nix | 38 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 40 insertions(+) create mode 100644 pkgs/development/python-modules/blis/default.nix diff --git a/pkgs/development/python-modules/blis/default.nix b/pkgs/development/python-modules/blis/default.nix new file mode 100644 index 00000000000..5fee40a941f --- /dev/null +++ b/pkgs/development/python-modules/blis/default.nix @@ -0,0 +1,38 @@ +{ stdenv +, lib +, buildPythonPackage +, fetchPypi +, cython +, hypothesis +, numpy +, pytest +}: + +buildPythonPackage rec { + pname = "blis"; + version = "0.2.4"; + + src = fetchPypi { + inherit pname version; + sha256 = "0c5hd0bim9134sk8wb31cqzvi9c380rbl5zwjiwrq8nnix8a2k1d"; + }; + + nativeBuildInputs = [ + cython + ]; + + + checkInputs = [ + cython + hypothesis + numpy + pytest + ]; + + meta = with stdenv.lib; { + description = "BLAS-like linear algebra library"; + homepage = https://github.com/explosion/cython-blis; + license = licenses.mit; + maintainers = with maintainers; [ danieldk ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 63a1f7f0d69..0414d81a775 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5429,6 +5429,8 @@ in { backports_weakref = callPackage ../development/python-modules/backports_weakref { }; + blis = callPackage ../development/python-modules/blis { }; + srsly = callPackage ../development/python-modules/srsly { }; thinc = callPackage ../development/python-modules/thinc { }; From 613e802f01a939e7d3b4ac6ac62ac53364658170 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Sat, 11 May 2019 15:31:08 +0200 Subject: [PATCH 4/7] pythonPackages.thinc: 6.12.1 -> 7.0.4 --- .../python-modules/thinc/default.nix | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/thinc/default.nix b/pkgs/development/python-modules/thinc/default.nix index 79ae18d33ea..9cb25af7a92 100644 --- a/pkgs/development/python-modules/thinc/default.nix +++ b/pkgs/development/python-modules/thinc/default.nix @@ -21,15 +21,18 @@ , mock , wrapt , dill +, blis +, srsly +, wasabi }: buildPythonPackage rec { pname = "thinc"; - version = "6.12.1"; + version = "7.0.4"; src = fetchPypi { inherit pname version; - sha256 = "1kkp8b3xcs3yn3ia5sxrh086c9xv27s2khdxd17abdypxxa99ich"; + sha256 = "14v8ygjrkj63dwd4pi490ld6i2d8n8wzcf15hnacjjfwij93pa1q"; }; buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ @@ -37,6 +40,7 @@ buildPythonPackage rec { ]); propagatedBuildInputs = [ + blis cython cymem msgpack-numpy @@ -48,8 +52,10 @@ buildPythonPackage rec { cytoolz plac six + srsly wrapt dill + wasabi ] ++ lib.optional (pythonOlder "3.4") pathlib; @@ -61,12 +67,7 @@ buildPythonPackage rec { prePatch = '' substituteInPlace setup.py \ - --replace "pathlib==1.0.1" "pathlib>=1.0.0,<2.0.0" \ - --replace "plac>=0.9.6,<1.0.0" "plac>=0.9.6" \ - --replace "msgpack-numpy<0.4.4" "msgpack-numpy" \ - --replace "wheel>=0.32.0,<0.33.0" "wheel" \ - --replace "wrapt>=1.10.0,<1.11.0" "wrapt" \ - --replace "msgpack>=0.5.6,<0.6.0" "msgpack" + --replace "plac>=0.9.6,<1.0.0" "plac>=0.9.6" ''; # Cannot find cython modules. From 52731eb4f64f10c02ca2536e8ccbd32a751e7a05 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Sat, 11 May 2019 15:31:31 +0200 Subject: [PATCH 5/7] python3Packages.spacy: 2.0.18 -> 2.1.3 Changes: https://github.com/explosion/spaCy/releases The largest change since 2.0.x is support for ELMo/BERT-like pretraining. --- .../development/python-modules/spacy/default.nix | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/spacy/default.nix b/pkgs/development/python-modules/spacy/default.nix index a39593bb9e7..a59cd78d6a2 100644 --- a/pkgs/development/python-modules/spacy/default.nix +++ b/pkgs/development/python-modules/spacy/default.nix @@ -17,22 +17,24 @@ , pathlib , msgpack-python , msgpack-numpy +, jsonschema +, blis +, wasabi +, srsly }: buildPythonPackage rec { pname = "spacy"; - version = "2.0.18"; + version = "2.1.3"; src = fetchPypi { inherit pname version; - sha256 = "0mybdms7c40jvk8ak180n65anjiyg4c8gkaqwkzicrd1mxq3ngqj"; + sha256 = "01mmgfn7r288jklz6902xfb5dbih0h29s9p0na12gyj2c7gnvf5i"; }; prePatch = '' substituteInPlace setup.py \ - --replace "regex==" "regex>=" \ - --replace "plac<1.0.0,>=0.9.6" "plac>=0.9.6" \ - --replace "wheel>=0.32.0,<0.33.0" "wheel>=0.32.0" + --replace "plac<1.0.0,>=0.9.6" "plac>=0.9.6" ''; propagatedBuildInputs = [ @@ -49,6 +51,10 @@ buildPythonPackage rec { ftfy msgpack-python msgpack-numpy + jsonschema + blis + wasabi + srsly ] ++ lib.optional (pythonOlder "3.4") pathlib; checkInputs = [ From 21ec7004f69c7d67fc16c7c33de238bc777373e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Sat, 11 May 2019 17:54:40 +0200 Subject: [PATCH 6/7] python3Packages.spacy_models: 2.0.0 -> 2.1.0 - Update models for spaCy 2.1. - Add medium/small-sized models for Greek. - Add medium-sized model for German. --- .../python-modules/spacy/models.json | 70 ++++++++++++------- 1 file changed, 44 insertions(+), 26 deletions(-) diff --git a/pkgs/development/python-modules/spacy/models.json b/pkgs/development/python-modules/spacy/models.json index 34b8082872b..d8078c116c2 100644 --- a/pkgs/development/python-modules/spacy/models.json +++ b/pkgs/development/python-modules/spacy/models.json @@ -1,78 +1,96 @@ [{ + "pname": "de_core_news_md", + "version": "2.1.0", + "sha256": "0q1flyrp2n8ja11kdlw6x1k0gll0r096pxy8ba4xv15hjng2zay1", + "license": "cc-by-sa-40" +}, +{ "pname": "de_core_news_sm", - "version": "2.0.0", - "sha256": "13fs4f46qg9mlxd9ynmh81gxizm11kfq3g52pk8d2m7wp89xfc6a", + "version": "2.1.0", + "sha256": "0fj4dqa915i6niyskxmw2318fxzjhgdjhjx79h9cpp4mxw719w95", + "license": "cc-by-sa-40" +}, +{ + "pname": "el_core_news_md", + "version": "2.1.0", + "sha256": "1rgy9hlb92amhlbwkd91yh87xssqj2a1ign0wm59aai69rb79q3s", + "license": "cc-by-sa-40" +}, +{ + "pname": "el_core_news_sm", + "version": "2.1.0", + "sha256": "07n7qg0nnzg5gjq7vs72j9qc6z4zjx65qsrrj0hjhiihk3ps378z", "license": "cc-by-sa-40" }, { "pname": "en_core_web_lg", - "version": "2.0.0", - "sha256": "1r33l02jrkzjn78nd0bzzzd6rwjlz7qfgs3bg5yr2ki6q0m7qxvw", + "version": "2.1.0", + "sha256": "0ywcczd9nsxmpfwknxa7z54h566bwi7chq0jzx3sqk2a6lva4q52", "license": "cc-by-sa-40" }, { "pname": "en_core_web_md", - "version": "2.0.0", - "sha256": "1b5g5gma1gzm8ffj0pgli1pllccx5jpjvb7a19n7c8bfswpifxzc", + "version": "2.1.0", + "sha256": "10vgq1xd6dpdl7xdssgf0kywbq7xpxp79yqc2vcnl3c4axfpwk5q", "license": "cc-by-sa-40" }, { "pname": "en_core_web_sm", - "version": "2.0.0", - "sha256": "161298pl6kzc0cgf2g7ji84xbqv8ayrgsrmmg0hxiflwghfj77cx", + "version": "2.1.0", + "sha256": "1wg5a7nxq82sfmnc3j5xfr8il65rprmcx2h36va5dvydm1h6icad", "license": "cc-by-sa-40" }, { "pname": "en_vectors_web_lg", - "version": "2.0.0", - "sha256": "15qfd8vzdv56x41fzghy7k5x1c8ql92ds70r37b6a8hkb87z9byw", + "version": "2.1.0", + "sha256": "1sq41pr70215f2s8k35x5ni4w0i4xhbzbfg3iyxgbp1b35gizg94", "license": "cc-by-sa-40" }, { "pname": "es_core_news_md", - "version": "2.0.0", - "sha256": "03056qz866r641q4nagymw6pc78qnn5vdvcp7p1ph2cvxh7081kp", + "version": "2.1.0", + "sha256": "02v7hm711r9ma8p5yk057z7hm2pcvpfjgnjszc697d0ymfn4avby", "license": "cc-by-sa-40" }, { "pname": "es_core_news_sm", - "version": "2.0.0", - "sha256": "1b91lcmw2kyqmcrxlfq7m5vlj1a57i3bb9a5h4y31smjgzmsr81s", + "version": "2.1.0", + "sha256": "1smyyb1gqp090sailqdqp5v5ww4kf99a3hcd9d9rdhn1wgsv28dh", "license": "cc-by-sa-40" }, { "pname": "fr_core_news_md", - "version": "2.0.0", - "sha256": "06kva46l1nw819bidzj2vks69ap1a9fa7rnvpd28l3z2haci38ls", + "version": "2.1.0", + "sha256": "0n94ja7y4jbvz0k0x5bij2dypy11ikvgpd9dav0m0hw1wpqgls1i", "license": "cc-by-sa-40" }, { "pname": "fr_core_news_sm", - "version": "2.0.0", - "sha256": "1zlhm9646g3cwcv4cs33160f3v8gxmzdr02x8hx7jpw1fbnmc5mx", + "version": "2.1.0", + "sha256": "1czr40y5sqs0n2dd4s37kc2xawkh2nsj41wvmsx48bw0aksb1n75", "license": "cc-by-sa-40" }, { "pname": "it_core_news_sm", - "version": "2.0.0", - "sha256": "0fs68rdq19migb3x3hb510b96aabibsi01adlk1fipll1x48msaz", + "version": "2.1.0", + "sha256": "1i8dm703mf1l39jwis3mn5mb9azpx6bsimh66iriax94612x64mb", "license": "cc-by-sa-40" }, { "pname": "nl_core_news_sm", - "version": "2.0.0", - "sha256": "0n5x61jp8rdxa3ki250ipbd68rjpp9li6xwbx3fbzycpngffwy8z", + "version": "2.1.0", + "sha256": "0ywyn7jprsfr10bvwnm3qk270raxm9s9rvzyp1cp7ca037ab633y", "license": "cc-by-sa-40" }, { "pname": "pt_core_news_sm", - "version": "2.0.0", - "sha256": "1sg500b3f3qnx1ga32hbq9p4qfynqhpdzhlmdjrxgqw8i58ys23g", + "version": "2.1.0", + "sha256": "0vigc9x7158sdqxjgcxgvp6458k5936jlmlp2qdmlmzxr5wmfrbc", "license": "cc-by-sa-40" }, { "pname": "xx_ent_wiki_sm", - "version": "2.0.0", - "sha256": "0mc3mm6nfjp31wbjysdj2x72akyi52hgprm1g54djxfypm3pmn35", + "version": "2.1.0", + "sha256": "19sfsxwjqdzlfm43gb4hbyj0hgqcfhcfxwdib4g5i1pcfx1v3pf4", "license": "cc-by-sa-40" }] From 635385388fdd7600a58a66adf3a4dc39d7769b76 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Mon, 13 May 2019 20:03:21 +0200 Subject: [PATCH 7/7] python3Packages.spacy: 2.1.3 -> 2.1.4 This release has some improvements for training models: https://github.com/explosion/spaCy/releases/tag/v2.1.4 --- pkgs/development/python-modules/spacy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/spacy/default.nix b/pkgs/development/python-modules/spacy/default.nix index a59cd78d6a2..80524154f67 100644 --- a/pkgs/development/python-modules/spacy/default.nix +++ b/pkgs/development/python-modules/spacy/default.nix @@ -25,11 +25,11 @@ buildPythonPackage rec { pname = "spacy"; - version = "2.1.3"; + version = "2.1.4"; src = fetchPypi { inherit pname version; - sha256 = "01mmgfn7r288jklz6902xfb5dbih0h29s9p0na12gyj2c7gnvf5i"; + sha256 = "03m4c59aaqpqr2x5yhv7y37z0vxhmmkfi6dv4cbp9nxsq9wv100d"; }; prePatch = ''