python312Packages.tensorboard: 2.18.0 -> 2.19.0 (#389472)

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

@@ -2,37 +2,35 @@
   lib,
   fetchPypi,
   buildPythonPackage,
-  pythonOlder,
-  numpy,
-  wheel,
-  werkzeug,
-  protobuf,
+
+  # dependencies
+  absl-py,
   grpcio,
   markdown,
-  absl-py,
-  google-auth-oauthlib,
+  numpy,
+  packaging,
+  protobuf,
   setuptools,
-  standard-imghdr,
+  six,
   tensorboard-data-server,
-  tensorboard-plugin-wit,
-  tensorboard-plugin-profile,
-}:
+  werkzeug,
+  standard-imghdr,
 
-# tensorflow/tensorboard is built from a downloaded wheel, because
-# https://github.com/tensorflow/tensorboard/issues/719 blocks
-# buildBazelPackage.
+  versionCheckHook,
+}:
 
 buildPythonPackage rec {
   pname = "tensorboard";
-  version = "2.18.0";
+  version = "2.19.0";
   format = "wheel";
-  disabled = pythonOlder "3.9";
 
+  # tensorflow/tensorboard is built from a downloaded wheel, because
+  # https://github.com/tensorflow/tensorboard/issues/719 blocks buildBazelPackage.
   src = fetchPypi {
     inherit pname version format;
     dist = "py3";
     python = "py3";
-    hash = "sha256-EHykghdF9z4q76AsUP9wqbaU8595CxHm9oL30yZ0Xqs=";
+    hash = "sha256-XnG5hmOmQafOim5wsL6OGkwMRdSHYLB2ODrEdVw1uaA=";
   };
 
   pythonRelaxDeps = [
@@ -40,28 +38,23 @@ buildPythonPackage rec {
     "protobuf"
   ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     absl-py
     grpcio
-    google-auth-oauthlib
     markdown
     numpy
+    packaging
     protobuf
     setuptools
-    standard-imghdr
+    six
     tensorboard-data-server
-    tensorboard-plugin-profile
-    tensorboard-plugin-wit
     werkzeug
-    # not declared in install_requires, but used at runtime
-    # https://github.com/NixOS/nixpkgs/issues/73840
-    wheel
-  ];
 
-  # in the absence of a real test suite, run cli and imports
-  checkPhase = ''
-    $out/bin/tensorboard --help > /dev/null
-  '';
+    # Requires 'imghdr' which has been removed from python in 3.13
+    # ModuleNotFoundError: No module named 'imghdr'
+    # https://github.com/tensorflow/tensorboard/issues/6964
+    standard-imghdr
+  ];
 
   pythonImportsCheck = [
     "tensorboard"
@@ -73,12 +66,17 @@ buildPythonPackage rec {
     "tensorboard.util"
   ];
 
-  meta = with lib; {
+  nativeCheckInputs = [
+    versionCheckHook
+  ];
+  versionCheckProgramArg = "--version";
+
+  meta = {
     changelog = "https://github.com/tensorflow/tensorboard/blob/${version}/RELEASE.md";
     description = "TensorFlow's Visualization Toolkit";
     homepage = "https://www.tensorflow.org/";
-    license = licenses.asl20;
+    license = lib.licenses.asl20;
     mainProgram = "tensorboard";
-    maintainers = with maintainers; [ abbradar ];
+    maintainers = with lib.maintainers; [ abbradar ];
   };
 }

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

@@ -44,15 +44,18 @@
 
   # dependencies
   astunparse,
-  fsspec,
+  expecttest,
   filelock,
+  fsspec,
+  hypothesis,
   jinja2,
   networkx,
-  sympy,
-  numpy,
+  packaging,
+  psutil,
   pyyaml,
-  cffi,
-  click,
+  requests,
+  sympy,
+  types-dataclasses,
   typing-extensions,
   # ROCm build and `torch.compile` requires `triton`
   tritonSupport ? (!stdenv.hostPlatform.isDarwin),
@@ -69,10 +72,6 @@
   _tritonEffective ? if cudaSupport then triton-cuda else triton,
   triton-cuda,
 
-  # Unit tests
-  hypothesis,
-  psutil,
-
   # Disable MKLDNN on aarch64-darwin, it negatively impacts performance,
   # this is also what official pytorch build does
   mklDnnSupport ? !(stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64),
@@ -510,18 +509,20 @@ buildPythonPackage rec {
   dependencies =
     [
       astunparse
-      cffi
-      click
-      numpy
-      pyyaml
-
-      # From install_requires:
-      fsspec
+      expecttest
       filelock
-      typing-extensions
-      sympy
-      networkx
+      fsspec
+      hypothesis
       jinja2
+      networkx
+      ninja
+      packaging
+      psutil
+      pyyaml
+      requests
+      sympy
+      types-dataclasses
+      typing-extensions
 
       # the following are required for tensorboard support
       pillow

pkgs/top-level/python-packages.nix

@@ -16447,13 +16447,9 @@ self: super: with self; {
       grpcioTF = self.grpcio.override {
         protobuf = protobufTF;
       };
-      tensorboard-plugin-profileTF = self.tensorboard-plugin-profile.override {
-        protobuf = protobuf-pythonTF;
-      };
       tensorboardTF = self.tensorboard.override {
         grpcio = grpcioTF;
         protobuf = protobuf-pythonTF;
-        tensorboard-plugin-profile = tensorboard-plugin-profileTF;
       };
     };
   in