From 6b4a1f6492d424abaeee9c94163594a3d29b536e Mon Sep 17 00:00:00 2001 From: lucasew Date: Mon, 18 Nov 2024 22:30:27 -0300 Subject: [PATCH 01/10] python3Packages.trubar: init at 0.3.4 Signed-off-by: lucasew --- .../python-modules/trubar/default.nix | 44 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 46 insertions(+) create mode 100644 pkgs/development/python-modules/trubar/default.nix diff --git a/pkgs/development/python-modules/trubar/default.nix b/pkgs/development/python-modules/trubar/default.nix new file mode 100644 index 0000000000000..ee58fe185e007 --- /dev/null +++ b/pkgs/development/python-modules/trubar/default.nix @@ -0,0 +1,44 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + gitUpdater, + pytestCheckHook, + libcst, + pyyaml, +}: + +buildPythonPackage rec { + pname = "trubar"; + version = "0.3.4"; + pyproject = true; + + src = fetchFromGitHub { + owner = "janezd"; + repo = "trubar"; + rev = "refs/tags/${version}"; + hash = "sha256-ChKmeACEMnFcMYSdkdVlFiE3td171ihUS2A+qsP5ASk="; + }; + + build-system = [ setuptools ]; + + dependencies = [ + libcst + pyyaml + ]; + + pythonImportsCheck = [ "trubar" ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + passthru.updateScript = gitUpdater { }; + + meta = { + description = "Utility for translation of strings and f-strings in Python files"; + homepage = "https://github.com/janezd/trubar"; + changelog = "https://github.com/janezd/trubar/releases/tag/${version}"; + license = [ lib.licenses.mit ]; + maintainers = [ lib.maintainers.lucasew ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d44321e85813b..d4d5fc42c8520 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -16415,6 +16415,8 @@ self: super: with self; { trove-classifiers = callPackage ../development/python-modules/trove-classifiers { }; + trubar = callPackage ../development/python-modules/trubar { }; + trueskill = callPackage ../development/python-modules/trueskill { }; truncnorm = callPackage ../development/python-modules/truncnorm { }; From 68c16d0971ec625161b324d1df403360ebb7a171 Mon Sep 17 00:00:00 2001 From: lucasew Date: Mon, 18 Nov 2024 22:31:09 -0300 Subject: [PATCH 02/10] python3Packages.orange-canvas-core: 0.2.2 -> 0.2.4 Signed-off-by: lucasew --- .../python-modules/orange-canvas-core/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/orange-canvas-core/default.nix b/pkgs/development/python-modules/orange-canvas-core/default.nix index 3db1f35784bd6..a3d103ee77bdc 100644 --- a/pkgs/development/python-modules/orange-canvas-core/default.nix +++ b/pkgs/development/python-modules/orange-canvas-core/default.nix @@ -16,6 +16,7 @@ lockfile, numpy, pip, + trubar, qasync, requests-cache, typing-extensions, @@ -26,18 +27,19 @@ pytestCheckHook, stdenv, + gitUpdater, }: buildPythonPackage rec { pname = "orange-canvas-core"; - version = "0.2.2"; + version = "0.2.4"; pyproject = true; src = fetchFromGitHub { owner = "biolab"; repo = "orange-canvas-core"; rev = "refs/tags/${version}"; - hash = "sha256-Jp3vCQmRdkFADStVkbCFPiCBqpbI0a4JiJ8qs60rpqw="; + hash = "sha256-tLFWOXsAhqxFV0wdlAKestO/F/rDtdFnKDd0FXPeNpg="; }; build-system = [ setuptools ]; @@ -55,6 +57,7 @@ buildPythonPackage rec { qasync requests-cache typing-extensions + trubar ]; pythonImportsCheck = [ "orangecanvas" ]; @@ -85,6 +88,8 @@ buildPythonPackage rec { "test_widgettoolgrid" ]; + passthru.updateScript = gitUpdater { }; + disabledTestPaths = [ "orangecanvas/canvas/items/tests/test_graphicstextitem.py" ]; meta = { From 6ecaa9a77ce9e900f82c424847ad6568df1568bd Mon Sep 17 00:00:00 2001 From: lucasew Date: Mon, 18 Nov 2024 22:32:02 -0300 Subject: [PATCH 03/10] python3Packages.orange-widget-base: 4.24.0 -> 4.25.0 Signed-off-by: lucasew --- .../orange-widget-base/default.nix | 22 +++++++++++++------ 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/orange-widget-base/default.nix b/pkgs/development/python-modules/orange-widget-base/default.nix index 28c97fdb4238c..560e6b6f6da30 100644 --- a/pkgs/development/python-modules/orange-widget-base/default.nix +++ b/pkgs/development/python-modules/orange-widget-base/default.nix @@ -1,8 +1,10 @@ { lib, + gitUpdater, stdenv, buildPythonPackage, - fetchPypi, + setuptools, + fetchFromGitHub, pyqt5, pyqtwebengine, matplotlib, @@ -17,15 +19,19 @@ buildPythonPackage rec { pname = "orange-widget-base"; - version = "4.24.0"; - format = "setuptools"; + version = "4.25.0"; + pyproject = true; - src = fetchPypi { - inherit pname version; - hash = "sha256-2cBg7s4+qMrb2G4sMk5yednOzJCNheHIQ3lty4KAg18="; + build-system = [ setuptools ]; + + src = fetchFromGitHub { + owner = "biolab"; + repo = "orange-widget-base"; + rev = "refs/tags/${version}"; + hash = "sha256-tWo8vwC8xLA2ZKeab2GqpXGdlHhaqOT9wu1efqSHZSg="; }; - propagatedBuildInputs = [ + dependencies = [ matplotlib orange-canvas-core pyqt5 @@ -53,6 +59,8 @@ buildPythonPackage rec { "orangewidget/tests/test_widget.py" ]; + passthru.updateScript = gitUpdater { }; + meta = { description = "Implementation of the base OWBaseWidget class and utilities for use in Orange Canvas workflows"; homepage = "https://github.com/biolab/orange-widget-base"; From 3968b0b3d36340cfa7696ff6341d244abe8d6a6b Mon Sep 17 00:00:00 2001 From: lucasew Date: Mon, 18 Nov 2024 22:32:32 -0300 Subject: [PATCH 04/10] python3Packages.orange3: use gitUpdater, remove with lib Signed-off-by: lucasew --- pkgs/development/python-modules/orange3/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/orange3/default.nix b/pkgs/development/python-modules/orange3/default.nix index 146edc07bf067..89dfa82292b5a 100644 --- a/pkgs/development/python-modules/orange3/default.nix +++ b/pkgs/development/python-modules/orange3/default.nix @@ -1,5 +1,6 @@ { lib, + gitUpdater, stdenv, baycomp, bottleneck, @@ -17,7 +18,6 @@ keyrings-alt, makeDesktopItem, matplotlib, - nix-update-script, numpy, oldest-supported-numpy, openpyxl, @@ -165,7 +165,7 @@ let ''; passthru = { - updateScript = nix-update-script { }; + updateScript = gitUpdater { }; tests.unittests = stdenv.mkDerivation { name = "${self.name}-tests"; inherit (self) src; @@ -211,12 +211,12 @@ let }; }; - meta = with lib; { + meta = { description = "Data mining and visualization toolbox for novice and expert alike"; homepage = "https://orangedatamining.com/"; changelog = "https://github.com/biolab/orange3/blob/${version}/CHANGELOG.md"; - license = with licenses; [ gpl3Plus ]; - maintainers = with maintainers; [ lucasew ]; + license = [ lib.licenses.gpl3Plus ]; + maintainers = [ lib.maintainers.lucasew ]; mainProgram = "orange-canvas"; }; }; From 15a958efc7a4672451f46fe054e260696176ce96 Mon Sep 17 00:00:00 2001 From: lucasew Date: Sun, 29 Dec 2024 22:54:21 -0300 Subject: [PATCH 05/10] python3Packages.trubar: rev as tag Signed-off-by: lucasew --- pkgs/development/python-modules/trubar/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/trubar/default.nix b/pkgs/development/python-modules/trubar/default.nix index ee58fe185e007..416aaf75c985a 100644 --- a/pkgs/development/python-modules/trubar/default.nix +++ b/pkgs/development/python-modules/trubar/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "janezd"; repo = "trubar"; - rev = "refs/tags/${version}"; + tag = version; hash = "sha256-ChKmeACEMnFcMYSdkdVlFiE3td171ihUS2A+qsP5ASk="; }; From ca1ca71bf63526b902eb97989693fec0858e6472 Mon Sep 17 00:00:00 2001 From: lucasew Date: Sun, 29 Dec 2024 22:54:37 -0300 Subject: [PATCH 06/10] python3Packages.orange3: rev as tag Signed-off-by: lucasew --- pkgs/development/python-modules/orange3/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/orange3/default.nix b/pkgs/development/python-modules/orange3/default.nix index 89dfa82292b5a..6edd7417c59fd 100644 --- a/pkgs/development/python-modules/orange3/default.nix +++ b/pkgs/development/python-modules/orange3/default.nix @@ -60,7 +60,7 @@ let src = fetchFromGitHub { owner = "biolab"; repo = "orange3"; - rev = "refs/tags/${version}"; + tag = version; hash = "sha256-3PybiHXH6oIYJb78/a7LnQA6cYUicDx4Mf65QhIhT4w="; }; From 3607001bec447572b7976db5b41786a89c6c0bd0 Mon Sep 17 00:00:00 2001 From: lucasew Date: Sun, 29 Dec 2024 22:54:56 -0300 Subject: [PATCH 07/10] python3Packages.orange-widget-base: rev as tag Signed-off-by: lucasew --- pkgs/development/python-modules/orange-widget-base/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/orange-widget-base/default.nix b/pkgs/development/python-modules/orange-widget-base/default.nix index 560e6b6f6da30..f749c03fa2e00 100644 --- a/pkgs/development/python-modules/orange-widget-base/default.nix +++ b/pkgs/development/python-modules/orange-widget-base/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "biolab"; repo = "orange-widget-base"; - rev = "refs/tags/${version}"; + tag = version; hash = "sha256-tWo8vwC8xLA2ZKeab2GqpXGdlHhaqOT9wu1efqSHZSg="; }; From 91ab55610b714ac85274228ee33c12dbf2848842 Mon Sep 17 00:00:00 2001 From: lucasew Date: Sun, 29 Dec 2024 22:55:14 -0300 Subject: [PATCH 08/10] python3Packages.orange-canvas-core: rev as tag Signed-off-by: lucasew --- pkgs/development/python-modules/orange-canvas-core/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/orange-canvas-core/default.nix b/pkgs/development/python-modules/orange-canvas-core/default.nix index a3d103ee77bdc..c79a8e1e95119 100644 --- a/pkgs/development/python-modules/orange-canvas-core/default.nix +++ b/pkgs/development/python-modules/orange-canvas-core/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "biolab"; repo = "orange-canvas-core"; - rev = "refs/tags/${version}"; + tag = version; hash = "sha256-tLFWOXsAhqxFV0wdlAKestO/F/rDtdFnKDd0FXPeNpg="; }; From a1ad26ef9c86b83a737523607cf287f3fa03a2fe Mon Sep 17 00:00:00 2001 From: lucasew Date: Mon, 30 Dec 2024 14:22:21 -0300 Subject: [PATCH 09/10] python3Packages.orange-widget-base: move build-system Signed-off-by: lucasew --- .../development/python-modules/orange-widget-base/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/orange-widget-base/default.nix b/pkgs/development/python-modules/orange-widget-base/default.nix index f749c03fa2e00..de80a074f929e 100644 --- a/pkgs/development/python-modules/orange-widget-base/default.nix +++ b/pkgs/development/python-modules/orange-widget-base/default.nix @@ -22,8 +22,6 @@ buildPythonPackage rec { version = "4.25.0"; pyproject = true; - build-system = [ setuptools ]; - src = fetchFromGitHub { owner = "biolab"; repo = "orange-widget-base"; @@ -31,6 +29,8 @@ buildPythonPackage rec { hash = "sha256-tWo8vwC8xLA2ZKeab2GqpXGdlHhaqOT9wu1efqSHZSg="; }; + build-system = [ setuptools ]; + dependencies = [ matplotlib orange-canvas-core From 33c1a1dd033ed5b764387e2eed1776fa6a72cb66 Mon Sep 17 00:00:00 2001 From: lucasew Date: Mon, 30 Dec 2024 14:24:28 -0300 Subject: [PATCH 10/10] python3Packages.orange3: tweakings Signed-off-by: lucasew --- .../python-modules/orange3/default.nix | 108 +++++++++--------- 1 file changed, 57 insertions(+), 51 deletions(-) diff --git a/pkgs/development/python-modules/orange3/default.nix b/pkgs/development/python-modules/orange3/default.nix index 6edd7417c59fd..f54a39ca9b6a3 100644 --- a/pkgs/development/python-modules/orange3/default.nix +++ b/pkgs/development/python-modules/orange3/default.nix @@ -1,52 +1,58 @@ { lib, - gitUpdater, stdenv, - baycomp, - bottleneck, buildPythonPackage, - chardet, + fetchFromGitHub, + + # build-system + oldest-supported-numpy, + setuptools, + + # nativeBuildInputs copyDesktopItems, cython, + qt5, + recommonmark, + sphinx, + + # dependencies + baycomp, + bottleneck, catboost, - xgboost, - fetchFromGitHub, - fetchurl, + chardet, httpx, joblib, keyring, keyrings-alt, - makeDesktopItem, matplotlib, numpy, - oldest-supported-numpy, openpyxl, opentsne, orange-canvas-core, orange-widget-base, pandas, - pytestCheckHook, - pytest-qt, - pyqtgraph, + pip, pyqt5, + pyqtgraph, pyqtwebengine, - python, python-louvain, - pythonOlder, pyyaml, - pip, - qt5, qtconsole, - recommonmark, requests, scikit-learn, scipy, serverfiles, - setuptools, - sphinx, - wheel, + xgboost, xlrd, xlsxwriter, + + makeDesktopItem, + + # passthru + gitUpdater, + python, + pytest-qt, + pytestCheckHook, }: let @@ -55,8 +61,6 @@ let version = "3.37.0"; pyproject = true; - disabled = pythonOlder "3.7"; - src = fetchFromGitHub { owner = "biolab"; repo = "orange3"; @@ -64,6 +68,11 @@ let hash = "sha256-3PybiHXH6oIYJb78/a7LnQA6cYUicDx4Mf65QhIhT4w="; }; + build-system = [ + oldest-supported-numpy + setuptools + ]; + postPatch = '' substituteInPlace pyproject.toml \ --replace-fail 'cython>=3.0' 'cython' @@ -74,50 +83,47 @@ let nativeBuildInputs = [ copyDesktopItems - oldest-supported-numpy cython qt5.wrapQtAppsHook recommonmark - setuptools sphinx - wheel ]; enableParallelBuilding = true; pythonRelaxDeps = [ "scikit-learn" ]; - propagatedBuildInputs = [ - numpy - scipy - chardet + dependencies = [ + baycomp + bottleneck catboost - xgboost + chardet + httpx + joblib + keyring + keyrings-alt + matplotlib + numpy openpyxl opentsne + orange-canvas-core + orange-widget-base + pandas + pip + pyqt5 + pyqtgraph + pyqtwebengine + python-louvain + pyyaml qtconsole - setuptools - bottleneck - matplotlib - joblib requests - keyring scikit-learn - pandas - pyqtwebengine + scipy serverfiles - orange-canvas-core - python-louvain + setuptools + xgboost xlrd xlsxwriter - httpx - pyqtgraph - pyqt5 - orange-widget-base - keyrings-alt - pyyaml - baycomp - pip ]; # FIXME: ImportError: cannot import name '_variable' from partially initialized module 'Orange.data' (most likely due to a circular import) (/build/source/Orange/data/__init__.py) @@ -181,13 +187,13 @@ let chmod +w -R . substituteInPlace Orange/classification/tests/test_xgb_cls.py \ - --replace test_learners mk_test_learners + --replace-fail test_learners mk_test_learners substituteInPlace Orange/modelling/tests/test_xgb.py \ - --replace test_learners mk_test_learners + --replace-fail test_learners mk_test_learners substituteInPlace Orange/**/tests/*.py \ - --replace test_filename filename_test + --replace-fail test_filename filename_test # TODO: debug why orange is crashing on GC, may be a upstream issue chmod +x Orange/__init__.py @@ -196,8 +202,8 @@ let ''; nativeBuildInputs = [ - pytestCheckHook pytest-qt + pytestCheckHook ]; postCheck = ''