Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Patch notebook < 7 dependencies for jupyter_client and pyzmq #489

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Patch notebook < 7 dependencies for jupyter_client and pyzmq #489

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aef8b7f
patch notebook < 7 dependencies for jupyter_client and pyzmq
RRosio Aug 1, 2023
21e60fd
adding condition to look at packages built in past, as per review
RRosio Aug 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 20 additions & 0 deletions recipe/gen_patch_json.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1706,6 +1706,26 @@ def _gen_new_index_per_key(repodata, subdir, index_key):
i = record["depends"].index("pyyaml")
record["depends"][i] = "pyyaml >=6.0"

# Notebook 6.5.5 pins the versions of jupyter_client to < 8
# and pyzmq>=25 as a temporary fix for issue
# https://github.com/jupyter/notebook/issues/4439
# all versions of Notebook < 7 should at least pin to
# jupyter_client < 8 and pyzmq < 25 as in
# https://github.com/jupyter/notebook/pull/6749
if record_name == "notebook" and int(record["version"].split(".", 1)[0]) < 7:
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note the second checklist item in the PR template...

Make sure to add a condition and record.get("timestamp", 0) < NOW so your changes only affect packages built in the past. Replace NOW with python -c "import time; print(f'{time.time():.0f}000')" -->

...so perhaps something like:

if (
    record_name == "notebook" 
    and int(record["version"].split(".", 1)[0]) < 7
    and record.get("timestamp", 0) < 1691035398000
):

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you! I have updated the condition!

if "jupyter_client>=5.3.4" in record["depends"]:
i = record["depends"].index("jupyter_client>=5.3.4")
record["depends"][i] = "jupyter_client >=5.3.4,<8"
if "jupyter_client >=5.2.0" in record["depends"]:
i = record["depends"].index("jupyter_client >=5.2.0")
record["depends"][i] = "jupyter_client >=5.2.0,<8"
if "jupyter_client" in record["depends"]:
i = record["depends"].index("jupyter_client")
record["depends"][i] = "jupyter_client <8"
if "pyzmq >=17" in record["depends"]:
i = record["depends"].index("pyzmq >=17")
record["depends"][i] = "pyzmq >=17,<25"

# librmm 0.19 missed spdlog 1.7.0 in build 1
# due to spdlog 1.7.0 not having run_exports.
# This hotfixes those packages
Expand Down