Merge pull request #168473 from erictapen/nbclient

main
Sandro 2 years ago committed by GitHub
commit 5060994261
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      pkgs/applications/networking/zerobin/default.nix
  2. 4
      pkgs/development/python-modules/bleach/default.nix
  3. 6
      pkgs/development/python-modules/nbclient/default.nix
  4. 13
      pkgs/development/python-modules/nbconvert/default.nix

@ -40,7 +40,7 @@ python3Packages.buildPythonApplication rec {
# relax version constraints of some dependencies # relax version constraints of some dependencies
substituteInPlace setup.cfg \ substituteInPlace setup.cfg \
--replace "clize==4.1.1" "clize" \ --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 "bottle==0.12.18" "bottle>=0.12.18,<1" \
--replace "Paste==3.4.3" "Paste>=3.4.3,<4" --replace "Paste==3.4.3" "Paste>=3.4.3,<4"
''; '';

@ -11,12 +11,12 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "bleach"; pname = "bleach";
version = "4.1.0"; version = "5.0.0";
disabled = pythonOlder "3.6"; disabled = pythonOlder "3.6";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "sha256-CQDYs366YagC7kCsAGH4wrXe4pwZJ90dIz4HXr9acdo="; hash = "sha256-xtbMBUvcnIO0i4CD4jbl8A8jhChmbSzi4IPqpf1WhWU=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

@ -5,12 +5,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "nbclient"; pname = "nbclient";
version = "0.5.13"; version = "0.6.2";
format = "setuptools";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "sha256-QMUsm148MfrsruafICs/U+ONfBxWPeD63enX7aD9r+g="; hash = "sha256-i0dVPxztB3zXxFN/1dcB1G92gfJLKCdeXMHTR+fJtGs=";
}; };
doCheck = false; # Avoid infinite recursion doCheck = false; # Avoid infinite recursion

@ -5,13 +5,11 @@
, glibcLocales , glibcLocales
, entrypoints , entrypoints
, bleach , bleach
, beautifulsoup4
, mistune , mistune
, nbclient , nbclient
, jinja2 , jinja2
, pygments , pygments
, traitlets , traitlets
, testpath
, jupyter_core , jupyter_core
, jupyterlab-pygments , jupyterlab-pygments
, nbformat , nbformat
@ -20,15 +18,18 @@
, tornado , tornado
, jupyter-client , jupyter-client
, defusedxml , defusedxml
, tinycss2
, beautifulsoup4
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "nbconvert"; pname = "nbconvert";
version = "6.4.5"; version = "6.5.0";
format = "setuptools";
src = fetchPypi { src = fetchPypi {
inherit pname version; 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 # Add $out/share/jupyter to the list of paths that are used to search for
@ -44,9 +45,9 @@ buildPythonPackage rec {
checkInputs = [ pytestCheckHook glibcLocales ]; checkInputs = [ pytestCheckHook glibcLocales ];
propagatedBuildInputs = [ propagatedBuildInputs = [
entrypoints bleach mistune jinja2 pygments traitlets testpath entrypoints bleach mistune jinja2 pygments traitlets
jupyter_core nbformat ipykernel pandocfilters tornado jupyter-client jupyter_core nbformat ipykernel pandocfilters tornado jupyter-client
defusedxml beautifulsoup4 defusedxml tinycss2 beautifulsoup4
nbclient nbclient
jupyterlab-pygments jupyterlab-pygments
]; ];

Loading…
Cancel
Save