diff --git a/projects/jupyter-collaboration/pyproject.toml b/projects/jupyter-collaboration/pyproject.toml index aa6ef424..a4d085c9 100644 --- a/projects/jupyter-collaboration/pyproject.toml +++ b/projects/jupyter-collaboration/pyproject.toml @@ -1,6 +1,5 @@ # Copyright (c) Jupyter Development Team. # Distributed under the terms of the Modified BSD License. -dependencies = ["jupyter_collaboration>=3.0.0b8", "jupyter_collaboration_ui>=1.0.0b8", "jupyter_docprovider>=1.0.0b8", "jupyter_server_ydoc>=1.0.0b8"] [build-system] build-backend = "hatchling.build" @@ -30,9 +29,9 @@ classifiers = [ "Framework :: Jupyter :: JupyterLab :: Extensions :: Prebuilt", ] dependencies = [ - "jupyter-server-ydoc>=1.0.0b1", - "jupyter-collaboration-ui>=1.0.0b1", - "jupyter-docprovider>=1.0.0b1" + "jupyter-server-ydoc>=1.0.0b8", + "jupyter-collaboration-ui>=1.0.0b8", + "jupyter-docprovider>=1.0.0b8" ] dynamic = ["version"] diff --git a/pyproject.toml b/pyproject.toml index 37951656..32e7cecd 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -57,7 +57,7 @@ packages = [ allow-direct-references = true [tool.jupyter-releaser] -skip = ["check-links"] +skip = ["check-links", "check-python"] [tool.jupyter-releaser.options] # `--skip-if-dirty` is a workaround for https://github.com/jupyter-server/jupyter_releaser/issues/567 diff --git a/scripts/bump_version.py b/scripts/bump_version.py index 5f0c68da..656e4aef 100644 --- a/scripts/bump_version.py +++ b/scripts/bump_version.py @@ -100,13 +100,17 @@ def bump(force, skip_if_dirty, spec): # bump the required version in jupyter-collaboration metapackage # to ensure that users can just upgrade `jupyter-collaboration` - # and get all fixes for free + # and get all fixes for free. + # Formatting based on https://stackoverflow.com/questions/70721025/tomlkit-nicely-formatted-array-with-inline-tables metapackage = "jupyter-collaboration" metapackage_toml_path = HERE / "projects" / metapackage / "pyproject.toml" metapackage_toml = tomlkit.parse(metapackage_toml_path.read_text()) - metapackage_toml["dependencies"] = [ - key + ">=" + project_pins[key] for key in sorted(project_pins) if key != metapackage - ] + metapackage_toml.get("project").remove("dependencies") + dependencies = tomlkit.array() + for key in sorted(project_pins): + if key != metapackage.replace("-", "_"): + dependencies.add_line(key + ">=" + project_pins[key]) + metapackage_toml.get("project").add("dependencies", dependencies.multiline(True)) metapackage_toml_path.write_text(tomlkit.dumps(metapackage_toml)) path = HERE.joinpath("package.json")