Skip to content

Commit

Permalink
Merge pull request #465 from afshin/sphinx-changelog
Browse files Browse the repository at this point in the history
Add Changelog to Sphinx Docs
  • Loading branch information
blink1073 committed Apr 1, 2021
2 parents 9d79ef9 + 92ed13d commit a0f98a0
Show file tree
Hide file tree
Showing 7 changed files with 25 additions and 17 deletions.
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -34,3 +34,6 @@ config.rst
/.project
/.pydevproject

# copied changelog file
docs/source/other/changelog.md

3 changes: 2 additions & 1 deletion docs/doc-requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,5 @@ prometheus_client
sphinxcontrib_github_alt
sphinxcontrib-openapi
sphinxemoji
git+https://github.com/pandas-dev/pydata-sphinx-theme.git@master
myst-parser
pydata_sphinx_theme
17 changes: 3 additions & 14 deletions docs/environment.yml
Original file line number Diff line number Diff line change
@@ -1,17 +1,6 @@
name: jupyter_server_docs
dependencies:
- python=3.7
- python=3.8
- pip
- pip:
- sphinx
- jinja2
- tornado
- jupyter_client
- ipykernel
- nbformat
- Send2Trash
- prometheus_client
- sphinxcontrib_github_alt
- sphinxcontrib-openapi
- sphinxemoji
- terminado
- git+https://github.com/pandas-dev/pydata-sphinx-theme.git@master
- -r doc-requirements.txt
13 changes: 13 additions & 0 deletions docs/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,12 @@

import sys
import os
import os.path as osp
import shlex
import shutil

HERE = osp.abspath(osp.dirname(__file__))


# If extensions (or modules to document with autodoc) are in another directory,
# add these directories to sys.path here. If the directory is relative to the
Expand Down Expand Up @@ -63,6 +68,7 @@
# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
# ones.
extensions = [
'myst_parser',
'sphinx.ext.autodoc',
'sphinx.ext.doctest',
'sphinx.ext.intersphinx',
Expand All @@ -74,6 +80,8 @@
'sphinxemoji.sphinxemoji'
]

myst_enable_extensions = ["html_image"]

# Add any paths that contain templates here, relative to this directory.
templates_path = ['_templates']

Expand Down Expand Up @@ -371,3 +379,8 @@

# import before any doc is built, so _ is guaranteed to be injected
import jupyter_server.transutils


def setup(app):
dest = osp.join(HERE, 'other', 'changelog.md')
shutil.copy(osp.join(HERE, '..', '..', 'CHANGELOG.md'), dest)
2 changes: 1 addition & 1 deletion docs/source/developers/contents.rst
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,7 @@ An asynchronous version of the Contents API is available to run slow IO processe

.. note::

.. _contentfree:
.. _asynccontents:

In most cases, the non-asynchronous Contents API is performant for local filesystems.
However, if the Jupyter Notebook web application is interacting with a high-latent virtual filesystem, you may see performance gains by using the asynchronous version.
Expand Down
1 change: 1 addition & 0 deletions docs/source/other/full-config.rst
Original file line number Diff line number Diff line change
Expand Up @@ -1388,3 +1388,4 @@ GatewayClient.ws_url : Unicode

The websocket url of the Kernel or Enterprise Gateway server. If not provided, this value
will correspond to the value of the Gateway url with 'ws' in place of 'http'. (JUPYTER_GATEWAY_WS_URL env var)

3 changes: 2 additions & 1 deletion docs/source/other/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,5 @@ Other helpful documentation

links
faq
full-config
full-config
changelog

0 comments on commit a0f98a0

Please sign in to comment.