Skip to content

DOC: removed vendored IPython.sphinxext - take 2 #19657

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.

Sign up for GitHub

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

Merged
merged 3 commits into from
Apr 23, 2018
Merged

DOC: removed vendored IPython.sphinxext - take 2 #19657

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
137fb8c
Revert "Revert "DOC: Remove vendored IPython.sphinext (#18193)" (#183…
jorisvandenbossche Feb 12, 2018
5d1e4c1
Merge remote-tracking branch 'upstream/master' into remove-ipython
jorisvandenbossche Apr 9, 2018
8ec7f4b
minimum ipython version
jorisvandenbossche Apr 23, 2018
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
2 changes: 1 addition & 1 deletion ci/requirements-optional-conda.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ bottleneck
fastparquet
feather-format
html5lib
ipython
ipython>=5.6.0
ipykernel
jinja2
lxml
Expand Down
2 changes: 1 addition & 1 deletion ci/requirements-optional-pip.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ bottleneck
fastparquet
feather-format
html5lib
ipython
ipython>=5.6.0
ipykernel
jinja2
lxml
Expand Down
4 changes: 1 addition & 3 deletions doc/source/conf.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,7 @@
'sphinx.ext.extlinks',
'sphinx.ext.todo',
'numpydoc',
'ipython_sphinxext.ipython_directive',
'ipython_sphinxext.ipython_console_highlighting',
# lowercase didn't work
'IPython.sphinxext.ipython_directive',
'IPython.sphinxext.ipython_console_highlighting',
'matplotlib.sphinxext.plot_directive',
'sphinx.ext.intersphinx',
Expand Down
Empty file removed doc/sphinxext/ipython_sphinxext/__init__.py
View file
Open in desktop
Empty file.
28 changes: 0 additions & 28 deletions doc/sphinxext/ipython_sphinxext/ipython_console_highlighting.py
View file
Open in desktop

This file was deleted.

Loading