Merge pull request #257 from openscm/remove-jupytext-server-dep

Remove jupytext server dependency

.readthedocs.yml

@@ -17,6 +17,7 @@ python:
       path: .
       extra_requirements:
         - docs
+        - plotting
 
 # Build documentation in the docs/ directory with Sphinx
 sphinx:

CHANGELOG.rst

@@ -4,6 +4,7 @@ Changelog
 master
 ------
 
+- (`#257 <https://github.com/openscm/scmdata/pull/257>`_) Updated to support the latest version of :mod:`notebook`
 - (`#252 <https://github.com/openscm/scmdata/pull/252>`_) Add ``py.typed`` file do downstream packages can use the provided type-hints. Improved the coverage of the type-hints in ``run.py``
 - (`#255 <https://github.com/openscm/scmdata/pull/255>`_) Unpin upper limit of the version of numpy
 - (`#248 <https://github.com/openscm/scmdata/pull/248>`_) Correctly filter the time index of empty ScmRuns. Resolves #245

Makefile

@@ -83,7 +83,9 @@ $(VENV_DIR): setup.py setup.cfg
 
 	$(VENV_DIR)/bin/pip install --upgrade pip wheel
 	$(VENV_DIR)/bin/pip install -e .[dev]
-	$(VENV_DIR)/bin/jupyter nbextension enable --py widgetsnbextension
+
+	# Set jupytext as the default viewer when opening notebooks
+	$(VENV_DIR)/bin/jupytext-config set-default-viewer
 
 	touch $(VENV_DIR)
 

docs/source/notebooks/README.md

@@ -0,0 +1,11 @@
+# Notebooks
+
+This directory contains notebooks of examples for how to use `scmdata`.
+
+## Jupytext
+
+We use [Jupytext](https://github.com/mwouts/jupytext) to encode the notebooks as standard .py files. This makes
+it easier to version control notebooks as you get a clear, meaningful diffs. Jupytext also enables these notebooks
+to be edited via Jupyter Lab or Jupyter Notebook. 
+
+As part of the CI, these notebooks are run and checked for any errors.

setup.cfg

@@ -68,9 +68,7 @@ plotting =
 notebooks =
      %(plotting)s
      %(optional)s
-     notebook
-     # See https://github.com/jupyter/notebook/issues/5492
-     jupyter-server<2
+     notebook>=7
      ipywidgets
 
 tests =