From 339bd97d09426682713de53ccb8de70ae2c5698d Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Sat, 2 Nov 2024 21:12:15 +0200
Subject: [PATCH] python312Packages.xarray-datatree: remove

See:
https://github.com/xarray-contrib/datatree/compare/refs/tags/v0.0.14...v0.0.15

Changelog: https://github.com/xarray-contrib/datatree/releases/tag/v0.0.15
---
 .../multiscale-spatial-image/default.nix      |  2 -
 .../xarray-datatree/default.nix               | 59 -------------------
 pkgs/top-level/python-aliases.nix             |  1 +
 pkgs/top-level/python-packages.nix            |  2 -
 4 files changed, 1 insertion(+), 63 deletions(-)
 delete mode 100644 pkgs/development/python-modules/xarray-datatree/default.nix

diff --git a/pkgs/development/python-modules/multiscale-spatial-image/default.nix b/pkgs/development/python-modules/multiscale-spatial-image/default.nix
index 41b4a720fc50..90891e4f19ea 100644
--- a/pkgs/development/python-modules/multiscale-spatial-image/default.nix
+++ b/pkgs/development/python-modules/multiscale-spatial-image/default.nix
@@ -9,7 +9,6 @@
   python-dateutil,
   spatial-image,
   xarray,
-  xarray-datatree,
   zarr,
   dask-image,
   fsspec,
@@ -43,7 +42,6 @@ buildPythonPackage rec {
     python-dateutil
     spatial-image
     xarray
-    xarray-datatree
     zarr
   ];
 
diff --git a/pkgs/development/python-modules/xarray-datatree/default.nix b/pkgs/development/python-modules/xarray-datatree/default.nix
deleted file mode 100644
index 1d99f300cb7b..000000000000
--- a/pkgs/development/python-modules/xarray-datatree/default.nix
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-  lib,
-  buildPythonPackage,
-  fetchFromGitHub,
-  pythonOlder,
-  check-manifest,
-  setuptools,
-  setuptools-scm,
-  packaging,
-  pytestCheckHook,
-  xarray,
-  zarr,
-}:
-
-buildPythonPackage rec {
-  pname = "datatree";
-  version = "0.0.14";
-  pyproject = true;
-
-  disabled = pythonOlder "3.9";
-
-  src = fetchFromGitHub {
-    owner = "xarray-contrib";
-    repo = "datatree";
-    rev = "refs/tags/v${version}";
-    hash = "sha256-C6+WcHc2+sftJ5Yyh/9TTIHhAEwhAqSsSkaDwtq7J90=";
-  };
-
-  build-system = [
-    check-manifest
-    setuptools
-    setuptools-scm
-  ];
-
-  dependencies = [
-    packaging
-    xarray
-  ];
-
-  nativeCheckInputs = [
-    pytestCheckHook
-    zarr
-  ];
-
-  pythonImportsCheck = [ "datatree" ];
-
-  disabledTests = [
-    # output formatting issue, likely due to underlying library version difference:
-    "test_diff_node_data"
-  ];
-
-  meta = with lib; {
-    description = "Tree-like hierarchical data structure for xarray";
-    homepage = "https://xarray-datatree.readthedocs.io";
-    changelog = "https://github.com/xarray-contrib/datatree/releases/tag/v${version}";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ bcdarwin ];
-  };
-}
diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix
index 6255cdb9559e..f0859ce845c8 100644
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@@ -701,6 +701,7 @@ mapAliases ({
   WSME = wsme; # added 2023-02-19
   x11_hash = x11-hash; # added 2023-11-05
   xapp = python-xapp; # added 2024-07-19
+  xarray-datatree = throw "Datatree has been merged upstream into pydata/xarray, and released as of xarray version 2024.10.0."; # added 2024-11-02
   xenomapper = throw "xenomapper was moved to pkgs.xenomapper"; # added 2021-12-31
   XlsxWriter = xlsxwriter; # added 2023-02-19
   xsser = "xsser has been removed because it was unmaintained and relies on a archived project"; # added 2024-07-27
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index ae8070db1bb9..1e14b4cadaf2 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -17723,8 +17723,6 @@ self: super: with self; {
 
   xarray-dataclasses = callPackage ../development/python-modules/xarray-dataclasses { };
 
-  xarray-datatree = callPackage ../development/python-modules/xarray-datatree { };
-
   xarray-einstats = callPackage ../development/python-modules/xarray-einstats { };
 
   xattr = callPackage ../development/python-modules/xattr { };