Skip to content

Commit e8fa767

Browse files
authored
Fix jupyterlab dependency dropped by the version bump script (#463)
* Preserve other dependencies * Restore jupyterlab dependency * Remove log * Require stable
1 parent 834bbcc commit e8fa767

File tree

2 files changed

+9
-1
lines changed

2 files changed

+9
-1
lines changed

projects/jupyter-collaboration/pyproject.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ dependencies = [
3333
"jupyter_collaboration_ui>=2.0.0",
3434
"jupyter_docprovider>=2.0.0",
3535
"jupyter_server_ydoc>=2.0.0",
36+
"jupyterlab>=4.4.0,<5.0.0",
3637
]
3738

3839
[tool.hatch.version]

scripts/bump_version.py

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@
77
import click
88
import tomlkit
99
from jupyter_releaser.util import get_version, run
10-
from pkg_resources import parse_version
10+
from pkg_resources import parse_version, Requirement
11+
1112

1213
LERNA_CMD = "jlpm run lerna version --no-push --force-publish --no-git-tag-version"
1314

@@ -105,11 +106,17 @@ def bump(force, skip_if_dirty, spec):
105106
metapackage = "jupyter-collaboration"
106107
metapackage_toml_path = HERE / "projects" / metapackage / "pyproject.toml"
107108
metapackage_toml = tomlkit.parse(metapackage_toml_path.read_text())
109+
old_dependencies = metapackage_toml.get("project").get("dependencies")
108110
metapackage_toml.get("project").remove("dependencies")
109111
dependencies = tomlkit.array()
110112
for key in sorted(project_pins):
111113
if key != metapackage.replace("-", "_"):
112114
dependencies.add_line(key + ">=" + project_pins[key])
115+
# re-add other dependencies
116+
for dependency in old_dependencies:
117+
requirement = Requirement.parse(dependency)
118+
if requirement.project_name.replace("-", "_") not in project_pins:
119+
dependencies.add_line(dependency)
113120
metapackage_toml.get("project").add("dependencies", dependencies.multiline(True))
114121
metapackage_toml_path.write_text(tomlkit.dumps(metapackage_toml))
115122

0 commit comments

Comments
 (0)