Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

DOC: Clean up settings #2660

Merged
merged 8 commits into from
Jan 9, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions docs/environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ channels:
dependencies:
- ipykernel
- jinja2
- jupyter_sphinx
- ipywidgets
- bqplot
- numpy
Expand All @@ -19,5 +18,5 @@ dependencies:
- python-dateutil
- recommonmark
- matplotlib
- bqplot
vidartf marked this conversation as resolved.
Show resolved Hide resolved
- numpy
- ipyleaflet
- pandas
5 changes: 2 additions & 3 deletions docs/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,10 @@ ipywidgets>=7.5.0
bqplot
numpy
jupyter_client
jupyter_sphinx
nbsphinx>=0.2.13
recommonmark
sphinx>=1.4.6
sphinx_rtd_theme
matplotlib
numpy
bqplot
ipyleaflet
pandas
23 changes: 0 additions & 23 deletions docs/source/conf.py
Original file line number Diff line number Diff line change
@@ -1,25 +1,6 @@
#!/usr/bin/env python3
#

import os
import subprocess
import sys


# -- path -------------------------------------------------------

from os.path import dirname
docs = dirname(dirname(__file__))
root = dirname(docs)
sys.path.insert(0, root)


# -- bash utility function --------------------------------------
def bash(filename):
"""Runs a bash script in the local directory"""
sys.stdout.flush()
subprocess.call("bash {}".format(filename), shell=True)


# -- source files and parsers -----------------------------------

Expand All @@ -37,7 +18,6 @@ def bash(filename):
'sphinx.ext.intersphinx',
'sphinx.ext.mathjax',
'nbsphinx',
'jupyter_sphinx.execute',
'IPython.sphinxext.ipython_console_highlighting',
'recommonmark',
]
Expand All @@ -49,10 +29,7 @@ def bash(filename):
'jupyter': ('https://jupyter.readthedocs.io/en/latest/', None),
}

nbsphinx_allow_errors = True # exception ipstruct.py ipython_genutils
nbsphinx_execute = 'always'
# Disable including require.js because it is also included by jupyter_sphinx:
nbsphinx_requirejs_path = ''

# -- General information -------

Expand Down
2 changes: 1 addition & 1 deletion docs/source/developer_docs.rst
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ The Jupyter widgets packages are developed in the `https://github.com/jupyter-wi
Scope of ipywidgets
-------------------

``ipywidgets`` is a framework to provide eventful python objects that have a representation in the browser (see :doc:`examples/Widget Basics.ipynb` for more on the definition of widgets). This requires two components:
``ipywidgets`` is a framework to provide eventful python objects that have a representation in the browser (see :doc:`examples/Widget Basics` for more on the definition of widgets). This requires two components:

1. The framework for widget interactions between the widgets represented in the Python kernel and the (javascript) representation of the widgets in the browser.
2. A basic, lightweight set of form controls that *use* this framework, based on standard HTML form controls. These included controls include a text area, text box, select and multiselect controls, checkbox, etc. A few more advanced controls that are very popular are also included, such as a slider and basic tab panels.
Expand Down
1 change: 1 addition & 0 deletions docs/source/examples/Layout Example.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -310,6 +310,7 @@
"version": "3.7.2"
},
"nbsphinx": {
"execute": "never",
"orphan": true
}
},
Expand Down
6 changes: 5 additions & 1 deletion docs/source/examples/Output Widget.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,11 @@
{
"cell_type": "code",
"execution_count": null,
"metadata": {},
"metadata": {
"tags": [
"raises-exception"
]
vidartf marked this conversation as resolved.
Show resolved Hide resolved
},
"outputs": [],
"source": [
"@out.capture()\n",
Expand Down
6 changes: 3 additions & 3 deletions docs/source/examples/Widget Styling.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@
"source": [
"You can jump directly to these sections:\n",
"\n",
"+ [The `layout` attribute](#The-layout-attribute)\n",
"+ [The layout attribute](#The-layout-attribute)\n",
"+ [The Flexbox layout](#The-Flexbox-layout)\n",
"+ [Predefined styles](#Predefined-styles)\n",
"+ [The `style` attribute](#The-style-attribute)\n",
"+ [The style attribute](#The-style-attribute)\n",
"+ [The Grid layout](#The-Grid-layout)\n",
"+ [`Image` layout and sizing](#Image-layout-and-sizing)"
"+ [Image layout and sizing](#Image-layout-and-sizing)"
]
},
{
Expand Down