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.

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

Jump to bottom

DOC/BLD: unpin sphinx to use sphinx 1.7 #19687

Merged
merged 8 commits into from
Feb 26, 2018
Merged

DOC/BLD: unpin sphinx to use sphinx 1.7 #19687

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
031f725
DOC/BLD: unpin sphinx to use sphinx 1.7
jorisvandenbossche Feb 13, 2018
0a6be97
install from conda-forge instead
jorisvandenbossche Feb 18, 2018
b6d0eae
Merge remote-tracking branch 'upstream/master' into doc-sphinx-1.7
jorisvandenbossche Feb 18, 2018
9550bbd
remove unused Directive import
jorisvandenbossche Feb 18, 2018
b06990e
fix sphinx import in ipython sphinxext
jorisvandenbossche Feb 18, 2018
cb1ae20
remove sphinx pin in requirements_dev.txt
jorisvandenbossche Feb 18, 2018
482e31d
undo getting sphinx from conda-forge
jorisvandenbossche Feb 25, 2018
56770e4
Merge remote-tracking branch 'upstream/master' into doc-sphinx-1.7
jorisvandenbossche Feb 25, 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-3.6_DOC.run
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
ipython
ipykernel
ipywidgets
sphinx=1.5*
sphinx
nbconvert
nbformat
notebook
Expand Down
2 changes: 1 addition & 1 deletion ci/requirements_dev.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ pytest>=3.1
python-dateutil>=2.5.0
pytz
setuptools>=3.3
sphinx=1.5*
sphinx
1 change: 0 additions & 1 deletion doc/sphinxext/numpydoc/numpydoc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
raise RuntimeError("Sphinx 1.0.1 or newer is required")

from .docscrape_sphinx import get_doc_object, SphinxDocString
from sphinx.util.compat import Directive

if sys.version_info[0] >= 3:
sixu = lambda s: s
Expand Down