Merge pull request #282199 from natsukium/jupyter/update
jupyter related packages updates 2024-01-20
This commit is contained in:
commit
8f2659f142
|
@ -8,7 +8,7 @@
|
||||||
|
|
||||||
let
|
let
|
||||||
pname = "comm";
|
pname = "comm";
|
||||||
version = "0.2.0";
|
version = "0.2.1";
|
||||||
in
|
in
|
||||||
buildPythonPackage {
|
buildPythonPackage {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
|
@ -18,7 +18,7 @@ buildPythonPackage {
|
||||||
owner = "ipython";
|
owner = "ipython";
|
||||||
repo = "comm";
|
repo = "comm";
|
||||||
rev = "refs/tags/v${version}";
|
rev = "refs/tags/v${version}";
|
||||||
hash = "sha256-bErZNTm0spO0A/Lc8kq5u7sB0FMXm/WMWtFbCNGJVXE=";
|
hash = "sha256-iyO3q9E2lYU1rMYTnsa+ZJYh+Hq72LEvE9ynebFIBUk=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
|
|
@ -22,14 +22,14 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "ipykernel";
|
pname = "ipykernel";
|
||||||
version = "6.28.0";
|
version = "6.29.0";
|
||||||
pyproject = true;
|
pyproject = true;
|
||||||
|
|
||||||
disabled = pythonOlder "3.8";
|
disabled = pythonOlder "3.8";
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
hash = "sha256-acEUA9Jt5p3wIiWRb5FrN+pLmvQX2gqMgn+EMo2I5fM=";
|
hash = "sha256-td0wE8q3szDfcSiRyWzRq4aMJ6cVnmBvdiAV6b+M6z8=";
|
||||||
};
|
};
|
||||||
|
|
||||||
# debugpy is optional, see https://github.com/ipython/ipykernel/pull/767
|
# debugpy is optional, see https://github.com/ipython/ipykernel/pull/767
|
||||||
|
|
|
@ -1,32 +1,29 @@
|
||||||
{ lib
|
{ lib
|
||||||
, buildPythonPackage
|
, buildPythonPackage
|
||||||
, fetchFromGitHub
|
, fetchPypi
|
||||||
, pythonOlder
|
, pythonOlder
|
||||||
|
, setuptools
|
||||||
, ipython
|
, ipython
|
||||||
, ipython-genutils
|
, ipython-genutils
|
||||||
, pandas
|
|
||||||
, prettytable
|
, prettytable
|
||||||
, pytest
|
|
||||||
, sqlalchemy
|
, sqlalchemy
|
||||||
, sqlparse
|
, sqlparse
|
||||||
}:
|
}:
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "ipython-sql";
|
pname = "ipython-sql";
|
||||||
version = "0.4.0";
|
version = "0.5.0";
|
||||||
format = "setuptools";
|
pyproject = true;
|
||||||
|
|
||||||
disabled = pythonOlder "3.7";
|
disabled = pythonOlder "3.7";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchPypi {
|
||||||
owner = "catherinedevlin";
|
inherit pname version;
|
||||||
repo = "ipython-sql";
|
hash = "sha256-PbPOf5qV369Dh2+oCxa9u5oE3guhIELKsT6fWW/P/b4=";
|
||||||
rev = "117764caf099d80100ed4b09fc004b55eed6f121";
|
|
||||||
hash = "sha256-ScQihsvRSnC7VIgy8Tzi1z4x6KIZo0SAeLPvHAVdrfA=";
|
|
||||||
};
|
};
|
||||||
|
|
||||||
postPatch = ''
|
nativeBuildInputs = [
|
||||||
substituteInPlace setup.py --replace 'prettytable<1' prettytable
|
setuptools
|
||||||
'';
|
];
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
ipython
|
ipython
|
||||||
|
@ -36,17 +33,8 @@ buildPythonPackage rec {
|
||||||
sqlparse
|
sqlparse
|
||||||
];
|
];
|
||||||
|
|
||||||
nativeCheckInputs = [ ipython pandas pytest ];
|
# pypi tarball has no tests
|
||||||
|
doCheck = false;
|
||||||
checkPhase = ''
|
|
||||||
runHook preCheck
|
|
||||||
|
|
||||||
# running with ipython is required because the tests use objects available
|
|
||||||
# only inside of ipython, for example the global `get_ipython()` function
|
|
||||||
ipython -c 'import pytest; pytest.main()'
|
|
||||||
|
|
||||||
runHook postCheck
|
|
||||||
'';
|
|
||||||
|
|
||||||
pythonImportsCheck = [ "sql" ];
|
pythonImportsCheck = [ "sql" ];
|
||||||
|
|
||||||
|
|
|
@ -7,12 +7,12 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "jupyter-lsp";
|
pname = "jupyter-lsp";
|
||||||
version = "2.2.1";
|
version = "2.2.2";
|
||||||
pyproject = true;
|
pyproject = true;
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
hash = "sha256-sX+rbXD+g8iJawz/WSN2QAOCR8GWBWtDaEoJArap4Ps=";
|
hash = "sha256-JW0kYgVCrku6BKUPwfb/4ggJOgfY5pf+oKjRuMobfls=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
|
|
@ -34,14 +34,14 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "jupyter-server";
|
pname = "jupyter-server";
|
||||||
version = "2.12.4";
|
version = "2.12.5";
|
||||||
pyproject = true;
|
pyproject = true;
|
||||||
disabled = pythonOlder "3.8";
|
disabled = pythonOlder "3.8";
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
pname = "jupyter_server";
|
pname = "jupyter_server";
|
||||||
inherit version;
|
inherit version;
|
||||||
hash = "sha256-QfSh5rkSzCSnxsaUhRs309hBKxgPQ9cjFf5CLLK4XMI=";
|
hash = "sha256-DttibJS6oigJvhMj+XcM8cAKlSsXCXWS5A0D5qOVFok=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
|
|
@ -32,14 +32,14 @@ let
|
||||||
};
|
};
|
||||||
in buildPythonPackage rec {
|
in buildPythonPackage rec {
|
||||||
pname = "nbconvert";
|
pname = "nbconvert";
|
||||||
version = "7.14.1";
|
version = "7.14.2";
|
||||||
pyproject = true;
|
pyproject = true;
|
||||||
|
|
||||||
disabled = pythonOlder "3.8";
|
disabled = pythonOlder "3.8";
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
hash = "sha256-IMuhDgRI3Hazvr/hrfkjZj47mDONr3e5e0JRHvWohhg=";
|
hash = "sha256-p/iAj9TggkMWc6xThAAhjdRe/QdvvrB8xuWqWjpOlJ4=";
|
||||||
};
|
};
|
||||||
|
|
||||||
# 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
|
||||||
|
|
|
@ -16,14 +16,14 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "notebook";
|
pname = "notebook";
|
||||||
version = "7.0.6";
|
version = "7.0.7";
|
||||||
disabled = pythonOlder "3.8";
|
disabled = pythonOlder "3.8";
|
||||||
|
|
||||||
format = "pyproject";
|
format = "pyproject";
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
hash = "sha256-7GETsGUpAZ9/KHgZrwbJeiuvepWsIaj24yGSiY6fmlg=";
|
hash = "sha256-O8/wDBezrBQu9fQ21QY32TaydM+gtB9qwBdTY96bTgk=";
|
||||||
};
|
};
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
|
|
Loading…
Reference in New Issue
Block a user