python3Packages.orange3: setup direct dependencies to fetch from GitHub + bump

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=";
+    tag = version;
+    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 = {

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";
+    tag = 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";

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,
@@ -60,7 +60,7 @@ let
     src = fetchFromGitHub {
       owner = "biolab";
       repo = "orange3";
-      rev = "refs/tags/${version}";
+      tag = version;
       hash = "sha256-3PybiHXH6oIYJb78/a7LnQA6cYUicDx4Mf65QhIhT4w=";
     };
 
@@ -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";
     };
   };

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";
+    tag = 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 ];
+  };
+}

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