From b65bf0227cf1c2c605127e10947b041c006e6c83 Mon Sep 17 00:00:00 2001 From: Jeremy Tuloup Date: Fri, 20 Dec 2024 22:29:07 +0100 Subject: [PATCH 1/2] Fix script to update the lab version --- buildutils/src/upgrade-lab-dependencies.ts | 23 ++++++++-------------- 1 file changed, 8 insertions(+), 15 deletions(-) diff --git a/buildutils/src/upgrade-lab-dependencies.ts b/buildutils/src/upgrade-lab-dependencies.ts index 9460f3f857..0d9beb5e43 100644 --- a/buildutils/src/upgrade-lab-dependencies.ts +++ b/buildutils/src/upgrade-lab-dependencies.ts @@ -137,30 +137,23 @@ function absoluteVersion(version: string): string { return version; } -async function updatePyprojectToml(version: IVersion): Promise { - const filePath = path.resolve('pyproject.toml'); - const pattern = /(jupyterlab>=)[\d.]+(?:a|b|rc\d+)?,<[\d.]+/g; - updateVersionInFile(filePath, pattern, version); -} +const versionPattern = /(jupyterlab>=)[\d.]+(?:a|b|rc\d+)?,<[\d.]+/g; -async function updatePreCommitConfig(version: IVersion): Promise { - const filePath = path.resolve('.pre-commit-config.yaml'); - const pattern = /(jupyterlab)(?:>=|==)[\d.]+(?:,<[\d.]+)?(?="|,|\s|$)/; - updateVersionInFile(filePath, pattern, version); -} +const FILES_TO_UPDATE = ['pyproject.toml', '.pre-commit-config.yaml']; async function upgradeLabDependencies(): Promise { const args: string[] = process.argv.slice(2); - if (args.length !== 2 || args[0] !== '--set-version') { - console.error('Usage: node script.js --set-version '); - process.exit(1); + if (args.length < 2) { + throw new Error('Please provide the set-version flag and version'); } const version = parseVersion(args[1]); await updatePackageJson(args[1]); // Keep original string version for package.json - await updatePyprojectToml(version); - await updatePreCommitConfig(version); + + for (const file of FILES_TO_UPDATE) { + updateVersionInFile(path.resolve(file), versionPattern, version); + } } upgradeLabDependencies(); From 7755505011eec74b421d2148d60e2a59be542ccc Mon Sep 17 00:00:00 2001 From: Jeremy Tuloup Date: Fri, 20 Dec 2024 22:33:27 +0100 Subject: [PATCH 2/2] fix --- buildutils/src/upgrade-lab-dependencies.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildutils/src/upgrade-lab-dependencies.ts b/buildutils/src/upgrade-lab-dependencies.ts index 0d9beb5e43..76a53bcd1a 100644 --- a/buildutils/src/upgrade-lab-dependencies.ts +++ b/buildutils/src/upgrade-lab-dependencies.ts @@ -137,7 +137,7 @@ function absoluteVersion(version: string): string { return version; } -const versionPattern = /(jupyterlab>=)[\d.]+(?:a|b|rc\d+)?,<[\d.]+/g; +const versionPattern = /(jupyterlab)>=[\d.]+(?:a|b|rc\d+)?,<[\d.]+/g; const FILES_TO_UPDATE = ['pyproject.toml', '.pre-commit-config.yaml'];