Merge pull request #141750 from superherointj/python3-alias-jupyter-client

2021-10-21 21:56:31 +02:00 · 2021-10-21 21:56:31 +02:00 · b41a876d6e
commit b41a876d6e
parent 8c543fa304 206f3ab323
23 changed files with 44 additions and 41 deletions
--- a/pkgs/applications/science/math/sage/sagedoc.nix
+++ b/pkgs/applications/science/math/sage/sagedoc.nix
@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
    networkx
    ipykernel
    ipywidgets
-    jupyter_client
+    jupyter-client
  ]);

  unpackPhase = ''
--- a/pkgs/development/python-modules/ipykernel/4.nix
+++ b/pkgs/development/python-modules/ipykernel/4.nix
@ -5,7 +5,7 @@
 , isPy27
 , mock
 , ipython
-, jupyter_client
+, jupyter-client
 , pexpect
 , traitlets
 , tornado
@ -23,7 +23,7 @@ buildPythonPackage rec {
  checkInputs = [ nose ] ++ lib.optional isPy27 mock;
  propagatedBuildInputs = [
    ipython
-    jupyter_client
+    jupyter-client
    pexpect
    traitlets
    tornado
--- a/pkgs/development/python-modules/ipykernel/default.nix
+++ b/pkgs/development/python-modules/ipykernel/default.nix
@ -5,7 +5,7 @@
 , fetchPypi
 , debugpy
 , ipython
-, jupyter_client
+, jupyter-client
 , tornado
 , traitlets
 , pythonOlder
@ -23,7 +23,7 @@ buildPythonPackage rec {
  propagatedBuildInputs = [
    debugpy
    ipython
-    jupyter_client
+    jupyter-client
    tornado
    traitlets
  ];
--- a/pkgs/development/python-modules/ipyparallel/default.nix
+++ b/pkgs/development/python-modules/ipyparallel/default.nix
@ -7,7 +7,7 @@
 , decorator
 , pyzmq
 , ipython
-, jupyter_client
+, jupyter-client
 , ipykernel
 , tornado
 , isPy3k
@ -25,7 +25,7 @@ buildPythonPackage rec {

  buildInputs = [ nose ];

-  propagatedBuildInputs = [ python-dateutil ipython_genutils decorator pyzmq ipython jupyter_client ipykernel tornado
+  propagatedBuildInputs = [ python-dateutil ipython_genutils decorator pyzmq ipython jupyter-client ipykernel tornado
  ] ++ lib.optionals (!isPy3k) [ futures ];

  # Requires access to cluster
--- a/pkgs/development/python-modules/jupyter-client/5.nix
+++ b/pkgs/development/python-modules/jupyter-client/5.nix
@ -11,11 +11,12 @@
 }:

 buildPythonPackage rec {
-  pname = "jupyter_client";
+  pname = "jupyter-client";
  version = "5.3.5";

  src = fetchPypi {
-    inherit pname version;
+    pname = "jupyter_client";
+    inherit version;
    sha256 = "5efdf4131124d4a0d5789101e74827022585f172d2f4b60cf6fa98e0a7511b25";
  };

--- a/pkgs/development/python-modules/jupyter-client/default.nix
+++ b/pkgs/development/python-modules/jupyter-client/default.nix
@ -13,11 +13,12 @@
 }:

 buildPythonPackage rec {
-  pname = "jupyter_client";
+  pname = "jupyter-client";
  version = "7.0.2";

  src = fetchPypi {
-    inherit pname version;
+    pname = "jupyter_client";
+    inherit version;
    sha256 = "0c6cabd07e003a2e9692394bf1ae794188ad17d2e250ed747232d7a473aa772c";
  };

--- a/pkgs/development/python-modules/jupyter_console/5.nix
+++ b/pkgs/development/python-modules/jupyter_console/5.nix
@ -2,7 +2,7 @@
 , buildPythonPackage
 , fetchPypi
 , nose
-, jupyter_client
+, jupyter-client
 , ipython
 , ipykernel
 , prompt-toolkit
@ -20,7 +20,7 @@ buildPythonPackage rec {

  checkInputs = [ nose ];
  propagatedBuildInputs = [
-    jupyter_client
+    jupyter-client
    ipython
    ipykernel
    prompt-toolkit
--- a/pkgs/development/python-modules/jupyter_console/default.nix
+++ b/pkgs/development/python-modules/jupyter_console/default.nix
@ -2,7 +2,7 @@
 , buildPythonPackage
 , fetchPypi
 , nose
-, jupyter_client
+, jupyter-client
 , ipython
 , ipykernel
 , prompt-toolkit
@ -21,7 +21,7 @@ buildPythonPackage rec {
  };

  propagatedBuildInputs = [
-    jupyter_client
+    jupyter-client
    ipython
    ipykernel
    prompt-toolkit
--- a/pkgs/development/python-modules/jupyter_server/default.nix
+++ b/pkgs/development/python-modules/jupyter_server/default.nix
@ -12,7 +12,7 @@
 , ipython_genutils
 , traitlets
 , jupyter_core
-, jupyter_client
+, jupyter-client
 , nbformat
 , nbconvert
 , send2trash
@ -42,7 +42,7 @@ buildPythonPackage rec {
    ipython_genutils
    traitlets
    jupyter_core
-    jupyter_client
+    jupyter-client
    nbformat
    nbconvert
    send2trash
--- a/pkgs/development/python-modules/jupytext/default.nix
+++ b/pkgs/development/python-modules/jupytext/default.nix
@ -4,7 +4,7 @@
 , pythonOlder
 , GitPython
 , jupyter-packaging
-, jupyter_client
+, jupyter-client
 , jupyterlab
 , markdown-it-py
 , mdit-py-plugins
@ -41,7 +41,7 @@ buildPythonPackage rec {
  checkInputs = [
    pytestCheckHook
    GitPython
-    jupyter_client
+    jupyter-client
    notebook
  ];
  # Tests that use a Jupyter notebook require $HOME to be writable.
--- a/pkgs/development/python-modules/nbclient/default.nix
+++ b/pkgs/development/python-modules/nbclient/default.nix
@ -1,5 +1,5 @@
 { lib, buildPythonPackage, fetchPypi, pythonOlder,
-  async_generator, traitlets, nbformat, nest-asyncio, jupyter_client,
+  async_generator, traitlets, nbformat, nest-asyncio, jupyter-client,
  pytest, xmltodict, nbconvert, ipywidgets
 , doCheck ? true
 }:
@ -16,7 +16,7 @@ buildPythonPackage rec {

  inherit doCheck;
  checkInputs = [ pytest xmltodict nbconvert ipywidgets ];
-  propagatedBuildInputs = [ async_generator traitlets nbformat nest-asyncio jupyter_client ];
+  propagatedBuildInputs = [ async_generator traitlets nbformat nest-asyncio jupyter-client ];

  meta = with lib; {
    homepage = "https://github.com/jupyter/nbclient";
--- a/pkgs/development/python-modules/nbconvert/default.nix
+++ b/pkgs/development/python-modules/nbconvert/default.nix
@ -17,7 +17,7 @@
 , ipykernel
 , pandocfilters
 , tornado
-, jupyter_client
+, jupyter-client
 , defusedxml
 }:

@ -44,7 +44,7 @@ buildPythonPackage rec {

  propagatedBuildInputs = [
    entrypoints bleach mistune jinja2 pygments traitlets testpath
-    jupyter_core nbformat ipykernel pandocfilters tornado jupyter_client
+    jupyter_core nbformat ipykernel pandocfilters tornado jupyter-client
    defusedxml
    (nbclient.override { doCheck = false; }) # avoid infinite recursion
    jupyterlab-pygments
--- a/pkgs/development/python-modules/nbsmoke/default.nix
+++ b/pkgs/development/python-modules/nbsmoke/default.nix
@ -2,7 +2,7 @@
 , buildPythonPackage
 , fetchPypi
 , pytest
-, jupyter_client
+, jupyter-client
 , ipykernel
 , holoviews
 , nbformat
@ -24,7 +24,7 @@ buildPythonPackage rec {
  propagatedBuildInputs = [
    pytest
    holoviews
-    jupyter_client
+    jupyter-client
    ipykernel
    nbformat
    nbconvert
--- a/pkgs/development/python-modules/nbval/default.nix
+++ b/pkgs/development/python-modules/nbval/default.nix
@ -3,7 +3,7 @@
 , fetchPypi
 , coverage
 , ipykernel
-, jupyter_client
+, jupyter-client
 , nbformat
 , pytestCheckHook
 , pytest
@ -35,7 +35,7 @@ buildPythonPackage rec {
  propagatedBuildInputs = [
    coverage
    ipykernel
-    jupyter_client
+    jupyter-client
    nbformat
    pytest
    six
--- a/pkgs/development/python-modules/notebook/2.nix
+++ b/pkgs/development/python-modules/notebook/2.nix
@ -12,7 +12,7 @@
 , ipython_genutils
 , traitlets
 , jupyter_core
-, jupyter_client
+, jupyter-client
 , nbformat
 , nbconvert
 , ipykernel
@ -39,7 +39,7 @@ buildPythonPackage rec {

  propagatedBuildInputs = [
    jinja2 tornado ipython_genutils traitlets jupyter_core send2trash
-    jupyter_client nbformat nbconvert ipykernel terminado requests pexpect
+    jupyter-client nbformat nbconvert ipykernel terminado requests pexpect
    prometheus-client
  ];

--- a/pkgs/development/python-modules/notebook/default.nix
+++ b/pkgs/development/python-modules/notebook/default.nix
@ -13,7 +13,7 @@
 , ipython_genutils
 , traitlets
 , jupyter_core
-, jupyter_client
+, jupyter-client
 , nbformat
 , nbconvert
 , ipykernel
@ -42,7 +42,7 @@ buildPythonPackage rec {

  propagatedBuildInputs = [
    jinja2 tornado ipython_genutils traitlets jupyter_core send2trash
-    jupyter_client nbformat nbconvert ipykernel terminado requests pexpect
+    jupyter-client nbformat nbconvert ipykernel terminado requests pexpect
    prometheus-client argon2_cffi
  ];

--- a/pkgs/development/python-modules/papermill/default.nix
+++ b/pkgs/development/python-modules/papermill/default.nix
@ -10,7 +10,7 @@
 , nbclient
 , six
 , tqdm
-, jupyter_client
+, jupyter-client
 , requests
 , entrypoints
 , tenacity
@ -42,7 +42,7 @@ buildPythonPackage rec {
    nbclient
    six
    tqdm
-    jupyter_client
+    jupyter-client
    requests
    entrypoints
    tenacity
--- a/pkgs/development/python-modules/phik/default.nix
+++ b/pkgs/development/python-modules/phik/default.nix
@ -7,7 +7,7 @@
 , pytest-pylint
 , nbconvert
 , joblib
-, jupyter_client
+, jupyter-client
 , numpy
 , scipy
 , pandas
@ -31,7 +31,7 @@ buildPythonPackage rec {
    pytest
    pytest-pylint
    nbconvert
-    jupyter_client
+    jupyter-client
  ];

  propagatedBuildInputs = [
--- a/pkgs/development/python-modules/qtconsole/default.nix
+++ b/pkgs/development/python-modules/qtconsole/default.nix
@ -6,7 +6,7 @@
 , mock
 , traitlets
 , jupyter_core
-, jupyter_client
+, jupyter-client
 , pygments
 , ipykernel
 , pyqt5
@ -23,7 +23,7 @@ buildPythonPackage rec {
  };

  checkInputs = [ nose ] ++ lib.optionals isPy27 [mock];
-  propagatedBuildInputs = [traitlets jupyter_core jupyter_client pygments ipykernel pyqt5 qtpy];
+  propagatedBuildInputs = [traitlets jupyter_core jupyter-client pygments ipykernel pyqt5 qtpy];

  # : cannot connect to X server
  doCheck = false;
--- a/pkgs/development/python-modules/spyder-kernels/default.nix
+++ b/pkgs/development/python-modules/spyder-kernels/default.nix
@ -1,5 +1,5 @@
 { lib, buildPythonPackage, fetchPypi, cloudpickle, ipykernel, wurlitzer,
-  jupyter_client, pyzmq }:
+  jupyter-client, pyzmq }:

 buildPythonPackage rec {
  pname = "spyder-kernels";
@ -14,7 +14,7 @@ buildPythonPackage rec {
    cloudpickle
    ipykernel
    wurlitzer
-    jupyter_client
+    jupyter-client
    pyzmq
  ];

--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@ -52,6 +52,7 @@ mapAliases ({
  googleapis_common_protos = googleapis-common-protos; # added 2021-03-19
  grpc_google_iam_v1 = grpc-google-iam-v1; # added 2021-08-21
  HAP-python = hap-python; # added 2021-06-01
+  jupyter_client = jupyter-client; # added 2021-10-15
  lammps-cython = throw "no longer builds and is unmaintained";
  MechanicalSoup = mechanicalsoup; # added 2021-06-01
  pam = python-pam; # added 2020-09-07.
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@ -3977,7 +3977,7 @@ in {

  jupyter-c-kernel = callPackage ../development/python-modules/jupyter-c-kernel { };

-  jupyter_client = callPackage ../development/python-modules/jupyter_client { };
+  jupyter-client = callPackage ../development/python-modules/jupyter-client { };

  jupyter_console = callPackage ../development/python-modules/jupyter_console { };

--- a/pkgs/top-level/python2-packages.nix
+++ b/pkgs/top-level/python2-packages.nix
@ -212,7 +212,7 @@ with self; with super; {

  jsonrpclib = callPackage ../development/python-modules/jsonrpclib { };

-  jupyter_client = callPackage ../development/python-modules/jupyter_client/5.nix { };
+  jupyter-client = callPackage ../development/python-modules/jupyter-client/5.nix { };

  jupyter_console = callPackage ../development/python-modules/jupyter_console/5.nix { };