Skip to content

ENH/DOC: pydata sphinx theme polishing#13814

Merged
larsoner merged 17 commits intoscipy:masterfrom
tupui:theme_design
Apr 26, 2021
Merged

ENH/DOC: pydata sphinx theme polishing#13814
larsoner merged 17 commits intoscipy:masterfrom
tupui:theme_design

Conversation

@tupui
Copy link
Copy Markdown
Member

@tupui tupui commented Apr 6, 2021

This is a follow up PR for #13724.

It Address the last comments from reviews and is a starting point for further improvement. Please propose any improvements here (or do a PR on my branch).

Things to check/do:

  • Icons: NumFOCUS, Tidelift, twitter? Should be on the organization website, not here.
  • Polish the landing page
  • Polish Getting started
  • Google analytics?
  • PDF/zip download links needed? -> link to https://docs.scipy.org/doc/
  • General organization
  • Deployment of the doc: verify CI, scipyorg, make, etc. -> seems ok, devdoc is live
  • Developer instructions

Comment thread doc/source/index.rst Outdated
@justbennet
Copy link
Copy Markdown

If possible, I suggest that the graphical icons be active links to the documentation as well as the 'To the documentation' text in the grey boxes. I believe most people would expect that behavior.

@mdhaber
Copy link
Copy Markdown
Contributor

mdhaber commented Apr 7, 2021

There has been some discussion of analytics at scipy/scipy.org#338.

@tupui
Copy link
Copy Markdown
Member Author

tupui commented Apr 7, 2021

There has been some discussion of analytics at scipy/scipy.org#338.

Thanks. Looking at it, there is still no decision. I just saw there are using google analytics in Pandas, hence my question.

@mdhaber
Copy link
Copy Markdown
Contributor

mdhaber commented Apr 7, 2021

Right, it's still a good question! There were some useful suggestions there, though, e.g. to use something other than Google analytics. Great for the discussion to continue; just thought it's best to see what has been said in the past.

@tupui
Copy link
Copy Markdown
Member Author

tupui commented Apr 7, 2021

@justbennet I added the clickable icons. The solution is not that fancy, I guess it's fine.

@tupui tupui mentioned this pull request Apr 8, 2021
@tupui
Copy link
Copy Markdown
Member Author

tupui commented Apr 8, 2021

@jorisvandenbossche proposed to use sphinx-panels instead of the raw html. They are going with it in Pandas. Seems like the good choice here. I will update the PR with the suggestions he made.

@tupui
Copy link
Copy Markdown
Member Author

tupui commented Apr 8, 2021

We are again seeing some timeout in the CI. It's getting concerning.

Maybe we could do some caching of the builds? We could cache master and then all build times should be way faster. Or would this be problematic?

@tupui tupui requested a review from larsoner as a code owner April 12, 2021 07:52
@larsoner
Copy link
Copy Markdown
Member

Looks like there is a conflict. Feel free to ping me for a review when this is ready

@tupui tupui force-pushed the theme_design branch 2 times, most recently from 7400cba to 397d66f Compare April 12, 2021 15:12
@tupui
Copy link
Copy Markdown
Member Author

tupui commented Apr 12, 2021

Looks like there is a conflict. Feel free to ping me for a review when this is ready

Sorry I did not intentionally ping you (CODEOWNER thing got triggered). But I would still be happy to have your review 😃 . I don't think we are done here, we can continue to tweak things.

Current CI fails due to a scheduled maintenance from bintray: https://status.bintray.com/ (cc @rgommers in case)

@larsoner
Copy link
Copy Markdown
Member

Sorry I did not intentionally ping you (CODEOWNER thing got triggered).

No problem, it was actually clear from the GitHub email that it was due to CODEOWNER and not you -- I just wanted to chime in to say that I'm happy to review when it's time!

@tupui
Copy link
Copy Markdown
Member Author

tupui commented Apr 13, 2021

Apparently it fails in Latex. I still don't know why. @jorisvandenbossche how did you solve this in Pandas? Is it because you use pdflatex and not latexmk? Apparently it is due to having the images in svg because in png it seems fine. This just started to appear with using the sphinx-panels extension (normal as before it was included as html I suppose).

@ilayn
Copy link
Copy Markdown
Member

ilayn commented Apr 15, 2021

latexmk wants to run pdflatex twice but somehow something kicks off an xetex run with very old packages. Once I tried to fix that TeX run but always got lost or lost interest probably we have to get to the bottom of it as it is a massive part of doc builds (not so useful either imho).

@tupui
Copy link
Copy Markdown
Member Author

tupui commented Apr 15, 2021

latexmk wants to run pdflatex twice but somehow something kicks off an xetex run with very old packages. Once I tried to fix that TeX run but always got lost or lost interest probably we have to get to the bottom of it as it is a massive part of doc builds (not so useful either imho).

I am not a user of the PDF doc either. Would be interesting to have some statistics to know if this is really used...

As for now, I can fix the issue by using png images instead of svg if there is no obvious way.

@tupui
Copy link
Copy Markdown
Member Author

tupui commented Apr 20, 2021

Just seeing this now. mstats and qmc are doubled in the API's section's sidebar.

@tupui
Copy link
Copy Markdown
Member Author

tupui commented Apr 21, 2021

The issue is fixed and to try I set maxdepth=1 in the sidebar. Let me know what you think. This is making the html files smaller as intended.

@larsoner
Copy link
Copy Markdown
Member

CircleCI is not happy:

./scipy-ref.tex:155: Unable to load picture or PDF file 'index_getting_started.

@tupui
Copy link
Copy Markdown
Member Author

tupui commented Apr 21, 2021

CircleCI is not happy:

./scipy-ref.tex:155: Unable to load picture or PDF file 'index_getting_started.

Thanks for reminding me! I will convert the svg to png (I tested this locally and it fixes the issue).

@tupui
Copy link
Copy Markdown
Member Author

tupui commented Apr 21, 2021

@larsoner now green 🥳 , but the images are stretched, have to tweak something here.

Copy link
Copy Markdown
Member

@larsoner larsoner left a comment

Choose a reason for hiding this comment

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

Otherwise LGTM. Did you want to take care of other items at the top that aren't checked off yet, or should we merge this once the button is fixed?

Comment thread doc/source/getting_started.rst
@tupui
Copy link
Copy Markdown
Member Author

tupui commented Apr 21, 2021

Otherwise LGTM. Did you want to take care of other items at the top that aren't checked off yet, or should we merge this once the button is fixed?

Thanks for reviewing @larsoner. As for the other items, I just listed things I could think about, but I am not sure I am in the best position to propose more than what I did (the quick start guide for instance, not sure if this is enough or if we would want something different. Same for the sidebar, is this what we want in the end?), also my design skills are poor to say the least 😅. I hoped to catch a bit more maintainers here to work on this collectively.

Comment thread doc/source/_templates/sidebar-nav-bs.html Outdated
Comment thread doc/source/_static/scipy.css
Comment thread doc/source/_static/scipy.css
Comment thread doc/source/_templates/sidebar-nav-bs.html
Comment thread doc/source/_templates/sidebar-nav-bs.html Outdated
<div class="bd-toc-item active">
{% if pagename.startswith("reference") %}
{{ generate_nav_html("sidebar", maxdepth=4, collapse=True, includehidden=True, titles_only=True) }}
{{ generate_nav_html("sidebar", maxdepth=2, collapse=True, includehidden=True, titles_only=True) }}
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Suggested change
{{ generate_nav_html("sidebar", maxdepth=2, collapse=True, includehidden=True, titles_only=True) }}
{{ generate_nav_html("sidebar", maxdepth=1, collapse=True, includehidden=True, titles_only=True) }}

My previous comment was mainly about the user guide, I think you could keep it here at a maxdepth of 1 in the reference guide, because it's mainly here that you get such huge sidebars because of all individual docstring pages getting included.

Co-authored-by: Joris Van den Bossche <jorisvandenbossche@gmail.com>
Copy link
Copy Markdown
Member

@larsoner larsoner left a comment

Choose a reason for hiding this comment

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

LGTM +1 for merge

@jorisvandenbossche any other thoughts or comments?

If nobody else has comments I'll try to remember to merge on Monday.

@larsoner larsoner merged commit be4c5ff into scipy:master Apr 26, 2021
@larsoner
Copy link
Copy Markdown
Member

Thanks @tupui !

@tupui tupui deleted the theme_design branch April 26, 2021 13:19
@tylerjereddy tylerjereddy added this to the 1.7.0 milestone Apr 27, 2021
patnr added a commit to patnr/scipy that referenced this pull request May 3, 2021
* master: (164 commits)
  DOC: Add Karl Pearson's reference to chi-square test (scipy#13971)
  BLD: fix build warnings for causal/anticausal pointers in ndimage
  MAINT: stats: Fix unused imports and a few other issues related to imports.
  DOC: fix typo
  MAINT: Remove duplicate calculations in sokalmichener
  BUG: spatial: fix weight handling of `distance.sokalmichener`.
  DOC: update Readme (scipy#13910)
  MAINT: QMCEngine d input validation (scipy#13940)
  MAINT: forward port 1.6.3 relnotes
  REL: add PEP 621 (project metadata in pyproject.toml) support
  EHN: signal: make `get_window` supports `general_cosine` and `general_hamming` window functions. (scipy#13934)
  ENH/DOC: pydata sphinx theme polishing (scipy#13814)
  DOC/MAINT: Add copyright notice to qmc.primes_from_2_to (scipy#13927)
  BUG: DOC: signal: fix need argument config and add missing doc link for `signal.get_window`
  DOC: fix subsets docstring (scipy#13926)
  BUG: signal: fix get_window argument handling and add tests. (scipy#13879)
  ENH: stats: add 'alternative' parameter to ansari (scipy#13650)
  BUG: Reactivate conda environment in init
  MAINT: use dict built-in rather than OrderedDict
  Revert "CI: Add nightly release of NumPy in linux workflows (scipy#13876)" (scipy#13909)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

8 participants