diff --git a/CHANGELOG.md b/CHANGELOG.md index fb2a001..56c687b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. ### Fixed - Fix job not ending if forked processes still running. +### Removed +- Removed support for Anaconda Notebook extensions. + ## [1.0.1] - 2018-01-03 ### Changed - Updated date in `LICENSE.txt`. diff --git a/README.md b/README.md index c1eb7f1..48238f0 100644 --- a/README.md +++ b/README.md @@ -19,10 +19,6 @@ OnDemand node): **Optional** software: -- [Anaconda](https://www.continuum.io/anaconda-overview) 4.3.13+ and its - [Jupyter Notebook extensions](https://docs.continuum.io/anaconda/user-guide/tasks/use-jupyter-notebook-extensions) - that allow users to define custom environment-based kernels from within the - Jupyter notebook dashboard. - [Lmod](https://www.tacc.utexas.edu/research-development/tacc-projects/lmod) 6.0.1+ or any other `module purge` and `module load ` based CLI used to load appropriate environments within the batch job before launching diff --git a/form.yml b/form.yml index 6fbf4ea..3aaf67b 100644 --- a/form.yml +++ b/form.yml @@ -27,18 +27,6 @@ attributes: # modules: "python/3.5 cuda/8.0.44" modules: "python" - # Whether Conda extensions will be available within the Jupyter notebook - # server - # - # @note Allows the user to use conda environment-based kernels from their - # Jupyter notebook dashboard - # @example Do NOT allow Conda extensions to be used - # conda_extensions: "0" - # @example Do allow Conda extensions to be used - # conda_extensions: "1" - # @see https://docs.continuum.io/anaconda/user-guide/tasks/use-jupyter-notebook-extensions - conda_extensions: "1" - # Any extra command line arguments to feed to the `jupyter notebook ...` # command that launches the Jupyter notebook within the batch job extra_jupyter_args: "" @@ -54,7 +42,6 @@ attributes: # Dashboard form: - modules - - conda_extensions - extra_jupyter_args - bc_account - bc_queue diff --git a/template/before.sh.erb b/template/before.sh.erb index 8c9a650..6b89042 100755 --- a/template/before.sh.erb +++ b/template/before.sh.erb @@ -54,13 +54,5 @@ c.NotebookApp.open_browser = False c.NotebookApp.allow_origin = '*' c.NotebookApp.notebook_dir = '${HOME}' c.NotebookApp.disable_check_xsrf = True -<%- if context.conda_extensions == "1" -%> -c.NotebookApp.kernel_spec_manager_class = "nb_conda_kernels.CondaKernelSpecManager" -c.NotebookApp.nbserver_extensions = { - "nb_conda": True, - "nb_anacondacloud": True, - "nbpresent": True -} -<%- end -%> EOL )