diff options
author | OTABI Tomoya <tomoya.otabi@gmail.com> | 2024-04-29 01:55:36 +0900 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-04-29 01:55:36 +0900 |
commit | 880bc0e41df54fec66955917ab93ab06f3754fe4 (patch) | |
tree | ecd7e1b31f37d520395dcb8507a52a2987782f6b /pkgs/development | |
parent | 8bc49b5bacc131f5ba6cf6eeb7525f708e58f50a (diff) | |
parent | 4388b09ee0f12f64dea862f413e33f4c717f473f (diff) |
Merge pull request #307396 from natsukium/jupyter/update
jupyter related packages updates 2024-04-28
Diffstat (limited to 'pkgs/development')
7 files changed, 53 insertions, 40 deletions
diff --git a/pkgs/development/python-modules/anywidget/default.nix b/pkgs/development/python-modules/anywidget/default.nix index 07c6bb744923c..767fc775851d1 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 diff --git a/pkgs/development/python-modules/ipycanvas/default.nix b/pkgs/development/python-modules/ipycanvas/default.nix index 85961b450ec17..2222c0bdad0d3 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" ]; diff --git a/pkgs/development/python-modules/ipyniivue/default.nix b/pkgs/development/python-modules/ipyniivue/default.nix index c097f2cb404e8..14667b0942ed4 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 ]; diff --git a/pkgs/development/python-modules/jupyterlab-server/default.nix b/pkgs/development/python-modules/jupyterlab-server/default.nix index f295ce204ad29..059cb1c5ac52a 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 = '' diff --git a/pkgs/development/python-modules/jupyterlab/default.nix b/pkgs/development/python-modules/jupyterlab/default.nix index dc48c597d5489..7b9a17d91e2ca 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 = [ diff --git a/pkgs/development/python-modules/nbdev/default.nix b/pkgs/development/python-modules/nbdev/default.nix index 8a298ec19f67f..ee82753ae822e 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 diff --git a/pkgs/development/python-modules/papermill/default.nix b/pkgs/development/python-modules/papermill/default.nix index b419398eef996..743812b84b62a 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 = { |