Skip to content

Commit

Permalink
Merge pull request #760 from mbektas/disable-web-app-announcements
Browse files Browse the repository at this point in the history
Disable announcements and update notifications in web app
  • Loading branch information
mbektas authored Feb 3, 2024
2 parents 61fbada + 0414e5a commit e620f65
Show file tree
Hide file tree
Showing 3 changed files with 27 additions and 7 deletions.
5 changes: 5 additions & 0 deletions env_installer/extras/etc/jupyter/labconfig/page_config.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"disabledExtensions": {
"@jupyterlab/apputils-extension:announcements": true
}
}
5 changes: 3 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,12 @@
"update_workflow_conda_lock": "cd workflow_env && rimraf *.lock && conda-lock --kind explicit -f publish_env.yaml && cd -",
"update_conda_lock": "cd env_installer && rimraf *.lock && conda-lock --kind explicit -f jlab_server.yaml && cd -",
"clean_env_installer": "rimraf ./env_installer/jlab_server.tar.gz && rimraf ./env_installer/jlab_server",
"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",
"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",
"create_env_installer:linux-64": "ENV_PLATFORM=linux-64 yarn create_env_installer",
"create_env_installer:linux-aarch64": "ENV_PLATFORM=linux-aarch64 yarn create_env_installer",
"create_env_installer:osx-64": "ENV_PLATFORM=osx-64 yarn create_env_installer",
"create_env_installer:osx-arm64": "ENV_PLATFORM=osx-arm64 yarn create_env_installer",
"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",
"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",
"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 -",
"extract_env_installer:osx-64": "yarn extract_env_installer:osx",
"extract_env_installer:osx-arm64": "yarn extract_env_installer:osx",
Expand All @@ -41,6 +41,7 @@
"compress_env_installer:osx-arm64": "yarn compress_env_installer:osx",
"check_version_match": "node scripts/buildutil.js --check-version-match",
"update_binary_sign_list": "node scripts/buildutil.js --update-binary-sign-list",
"copy_extras_to_bundled_env": "node scripts/buildutil.js --copy-extras-to-bundled-env",
"eslint": "eslint --ext .js,.jsx,.ts,.tsx --cache --fix .",
"eslint:check": "eslint --ext .js,.jsx,.ts,.tsx --cache .",
"eslint:check:typed": "eslint --config .eslintrc.typecheck.js --ext .js,.jsx,.ts,.tsx .",
Expand Down
24 changes: 19 additions & 5 deletions scripts/buildutil.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,14 @@ const cli = meow(
$ node buildutil <options>
Options
--check-version-match check for JupyterLab version match
--update-binary-sign-list update binary list to sign for macOS
--platform platform for --update-binary-sign-list. osx-64 or osx-arm64
--check-version-match check for JupyterLab version match
--update-binary-sign-list update binary list to sign for macOS
--copy-extras-to-bundled-env copy extra files from extras to bundled environment installer
--platform platform for --update-binary-sign-list. osx-64 or osx-arm64
Other options:
--help show usage information
--version show version information
--help show usage information
--version show version information
Examples
$ node buildutil --check-version-match
Expand Down Expand Up @@ -182,3 +183,16 @@ if (cli.flags.updateBinarySignList) {

process.exit(0);
}

if (cli.flags.copyExtrasToBundledEnv) {
const envExtrasDir = path.resolve('env_installer', 'extras');
const envInstallerDir = path.resolve('env_installer', 'jlab_server');

fs.copySync(envExtrasDir, envInstallerDir, { recursive: true });

console.log(
`Finished copying from \n\t"${envExtrasDir}" to \n\t"${envInstallerDir}"`
);

process.exit(0);
}

0 comments on commit e620f65

Please sign in to comment.