From 0c90ed17cedcd618bdbacb45a3d5a8c5d2ee3b09 Mon Sep 17 00:00:00 2001 From: Kerstin Humm Date: Wed, 13 Apr 2022 12:46:36 +0200 Subject: [PATCH 1/5] python3Packages.bleach: 4.1.0 -> 5.0.0 --- pkgs/development/python-modules/bleach/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bleach/default.nix b/pkgs/development/python-modules/bleach/default.nix index 6d3c7fffe6a..fce105163a5 100644 --- a/pkgs/development/python-modules/bleach/default.nix +++ b/pkgs/development/python-modules/bleach/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "bleach"; - version = "4.1.0"; + version = "5.0.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-CQDYs366YagC7kCsAGH4wrXe4pwZJ90dIz4HXr9acdo="; + hash = "sha256-xtbMBUvcnIO0i4CD4jbl8A8jhChmbSzi4IPqpf1WhWU="; }; propagatedBuildInputs = [ From 60b4f7d8e86c81838c76c98a7a7b9de8aec7acd7 Mon Sep 17 00:00:00 2001 From: Kerstin Humm Date: Thu, 14 Apr 2022 14:00:07 +0200 Subject: [PATCH 2/5] zerobin: raise version bounds for bleach to <6 --- pkgs/applications/networking/zerobin/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/zerobin/default.nix b/pkgs/applications/networking/zerobin/default.nix index 56d5274751f..ca55085d808 100644 --- a/pkgs/applications/networking/zerobin/default.nix +++ b/pkgs/applications/networking/zerobin/default.nix @@ -40,7 +40,7 @@ python3Packages.buildPythonApplication rec { # relax version constraints of some dependencies substituteInPlace setup.cfg \ --replace "clize==4.1.1" "clize" \ - --replace "bleach==3.1.5" "bleach>=3.1.5,<5" \ + --replace "bleach==3.1.5" "bleach>=3.1.5,<6" \ --replace "bottle==0.12.18" "bottle>=0.12.18,<1" \ --replace "Paste==3.4.3" "Paste>=3.4.3,<4" ''; From 5f8ac4de773cd78bb07809054b83f0e324b3487c Mon Sep 17 00:00:00 2001 From: Kerstin Humm Date: Wed, 13 Apr 2022 12:35:57 +0200 Subject: [PATCH 3/5] python3Packages.nbconvert: 6.4.5 -> 6.5.0 --- .../python-modules/nbconvert/default.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/nbconvert/default.nix b/pkgs/development/python-modules/nbconvert/default.nix index bfcf93b0708..69aa660f142 100644 --- a/pkgs/development/python-modules/nbconvert/default.nix +++ b/pkgs/development/python-modules/nbconvert/default.nix @@ -5,13 +5,11 @@ , glibcLocales , entrypoints , bleach -, beautifulsoup4 , mistune , nbclient , jinja2 , pygments , traitlets -, testpath , jupyter_core , jupyterlab-pygments , nbformat @@ -20,15 +18,18 @@ , tornado , jupyter-client , defusedxml +, tinycss2 +, beautifulsoup4 }: buildPythonPackage rec { pname = "nbconvert"; - version = "6.4.5"; + version = "6.5.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-IRY6jiBzwHEJyo85iDbkXv26KqzqaNb3WopUX+8HDU4="; + hash = "sha256-Ij5G4nq+hZa4rtVDAfrbukM7f/6oGWpo/Xsf9Qnu6Z0="; }; # Add $out/share/jupyter to the list of paths that are used to search for @@ -44,9 +45,9 @@ buildPythonPackage rec { checkInputs = [ pytestCheckHook glibcLocales ]; propagatedBuildInputs = [ - entrypoints bleach mistune jinja2 pygments traitlets testpath + entrypoints bleach mistune jinja2 pygments traitlets jupyter_core nbformat ipykernel pandocfilters tornado jupyter-client - defusedxml beautifulsoup4 + defusedxml tinycss2 beautifulsoup4 nbclient jupyterlab-pygments ]; From 9146215b37ce504c443e440a9be5acc15b77721d Mon Sep 17 00:00:00 2001 From: Kerstin Humm Date: Wed, 13 Apr 2022 12:31:02 +0200 Subject: [PATCH 4/5] python3Packages.nbclient: 0.5.13 -> 0.6.0 --- pkgs/development/python-modules/nbclient/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/nbclient/default.nix b/pkgs/development/python-modules/nbclient/default.nix index 0082bc32a28..ce37156a867 100644 --- a/pkgs/development/python-modules/nbclient/default.nix +++ b/pkgs/development/python-modules/nbclient/default.nix @@ -5,12 +5,16 @@ buildPythonPackage rec { pname = "nbclient"; - version = "0.5.13"; + version = "0.6.2"; + # As of version 0.6.2, there is both a setup.py and pyproject.toml. However, + # the pyproject.toml does not appear to be the main entry point. + format = "setuptools"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-QMUsm148MfrsruafICs/U+ONfBxWPeD63enX7aD9r+g="; + hash = "sha256-i0dVPxztB3zXxFN/1dcB1G92gfJLKCdeXMHTR+fJtGs="; }; doCheck = false; # Avoid infinite recursion From e02a0ba32c1e2bb2163414a8950f183cc52815fd Mon Sep 17 00:00:00 2001 From: Sandro Date: Thu, 5 May 2022 00:37:08 +0200 Subject: [PATCH 5/5] python310Packages.nbclient: remove comment --- pkgs/development/python-modules/nbclient/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/python-modules/nbclient/default.nix b/pkgs/development/python-modules/nbclient/default.nix index ce37156a867..9c96f71c281 100644 --- a/pkgs/development/python-modules/nbclient/default.nix +++ b/pkgs/development/python-modules/nbclient/default.nix @@ -6,8 +6,6 @@ buildPythonPackage rec { pname = "nbclient"; version = "0.6.2"; - # As of version 0.6.2, there is both a setup.py and pyproject.toml. However, - # the pyproject.toml does not appear to be the main entry point. format = "setuptools"; disabled = pythonOlder "3.7";