From 822571678688820fa10fda668230dbd1bc42995a Mon Sep 17 00:00:00 2001 From: natsukium Date: Sun, 28 Apr 2024 13:03:54 +0900 Subject: [PATCH 1/7] python311Packages.anywidget: 0.9.9 -> 0.9.10 Changelog: https://github.com/manzt/anywidget/releases/tag/anywidget%400.9.10 --- pkgs/development/python-modules/anywidget/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/anywidget/default.nix b/pkgs/development/python-modules/anywidget/default.nix index 07c6bb744923..767fc775851d 100644 --- a/pkgs/development/python-modules/anywidget/default.nix +++ b/pkgs/development/python-modules/anywidget/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "anywidget"; - version = "0.9.9"; + version = "0.9.10"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-vs5tYcVabzlkCeu1p20mDo9LIh+cUeUWFQc3o18WUu8="; + hash = "sha256-OQpigkCYHAmBPHUjJ53cq4L/T9Moet1UM7eLE2kIkGg="; }; # We do not need the jupyterlab build dependency, because we do not need to From cca367bb477eba8dc35dc6ccd9ff7f27d016a400 Mon Sep 17 00:00:00 2001 From: natsukium Date: Sun, 28 Apr 2024 13:04:08 +0900 Subject: [PATCH 2/7] python311Packages.ipycanvas: 0.13.1 -> 0.13.2 Changelog: https://github.com/jupyter-widgets-contrib/ipycanvas/releases/tag/0.13.2 --- .../python-modules/ipycanvas/default.nix | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/ipycanvas/default.nix b/pkgs/development/python-modules/ipycanvas/default.nix index 85961b450ec1..2222c0bdad0d 100644 --- a/pkgs/development/python-modules/ipycanvas/default.nix +++ b/pkgs/development/python-modules/ipycanvas/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , pythonOlder -, jupyter-packaging +, hatchling , ipywidgets , numpy , pillow @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "ipycanvas"; - version = "0.13.1"; - format = "pyproject"; + version = "0.13.2"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-+cOUBoG8ODgzkPjEbqXYRF1uEcbaZITDfYnfWuHawTE="; + hash = "sha256-Ujh9nYf2WVXzlVL7eSfEReXl5JN9hTgU2RDL6O+g+3k="; }; # We relax dependencies here instead of pulling in a patch because upstream @@ -26,13 +26,16 @@ buildPythonPackage rec { # postPatch = '' substituteInPlace pyproject.toml \ - --replace '"jupyterlab==3.*",' "" \ - --replace 'jupyter_packaging~=' 'jupyter_packaging>=' + --replace-fail '"jupyterlab>=3,<5",' "" \ ''; - nativeBuildInputs = [ jupyter-packaging ]; + build-system = [ + hatchling + ]; - propagatedBuildInputs = [ ipywidgets numpy pillow ]; + env.HATCH_BUILD_NO_HOOKS = true; + + dependencies = [ ipywidgets numpy pillow ]; doCheck = false; # tests are in Typescript and require `npx` and `chromium` pythonImportsCheck = [ "ipycanvas" ]; From 922e81e77d457ac5af319b0b6f3381dbe2a6944e Mon Sep 17 00:00:00 2001 From: natsukium Date: Sun, 28 Apr 2024 13:04:13 +0900 Subject: [PATCH 3/7] python311Packages.ipyniivue: 2.0.0 -> 2.0.1 Changelog: https://github.com/niivue/ipyniivue/releases/tag/2.0.1 --- pkgs/development/python-modules/ipyniivue/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/ipyniivue/default.nix b/pkgs/development/python-modules/ipyniivue/default.nix index c097f2cb404e..14667b0942ed 100644 --- a/pkgs/development/python-modules/ipyniivue/default.nix +++ b/pkgs/development/python-modules/ipyniivue/default.nix @@ -3,21 +3,21 @@ , fetchPypi , pythonOlder , hatchling -, hatch-jupyter-builder +, hatch-vcs , anywidget , pytestCheckHook }: buildPythonPackage rec { pname = "ipyniivue"; - version = "2.0.0"; + version = "2.0.1"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-CvMSUvPyXxPexs0/0sa/xt65RFWtvmYZwGSMIQGvLkc="; + hash = "sha256-C0mYkguN4ZfxSLqETH3dUwXeoNcicrmAgp6e9IIT43s="; }; # We do not need the build hooks, because we do not need to @@ -26,7 +26,7 @@ buildPythonPackage rec { build-system = [ hatchling - hatch-jupyter-builder + hatch-vcs ]; dependencies = [ anywidget ]; From a92f5a893fb76cfc927f384eea4aeddaf0b86907 Mon Sep 17 00:00:00 2001 From: natsukium Date: Sun, 28 Apr 2024 13:04:51 +0900 Subject: [PATCH 4/7] python311Packages.jupyterlab: 4.1.6 -> 4.1.8 Changelog: https://github.com/jupyterlab/jupyterlab/blob/v4.1.8/CHANGELOG.md --- pkgs/development/python-modules/jupyterlab/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jupyterlab/default.nix b/pkgs/development/python-modules/jupyterlab/default.nix index dc48c597d548..7b9a17d91e2c 100644 --- a/pkgs/development/python-modules/jupyterlab/default.nix +++ b/pkgs/development/python-modules/jupyterlab/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "jupyterlab"; - version = "4.1.6"; + version = "4.1.8"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-eTXza6JuthUYOk9cK7yleRtRCM4qALVQX4z9EA1TZI4="; + hash = "sha256-M4St7YaA585QT9Y7i7iaOd8hycdpTZ59xKaHQs2zD5s="; }; nativeBuildInputs = [ From 2ac8fcc8c44c27d64404a73420d56f38cd1fcc91 Mon Sep 17 00:00:00 2001 From: natsukium Date: Sun, 28 Apr 2024 13:04:57 +0900 Subject: [PATCH 5/7] python311Packages.jupyterlab-server: 2.26.0 -> 2.27.1 Changelog: https://github.com/jupyterlab/jupyterlab_server/blob/v2.27.1/CHANGELOG.md --- pkgs/development/python-modules/jupyterlab-server/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jupyterlab-server/default.nix b/pkgs/development/python-modules/jupyterlab-server/default.nix index f295ce204ad2..059cb1c5ac52 100644 --- a/pkgs/development/python-modules/jupyterlab-server/default.nix +++ b/pkgs/development/python-modules/jupyterlab-server/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "jupyterlab-server"; - version = "2.26.0"; + version = "2.27.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -29,7 +29,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "jupyterlab_server"; inherit version; - hash = "sha256-mzupHPKDf38ST8o21j88qArOK+1ImKY91H5lmMGrAG8="; + hash = "sha256-CXtaxwm2dscoSsnF43PxGTClYfUs1ahuT8flqcioYx0="; }; postPatch = '' From 41a295779438a498ce2b3512a2c621aea7a9f0b0 Mon Sep 17 00:00:00 2001 From: natsukium Date: Sun, 28 Apr 2024 13:05:22 +0900 Subject: [PATCH 6/7] python311Packages.nbdev: 2.3.13 -> 2.3.14 Changelog: https://github.com/fastai/nbdev/blob/2.3.14/CHANGELOG.md --- .../python-modules/nbdev/default.nix | 34 ++++++++++++------- 1 file changed, 22 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/nbdev/default.nix b/pkgs/development/python-modules/nbdev/default.nix index 8a298ec19f67..ee82753ae822 100644 --- a/pkgs/development/python-modules/nbdev/default.nix +++ b/pkgs/development/python-modules/nbdev/default.nix @@ -1,40 +1,50 @@ { lib , buildPythonPackage , fetchPypi -, fastprogress +, pythonRelaxDepsHook +, setuptools +, ipywidgets , fastcore -, asttokens , astunparse , watchdog , execnb , ghapi , pyyaml -, quarto , pythonOlder }: buildPythonPackage rec { pname = "nbdev"; - version = "2.3.13"; - format = "setuptools"; + version = "2.3.14"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Umkf3CcRRSS+pK3UKeTg+Ru3TW+qHNoQ2F6nUk8jQUU="; + hash = "sha256-9Tacr4mWmjXspKKCkFDWYeT7KkBh4/3f6UOkfj0/leg="; }; - propagatedBuildInputs = [ - fastprogress - fastcore - asttokens + nativeBuildInputs = [ + pythonRelaxDepsHook + ]; + + pythonRelaxDeps = [ + "ipywidgets" + ]; + + build-system = [ + setuptools + ]; + + dependencies = [ astunparse - watchdog execnb + fastcore ghapi + ipywidgets pyyaml - quarto + watchdog ]; # no real tests From 4388b09ee0f12f64dea862f413e33f4c717f473f Mon Sep 17 00:00:00 2001 From: natsukium Date: Sun, 28 Apr 2024 13:05:34 +0900 Subject: [PATCH 7/7] python311Packages.papermill: 2.5.0 -> 2.6.0 Diff: https://github.com/nteract/papermill/compare/refs/tags/2.5.0...2.6.0 --- .../python-modules/papermill/default.nix | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/papermill/default.nix b/pkgs/development/python-modules/papermill/default.nix index b419398eef99..743812b84b62 100644 --- a/pkgs/development/python-modules/papermill/default.nix +++ b/pkgs/development/python-modules/papermill/default.nix @@ -1,5 +1,7 @@ { lib , stdenv +, aiohttp +, ansicolors , azure-datalake-store , azure-identity , azure-storage-blob @@ -17,8 +19,8 @@ , pygithub , pytest-mock , pytestCheckHook +, pythonAtLeast , pythonOlder -, pythonRelaxDepsHook , pyyaml , requests , setuptools @@ -28,7 +30,7 @@ buildPythonPackage rec { pname = "papermill"; - version = "2.5.0"; + version = "2.6.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -37,19 +39,14 @@ buildPythonPackage rec { owner = "nteract"; repo = "papermill"; rev = "refs/tags/${version}"; - hash = "sha256-x6f5hhTdOPDVFiBvRhfrXq1wd5keYiuUshXnT0IkjX0="; + hash = "sha256-NxC5+hRDdMCl/7ZIho5ml4hdENrgO+wzi87GRPeMv8Q="; }; - pythonRelaxDeps = [ - "aiohttp" - ]; - - nativeBuildInputs = [ - pythonRelaxDepsHook + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ click pyyaml nbformat @@ -58,6 +55,9 @@ buildPythonPackage rec { requests entrypoints tenacity + ansicolors + ] ++ lib.optionals (pythonAtLeast "3.12") [ + aiohttp ]; passthru.optional-dependencies = {