Skip to content

Commit

Permalink
Merge pull request #721 from jupyterlab/release-v4.0.7-1
Browse files Browse the repository at this point in the history
Release v4.0.7-1
  • Loading branch information
mbektas authored Oct 27, 2023
2 parents 91bb0cf + 7b01cca commit a771ebb
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 10 deletions.
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,8 @@ Previously opened sessions are stored as part of application data and they are l
- `jlab ../test.py` launch python file with relative path
- Open with a custom Python environment
- `jlab --python-path /Users/username/custom_env/bin/python ../notebooks/test.ipynb` launch notebook with custom Python environment
- Connect to existing JupyterLab server
- `jlab https://example.org/lab?token=abcde`

For additional CLI options run `jlab --help` in command line.

Expand Down
5 changes: 2 additions & 3 deletions Release.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,13 +37,12 @@ In order to change the JupyterLab version bundled with the application:
```bash
yarn create_env_installer:osx-64 && yarn update_binary_sign_list --platform osx-64
```

```bash
yarn create_env_installer:osx-arm64 && yarn update_binary_sign_list --platform osx-arm64
```

4. If python version is updated in [`env_installer/jlab_server.yaml`](env_installer/jlab_server.yaml), also update `pythonBin` variables in [`util.ts`](src/main/utils.ts) that are used in code signing related methods.

5. Update `ipywidgets` python package version in [`env_installer/jlab_server.yaml`](env_installer/jlab_server.yaml) if there is a compatible newer version available.
4. Update `ipywidgets` python package version in [`env_installer/jlab_server.yaml`](env_installer/jlab_server.yaml) if there is a compatible newer version available.

Note that after updating the bundled JupyterLab version, it is necessary to bump JupyterLab Desktop version using `tbump` as described in the section below. Run `check_version_match` script before committing the changes to ensure version integrity.

Expand Down
11 changes: 4 additions & 7 deletions src/main/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -499,7 +499,6 @@ export function createCommandScriptInEnv(
back to ad-hoc signed.
*/
export function createUnsignScriptInEnv(envPath: string): string {
const pythonBin = 'bin/python3.8';
const appDir = getAppDir();
const signListFile = path.join(
appDir,
Expand All @@ -510,17 +509,15 @@ export function createUnsignScriptInEnv(envPath: string): string {
const signList: string[] = [];

fileContents.split(/\r?\n/).forEach(line => {
if (line && line !== pythonBin) {
if (line) {
signList.push(`"${line}"`);
}
});

// remove hardened runtime flag, convert to ad-hoc
const removeRuntimeFlagCommand = `codesign -s - -o 0x2 -f ${pythonBin}`;

return `cd ${envPath} && codesign --remove-signature ${signList.join(
// sign all binaries with ad-hoc signature
return `cd ${envPath} && codesign -s - -o 0x2 -f ${signList.join(
' '
)} && ${removeRuntimeFlagCommand} && cd -`;
)} && cd -`;
}

export function getLogFilePath(processType: 'main' | 'renderer' = 'main') {
Expand Down

0 comments on commit a771ebb

Please sign in to comment.