From d243a04e3bb5d5adf0b0ecdc3e3fb3fe998891bb Mon Sep 17 00:00:00 2001 From: krassowski <5832902+krassowski@users.noreply.github.com> Date: Mon, 12 Aug 2024 11:12:40 +0100 Subject: [PATCH 1/3] Bump dependencies to fix CI --- projects/jupyter-collaboration/pyproject.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/projects/jupyter-collaboration/pyproject.toml b/projects/jupyter-collaboration/pyproject.toml index 951e58a1..e0c0bbeb 100644 --- a/projects/jupyter-collaboration/pyproject.toml +++ b/projects/jupyter-collaboration/pyproject.toml @@ -29,9 +29,9 @@ classifiers = [ "Framework :: Jupyter :: JupyterLab :: Extensions :: Prebuilt", ] dependencies = [ - "jupyter-server-ydoc>=1.0.0a0", - "jupyter-collaboration-ui>=1.0.0a0", - "jupyter-docprovider>=1.0.0a0" + "jupyter-server-ydoc>=1.0.0b1", + "jupyter-collaboration-ui>=1.0.0b1", + "jupyter-docprovider>=1.0.0b1" ] dynamic = ["version"] From 4ae48be853edb69fd2e1fe2a387b7788efd45b92 Mon Sep 17 00:00:00 2001 From: krassowski <5832902+krassowski@users.noreply.github.com> Date: Mon, 12 Aug 2024 11:27:41 +0100 Subject: [PATCH 2/3] Update metapackage on release --- pyproject.toml | 3 ++- scripts/bump_version.py | 16 ++++++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 47402e45..06b66ced 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -23,7 +23,8 @@ dynamic = ["version"] dev = [ "click", "pre-commit", - "jupyter_releaser" + "jupyter_releaser", + "tomlkit" ] test = [ "jupyter-server-ydoc[test] @ {root:uri}/projects/jupyter-server-ydoc", diff --git a/scripts/bump_version.py b/scripts/bump_version.py index d71e1ec2..805e4512 100644 --- a/scripts/bump_version.py +++ b/scripts/bump_version.py @@ -5,6 +5,7 @@ from pathlib import Path import click +import tomlkit from jupyter_releaser.util import get_version, run from pkg_resources import parse_version # type: ignore @@ -80,6 +81,8 @@ def bump(force, skip_if_dirty, spec): HERE = Path(__file__).parent.parent.resolve() + project_pins = {} + # bump the Python packages for version_file in HERE.glob("projects/**/_version.py"): content = version_file.read_text().splitlines() @@ -92,6 +95,19 @@ def bump(force, skip_if_dirty, spec): current = current.strip("'\"") version_spec = increment_version(current, spec) version_file.write_text(f'__version__ = "{version_spec}"\n') + project = version_file.parent.name + project_pins[project] = version_spec + + # bump the required version in jupyter-collaboration metapackage + # to ensure that users can just upgrade `jupyter-collaboration` + # and get all fixes for free + 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_path.write_text(tomlkit.dumps(metapackage_toml)) path = HERE.joinpath("package.json") if path.exists(): From 7e1bff79fc4b9841404c00d765521b9b0fbbe49a Mon Sep 17 00:00:00 2001 From: krassowski <5832902+krassowski@users.noreply.github.com> Date: Mon, 12 Aug 2024 12:05:57 +0100 Subject: [PATCH 3/3] Install `tomlkit` before version bump --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 06b66ced..4ba3d035 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -81,7 +81,7 @@ before-build-python = [ "jlpm clean:lib" ] before-bump-version = [ - "python -m pip install -U jupyterlab", + "python -m pip install -U jupyterlab tomlkit", "jlpm" ]