Skip to content

Commit e620f65

Browse files
authored
Merge pull request #760 from mbektas/disable-web-app-announcements
Disable announcements and update notifications in web app
2 parents 61fbada + 0414e5a commit e620f65

File tree

3 files changed

+27
-7
lines changed

3 files changed

+27
-7
lines changed
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"disabledExtensions": {
3+
"@jupyterlab/apputils-extension:announcements": true
4+
}
5+
}

package.json

+3-2
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,12 @@
2727
"update_workflow_conda_lock": "cd workflow_env && rimraf *.lock && conda-lock --kind explicit -f publish_env.yaml && cd -",
2828
"update_conda_lock": "cd env_installer && rimraf *.lock && conda-lock --kind explicit -f jlab_server.yaml && cd -",
2929
"clean_env_installer": "rimraf ./env_installer/jlab_server.tar.gz && rimraf ./env_installer/jlab_server",
30-
"create_env_installer": "yarn clean_env_installer && conda-lock install --no-validate-platform --prefix ./env_installer/jlab_server ./env_installer/conda-${ENV_PLATFORM}.lock && conda pack -p ./env_installer/jlab_server -o ./env_installer/jlab_server.tar.gz",
30+
"create_env_installer": "yarn clean_env_installer && conda-lock install --no-validate-platform --prefix ./env_installer/jlab_server ./env_installer/conda-${ENV_PLATFORM}.lock && yarn copy_extras_to_bundled_env && conda pack -p ./env_installer/jlab_server -o ./env_installer/jlab_server.tar.gz",
3131
"create_env_installer:linux-64": "ENV_PLATFORM=linux-64 yarn create_env_installer",
3232
"create_env_installer:linux-aarch64": "ENV_PLATFORM=linux-aarch64 yarn create_env_installer",
3333
"create_env_installer:osx-64": "ENV_PLATFORM=osx-64 yarn create_env_installer",
3434
"create_env_installer:osx-arm64": "ENV_PLATFORM=osx-arm64 yarn create_env_installer",
35-
"create_env_installer:win-64": "yarn clean_env_installer && conda-lock install --no-validate-platform --prefix ./env_installer/jlab_server ./env_installer/conda-win-64.lock && conda pack -p ./env_installer/jlab_server -o ./env_installer/jlab_server.tar.gz",
35+
"create_env_installer:win-64": "yarn clean_env_installer && conda-lock install --no-validate-platform --prefix ./env_installer/jlab_server ./env_installer/conda-win-64.lock && yarn copy_extras_to_bundled_env && conda pack -p ./env_installer/jlab_server -o ./env_installer/jlab_server.tar.gz",
3636
"extract_env_installer:osx": "cd ./env_installer && rimraf jlab_server_extracted && mkdir jlab_server_extracted && tar -xzf jlab_server.tar.gz -C jlab_server_extracted && cd -",
3737
"extract_env_installer:osx-64": "yarn extract_env_installer:osx",
3838
"extract_env_installer:osx-arm64": "yarn extract_env_installer:osx",
@@ -41,6 +41,7 @@
4141
"compress_env_installer:osx-arm64": "yarn compress_env_installer:osx",
4242
"check_version_match": "node scripts/buildutil.js --check-version-match",
4343
"update_binary_sign_list": "node scripts/buildutil.js --update-binary-sign-list",
44+
"copy_extras_to_bundled_env": "node scripts/buildutil.js --copy-extras-to-bundled-env",
4445
"eslint": "eslint --ext .js,.jsx,.ts,.tsx --cache --fix .",
4546
"eslint:check": "eslint --ext .js,.jsx,.ts,.tsx --cache .",
4647
"eslint:check:typed": "eslint --config .eslintrc.typecheck.js --ext .js,.jsx,.ts,.tsx .",

scripts/buildutil.js

+19-5
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,14 @@ const cli = meow(
1212
$ node buildutil <options>
1313
1414
Options
15-
--check-version-match check for JupyterLab version match
16-
--update-binary-sign-list update binary list to sign for macOS
17-
--platform platform for --update-binary-sign-list. osx-64 or osx-arm64
15+
--check-version-match check for JupyterLab version match
16+
--update-binary-sign-list update binary list to sign for macOS
17+
--copy-extras-to-bundled-env copy extra files from extras to bundled environment installer
18+
--platform platform for --update-binary-sign-list. osx-64 or osx-arm64
1819
1920
Other options:
20-
--help show usage information
21-
--version show version information
21+
--help show usage information
22+
--version show version information
2223
2324
Examples
2425
$ node buildutil --check-version-match
@@ -182,3 +183,16 @@ if (cli.flags.updateBinarySignList) {
182183

183184
process.exit(0);
184185
}
186+
187+
if (cli.flags.copyExtrasToBundledEnv) {
188+
const envExtrasDir = path.resolve('env_installer', 'extras');
189+
const envInstallerDir = path.resolve('env_installer', 'jlab_server');
190+
191+
fs.copySync(envExtrasDir, envInstallerDir, { recursive: true });
192+
193+
console.log(
194+
`Finished copying from \n\t"${envExtrasDir}" to \n\t"${envInstallerDir}"`
195+
);
196+
197+
process.exit(0);
198+
}

0 commit comments

Comments
 (0)