From b83f9af4190214310f5f7d6c87004c4f1f9dc666 Mon Sep 17 00:00:00 2001 From: "Michael C. Grant" Date: Thu, 27 Jul 2023 17:13:49 -0500 Subject: [PATCH 1/3] upper bound for pyzmq/jupyter_client for notebook<7 --- main.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/main.py b/main.py index 4ea66e4..9d62574 100644 --- a/main.py +++ b/main.py @@ -1027,8 +1027,13 @@ def patch_record_in_place(fn, record, subdir): # notebook <5.7.6 will not work with tornado 6, see: # https://github.com/jupyter/notebook/issues/4439 + # notebook <7 will not work with pyzmq>=25 and jupyter_client>=8, see: + # https://github.com/jupyter/notebook/pull/6749 if name == "notebook": replace_dep(depends, "tornado >=4", "tornado >=4,<6") + if int(version.split('.', 1)[0]) < 7: + replace_dep(depends, "pyzmq >=17", "pyzmq >=17,<25") + replace_dep(depends, "jupyter_client >=5.3.4", "jupyter_client >=5.3.4,<8") # spyder 4.0.0 and 4.0.1 should include a lower bound on psutil of 5.2 # and should pin parso to 0.5.2. From 8d3793c16b49491c9495bce2e11db41a8c79444e Mon Sep 17 00:00:00 2001 From: "Michael C. Grant" Date: Thu, 27 Jul 2023 20:14:42 -0500 Subject: [PATCH 2/3] add 5.2.0 pin --- main.py | 1 + 1 file changed, 1 insertion(+) diff --git a/main.py b/main.py index 9d62574..f4ae6e9 100644 --- a/main.py +++ b/main.py @@ -1034,6 +1034,7 @@ def patch_record_in_place(fn, record, subdir): if int(version.split('.', 1)[0]) < 7: replace_dep(depends, "pyzmq >=17", "pyzmq >=17,<25") replace_dep(depends, "jupyter_client >=5.3.4", "jupyter_client >=5.3.4,<8") + replace_dep(depends, "jupyter_client >=5.2.0", "jupyter_client >=5.2.0,<8") # spyder 4.0.0 and 4.0.1 should include a lower bound on psutil of 5.2 # and should pin parso to 0.5.2. From 3a247ba8065d241a8f4e844b773233b7bed81628 Mon Sep 17 00:00:00 2001 From: "Michael C. Grant" Date: Thu, 27 Jul 2023 20:17:25 -0500 Subject: [PATCH 3/3] tackle unpinned case --- main.py | 1 + 1 file changed, 1 insertion(+) diff --git a/main.py b/main.py index f4ae6e9..bb34113 100644 --- a/main.py +++ b/main.py @@ -1035,6 +1035,7 @@ def patch_record_in_place(fn, record, subdir): replace_dep(depends, "pyzmq >=17", "pyzmq >=17,<25") replace_dep(depends, "jupyter_client >=5.3.4", "jupyter_client >=5.3.4,<8") replace_dep(depends, "jupyter_client >=5.2.0", "jupyter_client >=5.2.0,<8") + replace_dep(depends, "jupyter_client", "jupyter_client <8") # spyder 4.0.0 and 4.0.1 should include a lower bound on psutil of 5.2 # and should pin parso to 0.5.2.