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: pin sphinx to 1.8.5 #26781

Merged
merged 4 commits into from
Jun 12, 2019

Conversation

jorisvandenbossche
Copy link
Member

xref #26058

@jreback jreback added the Docs label Jun 11, 2019
@jorisvandenbossche
Copy link
Member Author

Context for doing this would be the styling changes introduced in sphinx 2, for which we should first update our custom css (described in #26058)

@jorisvandenbossche
Copy link
Member Author

cc @datapythonista @TomAugspurger

If we would release right now, I would build the docs with sphinx 1.8.5 for the release.
Given that, the question is then: do we want to use 1.8.5 in the travis build as well, to make sure everything is working with that release (to match our release process), or do we rather already want to build with the newest possible sphinx to also catch possible new errors with newer sphinx? (both have value IMO)

@TomAugspurger
Copy link
Contributor

I think pin to 1.8.5 for now.

@jreback
Copy link
Contributor

jreback commented Jun 12, 2019

Agreed pinning is fine (i think we have pinned sphinx in the past frequently)

Copy link
Member

@datapythonista datapythonista left a comment

Choose a reason for hiding this comment

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

+1 on pinning

I'd probably migrate to sphinx 2 when we change the theme. And surely after we fail the CI on doc warnings.

But can you also pin the version in environment.yml please, so we build the docs locally with the same version as travis.

Copy link
Member

@datapythonista datapythonista left a comment

Choose a reason for hiding this comment

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

and may be update the comment on pinning to why we're using 1.8.5, and duplicate it in environment.yml too (I'll propose getting rid of this deps file again soon).

@jorisvandenbossche
Copy link
Member Author

Updated

@codecov
Copy link

codecov bot commented Jun 12, 2019

Codecov Report

Merging #26781 into master will decrease coverage by <.01%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff             @@
##           master   #26781      +/-   ##
==========================================
- Coverage   91.72%   91.72%   -0.01%     
==========================================
  Files         178      178              
  Lines       50779    50779              
==========================================
- Hits        46579    46575       -4     
- Misses       4200     4204       +4
Flag Coverage Δ
#multiple 90.31% <ø> (ø) ⬆️
#single 41.21% <ø> (-0.06%) ⬇️
Impacted Files Coverage Δ
pandas/io/gbq.py 78.94% <0%> (-10.53%) ⬇️
pandas/core/frame.py 96.88% <0%> (-0.12%) ⬇️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update ea06f8d...124504f. Read the comment docs.

@codecov
Copy link

codecov bot commented Jun 12, 2019

Codecov Report

Merging #26781 into master will increase coverage by 0.03%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff             @@
##           master   #26781      +/-   ##
==========================================
+ Coverage   91.72%   91.76%   +0.03%     
==========================================
  Files         178      178              
  Lines       50779    50751      -28     
==========================================
- Hits        46579    46570       -9     
+ Misses       4200     4181      -19
Flag Coverage Δ
#multiple 90.35% <ø> (+0.03%) ⬆️
#single 41.22% <ø> (-0.05%) ⬇️
Impacted Files Coverage Δ
pandas/io/gbq.py 78.94% <0%> (-10.53%) ⬇️
pandas/core/frame.py 96.88% <0%> (-0.12%) ⬇️
pandas/plotting/_matplotlib/tools.py 78.4% <0%> (ø) ⬆️
pandas/core/generic.py 94.1% <0%> (ø) ⬆️
pandas/plotting/_matplotlib/style.py 85.96% <0%> (ø) ⬆️
pandas/plotting/_matplotlib/timeseries.py 66.32% <0%> (ø) ⬆️
pandas/core/internals/blocks.py 94.38% <0%> (+0.25%) ⬆️
pandas/plotting/_matplotlib/boxplot.py 75.59% <0%> (+0.48%) ⬆️
pandas/plotting/_matplotlib/misc.py 38.93% <0%> (+0.9%) ⬆️
pandas/core/internals/managers.py 95.21% <0%> (+1.34%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update ea06f8d...d79c80d. Read the comment docs.

Copy link
Member

@datapythonista datapythonista left a comment

Choose a reason for hiding this comment

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

lgtm, thanks

@phamvantuong
Copy link

phamvantuong commented Jun 12, 2019 via email

# 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

@datapythonista datapythonista merged commit 487e4c2 into pandas-dev:master Jun 12, 2019
@datapythonista
Copy link
Member

thanks @jorisvandenbossche

@jorisvandenbossche jorisvandenbossche deleted the pin-sphinx branch October 6, 2019 07:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants