From 19362a61944170678aa208e8a9cdefb15fdc31f7 Mon Sep 17 00:00:00 2001 From: natsukium Date: Thu, 23 Nov 2023 01:12:08 +0900 Subject: [PATCH 1/2] python311Packages.jupyter-core: 5.3.1 -> 5.5.0 Diff: https://github.com/jupyter/jupyter_core/compare/refs/tags/v5.3.1...v5.5.0 --- .../python-modules/jupyter-core/default.nix | 13 ++++++++++--- .../jupyter-core/tests_respect_pythonpath.patch | 12 ++++++------ 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/jupyter-core/default.nix b/pkgs/development/python-modules/jupyter-core/default.nix index fb5880a4f226..cb71cad8ca2e 100644 --- a/pkgs/development/python-modules/jupyter-core/default.nix +++ b/pkgs/development/python-modules/jupyter-core/default.nix @@ -5,21 +5,22 @@ , hatchling , platformdirs , traitlets +, pip , pytestCheckHook }: buildPythonPackage rec { pname = "jupyter-core"; - version = "5.3.1"; + version = "5.5.0"; disabled = pythonOlder "3.7"; - format = "pyproject"; + pyproject = true; src = fetchFromGitHub { owner = "jupyter"; repo = "jupyter_core"; rev = "refs/tags/v${version}"; - hash = "sha256-kQ7oNEC5L19PTPaX6C2bP5FYuzlsFsS0TABsw6VvoL8="; + hash = "sha256-GufCQUkR4283xMsyrbv5tDfJ8SeL35WBW5Aw2z6Ardc="; }; patches = [ @@ -36,6 +37,7 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ + pip pytestCheckHook ]; @@ -43,6 +45,11 @@ buildPythonPackage rec { export HOME=$TMPDIR ''; + pytestFlagsArray = [ + # suppress pytest.PytestUnraisableExceptionWarning: Exception ignored in: + "-W ignore::pytest.PytestUnraisableExceptionWarning" + ]; + disabledTests = [ # creates a temporary script, which isn't aware of PYTHONPATH "test_argv0" diff --git a/pkgs/development/python-modules/jupyter-core/tests_respect_pythonpath.patch b/pkgs/development/python-modules/jupyter-core/tests_respect_pythonpath.patch index eb061676c0e2..48b44ad56e70 100644 --- a/pkgs/development/python-modules/jupyter-core/tests_respect_pythonpath.patch +++ b/pkgs/development/python-modules/jupyter-core/tests_respect_pythonpath.patch @@ -1,8 +1,8 @@ -diff --git a/jupyter_core/tests/test_command.py b/jupyter_core/tests/test_command.py -index 4ef38cd..08fba22 100644 ---- a/jupyter_core/tests/test_command.py -+++ b/jupyter_core/tests/test_command.py -@@ -174,7 +174,7 @@ def test_not_on_path(tmpdir): +diff --git a/tests/test_command.py b/tests/test_command.py +index a0833c1..67c2110 100644 +--- a/tests/test_command.py ++++ b/tests/test_command.py +@@ -191,7 +191,7 @@ def test_not_on_path(tmpdir): witness_src = "#!{}\n{}\n".format(sys.executable, 'print("WITNESS ME")') write_executable(witness, witness_src) @@ -11,7 +11,7 @@ index 4ef38cd..08fba22 100644 if "SYSTEMROOT" in os.environ: # Windows http://bugs.python.org/issue20614 env["SYSTEMROOT"] = os.environ["SYSTEMROOT"] if sys.platform == "win32": -@@ -198,7 +198,7 @@ def test_path_priority(tmpdir): +@@ -216,7 +216,7 @@ def test_path_priority(tmpdir): witness_b_src = "#!{}\n{}\n".format(sys.executable, 'print("WITNESS B")') write_executable(witness_b, witness_b_src) From ec3fa8c281769a25d5cc2f0b9f2ea51ddb614db1 Mon Sep 17 00:00:00 2001 From: natsukium Date: Thu, 23 Nov 2023 01:15:27 +0900 Subject: [PATCH 2/2] python311Packages.jupyter-core: update meta --- pkgs/development/python-modules/jupyter-core/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/jupyter-core/default.nix b/pkgs/development/python-modules/jupyter-core/default.nix index cb71cad8ca2e..120585896600 100644 --- a/pkgs/development/python-modules/jupyter-core/default.nix +++ b/pkgs/development/python-modules/jupyter-core/default.nix @@ -64,7 +64,8 @@ buildPythonPackage rec { meta = with lib; { description = "Base package on which Jupyter projects rely"; homepage = "https://jupyter.org/"; + changelog = "https://github.com/jupyter/jupyter_core/blob/${src.rev}/CHANGELOG.md"; license = licenses.bsd3; - maintainers = with maintainers; [ fridh ]; + maintainers = teams.jupyter.members; }; }