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

DOC: pin sphinx to 1.8.5 #26781

Merged
merged 4 commits into from
Jun 12, 2019
Merged

DOC: pin sphinx to 1.8.5 #26781

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7183ad1
DOC: pin sphinx to 1.8.5
jorisvandenbossche Jun 11, 2019
124504f
update pin in environment.yml + comment
jorisvandenbossche Jun 12, 2019
aa6d583
use single = and generate requirements.txt
jorisvandenbossche Jun 12, 2019
d79c80d
single =
jorisvandenbossche Jun 12, 2019
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
4 changes: 2 additions & 2 deletions ci/deps/travis-36-doc.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ dependencies:
- pytz
- scipy
- seaborn
# recursion error with sphinx 2.1.0. https://github.com/pandas-dev/pandas/issues/26723
- sphinx==2.0.1
# some styling is broken with sphinx >= 2 (https://github.com/pandas-dev/pandas/issues/26058)
- sphinx==1.8.5
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In conda files the version is specified with just one equal (== is for pip, a bit confusing)

You'll also have to call ./scripts/generate_pip_deps_from_conda.py to update requirements_dev.txt, which is synched from environment.yml

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, thanks!

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you also need to remove one equal here, other than that looks good

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just wondering: does it actually matter? (it was with double equals before as well)

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

not sure, but we've got a function to convert them from one to two when synching, if we can have two may be better to leave two everywhere and simplify the synching

- sqlalchemy
- statsmodels
- xarray
Expand Down
3 changes: 2 additions & 1 deletion environment.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,8 @@ dependencies:

# documentation
- gitpython # obtain contributors from git for whatsnew
- sphinx
# some styling is broken with sphinx >= 2 (https://github.com/pandas-dev/pandas/issues/26058)
- sphinx==1.8.5
- numpydoc>=0.9.0

# documentation (jupyter notebooks)
Expand Down