From 203709fe02a2df6c207c53fa42ac29a783d79402 Mon Sep 17 00:00:00 2001
From: Ben Darwin <bcdarwin@gmail.com>
Date: Sat, 14 Jan 2023 23:21:31 -0500
Subject: 
 python310Packages.{nbclassic,notebook-shim,notebook,einops,xarray-stats,arviz}:
 unbreak

---
 pkgs/development/python-modules/arviz/default.nix      |  4 ++--
 pkgs/development/python-modules/einops/default.nix     |  5 ++++-
 pkgs/development/python-modules/nbclassic/default.nix  |  4 ++--
 .../python-modules/notebook-shim/default.nix           |  3 +++
 pkgs/development/python-modules/notebook/default.nix   | 18 ++++++------------
 .../python-modules/xarray-einstats/default.nix         |  4 ----
 6 files changed, 17 insertions(+), 21 deletions(-)

diff --git a/pkgs/development/python-modules/arviz/default.nix b/pkgs/development/python-modules/arviz/default.nix
index 4dd4415127f..e8d1582c442 100644
--- a/pkgs/development/python-modules/arviz/default.nix
+++ b/pkgs/development/python-modules/arviz/default.nix
@@ -1,7 +1,6 @@
 { lib
 , buildPythonPackage
 , fetchFromGitHub
-, bokeh
 , emcee
 , matplotlib
 , netcdf4
@@ -19,6 +18,7 @@
 , xarray
 , xarray-einstats
 , zarr
+, ffmpeg
 , h5py
 , jaxlib
 , torchvision
@@ -56,9 +56,9 @@ buildPythonPackage rec {
   ];
 
   checkInputs = [
-    bokeh
     cloudpickle
     emcee
+    ffmpeg
     h5py
     jax
     jaxlib
diff --git a/pkgs/development/python-modules/einops/default.nix b/pkgs/development/python-modules/einops/default.nix
index 0e7f83f92ea..03a0723b792 100644
--- a/pkgs/development/python-modules/einops/default.nix
+++ b/pkgs/development/python-modules/einops/default.nix
@@ -2,6 +2,7 @@
 , buildPythonPackage
 , chainer
 , fetchFromGitHub
+, hatchling
 , jupyter
 , keras
   #, mxnet
@@ -17,7 +18,7 @@
 buildPythonPackage rec {
   pname = "einops";
   version = "0.6.0";
-  format = "setuptools";
+  format = "pyproject";
 
   disabled = pythonOlder "3.7";
 
@@ -28,6 +29,8 @@ buildPythonPackage rec {
     hash = "sha256-/bnp8IhDxp8EB/PoW5Dz+7rOru0/odOrts84aq4qyJw=";
   };
 
+  nativeBuildInputs = [ hatchling ];
+
   checkInputs = [
     chainer
     jupyter
diff --git a/pkgs/development/python-modules/nbclassic/default.nix b/pkgs/development/python-modules/nbclassic/default.nix
index b2554c3f473..04644f2c75d 100644
--- a/pkgs/development/python-modules/nbclassic/default.nix
+++ b/pkgs/development/python-modules/nbclassic/default.nix
@@ -11,9 +11,9 @@
 , nbconvert
 , nbformat
 , nest-asyncio
-, notebook
 , notebook-shim
 , prometheus-client
+, pytest-jupyter
 , pytest-tornasync
 , pytestCheckHook
 , pythonOlder
@@ -47,7 +47,6 @@ buildPythonPackage rec {
     nbconvert
     nbformat
     nest-asyncio
-    notebook
     notebook-shim
     prometheus-client
     pyzmq
@@ -58,6 +57,7 @@ buildPythonPackage rec {
   ];
 
   checkInputs = [
+    pytest-jupyter
     pytest-tornasync
     pytestCheckHook
   ];
diff --git a/pkgs/development/python-modules/notebook-shim/default.nix b/pkgs/development/python-modules/notebook-shim/default.nix
index 2ca5d0e44fa..16729ab1ef9 100644
--- a/pkgs/development/python-modules/notebook-shim/default.nix
+++ b/pkgs/development/python-modules/notebook-shim/default.nix
@@ -1,6 +1,7 @@
 { lib
 , buildPythonPackage
 , fetchFromGitHub
+, hatchling
 , jupyter-server
 , pytestCheckHook
 , pytest-tornasync
@@ -9,6 +10,7 @@
 buildPythonPackage rec {
   pname = "notebook-shim";
   version = "0.2.2";
+  format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "jupyter";
@@ -17,6 +19,7 @@ buildPythonPackage rec {
     sha256 = "sha256-/z4vXSBqeL2wSqJ0kFNgU0TSGUGByhxHNya8EO55+7s=";
   };
 
+  nativeBuildInputs = [ hatchling ];
   propagatedBuildInputs = [ jupyter-server ];
 
   preCheck = ''
diff --git a/pkgs/development/python-modules/notebook/default.nix b/pkgs/development/python-modules/notebook/default.nix
index 33e2886606f..1415fad396c 100644
--- a/pkgs/development/python-modules/notebook/default.nix
+++ b/pkgs/development/python-modules/notebook/default.nix
@@ -1,12 +1,10 @@
 { stdenv
 , lib
 , buildPythonPackage
+, pythonOlder
 , fetchPypi
 , argon2-cffi
-, nose
-, nose_warnings_filters
 , glibcLocales
-, isPy3k
 , mock
 , jinja2
 , tornado
@@ -15,6 +13,7 @@
 , jupyter-core
 , jupyter-client
 , nbformat
+, nbclassic
 , nbconvert
 , ipykernel
 , terminado
@@ -28,7 +27,7 @@
 buildPythonPackage rec {
   pname = "notebook";
   version = "6.5.2";
-  disabled = !isPy3k;
+  disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
@@ -37,20 +36,15 @@ buildPythonPackage rec {
 
   LC_ALL = "en_US.utf8";
 
-  checkInputs = [ nose pytestCheckHook glibcLocales ]
-    ++ (if isPy3k then [ nose_warnings_filters ] else [ mock ]);
+  checkInputs = [ pytestCheckHook glibcLocales ];
 
   propagatedBuildInputs = [
     jinja2 tornado ipython_genutils traitlets jupyter-core send2trash
-    jupyter-client nbformat nbconvert ipykernel terminado requests pexpect
+    jupyter-client nbformat nbclassic
+    nbconvert ipykernel terminado requests pexpect
     prometheus-client argon2-cffi
   ];
 
-  # disable warning_filters
-  preCheck = lib.optionalString (!isPy3k) ''
-    echo "" > setup.cfg
-  '';
-
   postPatch = ''
     # Remove selenium tests
     rm -rf notebook/tests/selenium
diff --git a/pkgs/development/python-modules/xarray-einstats/default.nix b/pkgs/development/python-modules/xarray-einstats/default.nix
index df8855cc7a2..b942caf9449 100644
--- a/pkgs/development/python-modules/xarray-einstats/default.nix
+++ b/pkgs/development/python-modules/xarray-einstats/default.nix
@@ -46,10 +46,6 @@ buildPythonPackage rec {
     "xarray_einstats"
   ];
 
-  pytestFlagsArray = [
-    "src/xarray_einstats/tests/"
-  ];
-
   meta = with lib; {
     description = "Stats, linear algebra and einops for xarray";
     homepage = "https://github.com/arviz-devs/xarray-einstats";
-- 
cgit 1.4.1