Skip to content

Commit 137fb8c

Browse files
Revert "Revert "DOC: Remove vendored IPython.sphinext (pandas-dev#18193)" (pandas-dev#18320)"
This reverts commit d6049a0.
1 parent 7a5634e commit 137fb8c

File tree

6 files changed

+6
-1214
lines changed

6 files changed

+6
-1214
lines changed

.gitignore

+1-1
Original file line numberDiff line numberDiff line change
@@ -107,4 +107,4 @@ doc/build/html/index.html
107107
doc/tmp.sv
108108
doc/source/styled.xlsx
109109
doc/source/templates/
110-
env/
110+
doc/source/savefig/

doc/source/conf.py

+2-3
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,8 @@
5656
'sphinx.ext.extlinks',
5757
'sphinx.ext.todo',
5858
'numpydoc',
59-
'ipython_sphinxext.ipython_directive',
60-
'ipython_sphinxext.ipython_console_highlighting',
61-
'IPython.sphinxext.ipython_console_highlighting', # lowercase didn't work
59+
'IPython.sphinxext.ipython_directive',
60+
'IPython.sphinxext.ipython_console_highlighting',
6261
'sphinx.ext.intersphinx',
6362
'sphinx.ext.coverage',
6463
'sphinx.ext.mathjax',

doc/source/whatsnew/v0.7.3.txt

+3-3
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ New features
2222
from pandas.tools.plotting import scatter_matrix
2323
scatter_matrix(df, alpha=0.2)
2424

25-
.. image:: _static/scatter_matrix_kde.png
25+
.. image:: savefig/scatter_matrix_kde.png
2626
:width: 5in
2727

2828
- Add ``stacked`` argument to Series and DataFrame's ``plot`` method for
@@ -32,14 +32,14 @@ New features
3232

3333
df.plot(kind='bar', stacked=True)
3434

35-
.. image:: _static/bar_plot_stacked_ex.png
35+
.. image:: savefig/bar_plot_stacked_ex.png
3636
:width: 4in
3737

3838
.. code-block:: python
3939

4040
df.plot(kind='barh', stacked=True)
4141

42-
.. image:: _static/barh_plot_stacked_ex.png
42+
.. image:: savefig/barh_plot_stacked_ex.png
4343
:width: 4in
4444

4545
- Add log x and y :ref:`scaling options <visualization.basic>` to

doc/sphinxext/ipython_sphinxext/__init__.py

Whitespace-only changes.

doc/sphinxext/ipython_sphinxext/ipython_console_highlighting.py

-116
This file was deleted.

0 commit comments

Comments
 (0)