Skip to content

Commit

Permalink
Merge pull request #869 from consideRatio/pr/remove-nteract
Browse files Browse the repository at this point in the history
breaking, maint: remove deprecated nteract-on-jupyter
  • Loading branch information
yuvipanda committed Apr 10, 2023
2 parents 7fd97ad + 9e1bc61 commit ff276d1
Show file tree
Hide file tree
Showing 7 changed files with 4 additions and 16 deletions.
2 changes: 1 addition & 1 deletion docs/contributing/docs.md
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ documentation:
capitalized except when used in code / the commandline.
- **Python** -- when referring to the language, capitalize Python.
- **Notebook Interface** -- generic term for referring to JupyterLab,
nteract, classic notebook & other user interfaces for accessing
classic notebook & other user interfaces for accessing.

## Guidelines for markdown files

Expand Down
2 changes: 1 addition & 1 deletion docs/contributing/packages.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ TLJH sets up two python environments during installation.
primarily since conda does not support ARM CPUs and we'd like to support the
RaspberryPI someday. Admins generally do not install custom packages
in this environment.
2. **User Environment**. Jupyter Notebook, JupyterLab, nteract, kernels,
2. **User Environment**. Jupyter Notebook, JupyterLab, kernels,
and packages the users wanna use (such as numpy, scipy, etc) are installed
here. A [conda](https://conda.io) environment is used here, since
a lot of scientific packages are available from Conda. `pip` is still
Expand Down
4 changes: 2 additions & 2 deletions docs/topic/tljh-config.md
Original file line number Diff line number Diff line change
Expand Up @@ -138,8 +138,8 @@ sudo tljh-config reload proxy

### User Environment

`user_environment.default_app` Set default application users are
launched into. Currently this can only be set to: `jupyterlab`
`user_environment.default_app` Set default application users are launched into.
Currently this can only be set to: `classic` and `jupyterlab`.

```bash
sudo tljh-config set user_environment.default_app jupyterlab
Expand Down
1 change: 0 additions & 1 deletion integration-tests/test_extensions.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ def test_serverextensions():
extensions = [
"jupyterlab 3.",
"nbgitpuller 1.",
"nteract_on_jupyter 2.1.",
"jupyter_resource_usage",
]

Expand Down
8 changes: 0 additions & 8 deletions tests/test_configurer.py
Original file line number Diff line number Diff line change
Expand Up @@ -69,14 +69,6 @@ def test_app_jupyterlab():
assert c.Spawner.default_url == "/lab"


def test_app_nteract():
"""
Test setting nteract as default application
"""
c = apply_mock_config({"user_environment": {"default_app": "nteract"}})
assert c.Spawner.default_url == "/nteract"


def test_auth_default():
"""
Test default authentication settings with no overrides
Expand Down
2 changes: 0 additions & 2 deletions tljh/configurer.py
Original file line number Diff line number Diff line change
Expand Up @@ -228,8 +228,6 @@ def update_user_environment(c, config):
# Set default application users are launched into
if user_env["default_app"] == "jupyterlab":
c.Spawner.default_url = "/lab"
elif user_env["default_app"] == "nteract":
c.Spawner.default_url = "/nteract"


def update_user_account_config(c, config):
Expand Down
1 change: 0 additions & 1 deletion tljh/requirements-base.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ jupyterhub==3.*
notebook==6.*
# Install additional notebook frontends!
jupyterlab==3.*
nteract-on-jupyter==2.*
# nbgitpuller for easily pulling in Git repositories
nbgitpuller==1.*
# jupyter-resource-usage to show people how much RAM they are using
Expand Down

0 comments on commit ff276d1

Please sign in to comment.