Skip to content

Commit 8d9870d

Browse files
committed
support for alpha / beta jupyterlab Python package versions
1 parent db3d8f8 commit 8d9870d

File tree

3 files changed

+16
-5
lines changed

3 files changed

+16
-5
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@
201201
"fix-path": "^3.0.0",
202202
"js-yaml": "^4.1.0",
203203
"node-fetch": "^2.6.7",
204-
"semver": "^7.3.4",
204+
"semver": "^7.5.0",
205205
"update-electron-app": "^2.0.1",
206206
"which": "^2.0.2",
207207
"winreg": "^1.2.4",

src/main/registry.ts

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -778,10 +778,14 @@ export class Registry implements IRegistry, IDisposable {
778778
): boolean {
779779
return requirements.every((req, index, reqSelf) => {
780780
try {
781-
return semver.satisfies(
782-
environment.versions[req.name],
783-
req.versionRange
784-
);
781+
const version = environment.versions[req.name];
782+
// remove alpha / beta suffixes
783+
const versionWithoutSuffix = `${semver.major(version, {
784+
loose: true
785+
})}.${semver.minor(version, {
786+
loose: true
787+
})}.${semver.patch(version, { loose: true })}`;
788+
return semver.satisfies(versionWithoutSuffix, req.versionRange);
785789
} catch (e) {
786790
return false;
787791
}

yarn.lock

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3675,6 +3675,13 @@ semver@^7.3.2, semver@^7.3.4, semver@^7.3.7:
36753675
dependencies:
36763676
lru-cache "^6.0.0"
36773677

3678+
semver@^7.5.0:
3679+
version "7.5.0"
3680+
resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.0.tgz#ed8c5dc8efb6c629c88b23d41dc9bf40c1d96cd0"
3681+
integrity sha512-+XC0AD/R7Q2mPSRuy2Id0+CGTZ98+8f+KvwirxOKIEyid+XSx6HbC63p+O4IndTHuX5Z+JxQ0TghCkO5Cg/2HA==
3682+
dependencies:
3683+
lru-cache "^6.0.0"
3684+
36783685
semver@~7.0.0:
36793686
version "7.0.0"
36803687
resolved "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz#5f3ca35761e47e05b206c6daff2cf814f0316b8e"

0 commit comments

Comments
 (0)