From a1337c5d1ff8f24ac6fb027294dc00a39a917d9f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 2 May 2022 16:35:49 +0000 Subject: [PATCH 1/3] python310Packages.gensim: 4.1.2 -> 4.2.0 --- pkgs/development/python-modules/gensim/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/gensim/default.nix b/pkgs/development/python-modules/gensim/default.nix index 5cf36c15dfad..3249fd83e78a 100644 --- a/pkgs/development/python-modules/gensim/default.nix +++ b/pkgs/development/python-modules/gensim/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "gensim"; - version = "4.1.2"; + version = "4.2.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "1932c257de4eccbb64cc40d46e8577a25f5f47b94b96019a969fb36150f11d15"; + sha256 = "sha256-mV69KXCjHUfBAKqsECEvR+K/EuKwZTbTiIPJUf807vE="; }; propagatedBuildInputs = [ smart-open numpy six scipy ]; From 6870929ad1ffa5b78cf613b66e389ce949fc3b95 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 2 May 2022 21:07:34 +0200 Subject: [PATCH 2/3] python310Packages.gensim:disable on older Python releases - fix license - update inputs - add pythonImportsCheck --- .../python-modules/gensim/default.nix | 55 ++++++++++++------- 1 file changed, 36 insertions(+), 19 deletions(-) diff --git a/pkgs/development/python-modules/gensim/default.nix b/pkgs/development/python-modules/gensim/default.nix index 3249fd83e78a..06d645e13c6e 100644 --- a/pkgs/development/python-modules/gensim/default.nix +++ b/pkgs/development/python-modules/gensim/default.nix @@ -1,43 +1,60 @@ { lib , buildPythonPackage +, cython , fetchPypi +, mock , numpy -, six , scipy , smart-open -, scikit-learn, testfixtures, unittest2 -, isPy3k +, testfixtures +, pyemd +, pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "gensim"; version = "4.2.0"; - disabled = !isPy3k; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-mV69KXCjHUfBAKqsECEvR+K/EuKwZTbTiIPJUf807vE="; + hash = "sha256-mV69KXCjHUfBAKqsECEvR+K/EuKwZTbTiIPJUf807vE="; }; - propagatedBuildInputs = [ smart-open numpy six scipy ]; + nativeBuildInputs = [ + cython + ]; - checkInputs = [ scikit-learn testfixtures unittest2 ]; + propagatedBuildInputs = [ + smart-open + numpy + scipy + ]; - # Two tests fail. - # - # ERROR: testAddMorphemesToEmbeddings (gensim.test.test_varembed_wrapper.TestVarembed) - # ImportError: Could not import morfessor. - # This package is not in nix - # - # ERROR: testWmdistance (gensim.test.test_fasttext_wrapper.TestFastText) - # ImportError: Please install pyemd Python package to compute WMD. - # This package is not in nix + checkInputs = [ + mock + pyemd + pytestCheckHook + ]; + + pythonImportsCheck = [ + "gensim" + ]; + + # Test setup takes several minutes doCheck = false; - meta = { + pytestFlagsArray = [ + "gensim/test" + ]; + + meta = with lib; { description = "Topic-modelling library"; homepage = "https://radimrehurek.com/gensim/"; - license = lib.licenses.lgpl21; - maintainers = with lib.maintainers; [ jyp ]; + license = licenses.lgpl21Only; + maintainers = with maintainers; [ jyp ]; }; } From 12082b1f9446284b42160c823060831ab473e01a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 2 May 2022 21:18:38 +0200 Subject: [PATCH 3/3] python310Packages.gensim: remove whitespace --- pkgs/development/python-modules/gensim/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/gensim/default.nix b/pkgs/development/python-modules/gensim/default.nix index 06d645e13c6e..3a6fc0d254a9 100644 --- a/pkgs/development/python-modules/gensim/default.nix +++ b/pkgs/development/python-modules/gensim/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { hash = "sha256-mV69KXCjHUfBAKqsECEvR+K/EuKwZTbTiIPJUf807vE="; }; - nativeBuildInputs = [ + nativeBuildInputs = [ cython ];