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

Update to use napari-sphinx-theme 0.3.0 #267

Merged
merged 20 commits into from
Jan 18, 2024
Merged

Conversation

melissawm
Copy link
Member

@melissawm melissawm commented Nov 7, 2023

Prepares the docs repo to use the new napari-sphinx-theme, 0.3.0, which depends on pydata-sphinx-theme rather than forking it.

References and relevant issues

Addresses napari/napari-sphinx-theme#113
Depends on napari/napari-sphinx-theme#134

@psobolewskiPhD
Copy link
Member

This will also require the constraints -- which are in napari/napari -- to get updated once the new theme is released.

@Czaki
Copy link
Contributor

Czaki commented Nov 8, 2023

Is the new theme is incompatible with the old one and could break 0.4.19 build docs process?

@jni
Copy link
Member

jni commented Nov 8, 2023

@Czaki is the theme not part of the constraints?

@Czaki
Copy link
Contributor

Czaki commented Nov 8, 2023

@Czaki is the theme not part of the constraints?

Is. but we do not have upper constraints at this moment. So I would like to know if I should add it in the 0.4.19 branch.

@jni
Copy link
Member

jni commented Nov 8, 2023

Is. but we do not have upper constraints at this moment. So I would like to know if I should add it in the 0.4.19 branch.

I thought constraints were pins? That's what I was asking anyway.

Maybe this PR could get backported? It seems unobtrusive enough... Can't wait to have the new theme! But up to you. We can wait to release the theme until after 0.4.19.

@Czaki
Copy link
Contributor

Czaki commented Nov 8, 2023

I thought constraints were pins? That's what I was asking anyway.

Maybe this PR could get backported? It seems unobtrusive enough... Can't wait to have the new theme! But up to you. We can wait to release the theme until after 0.4.19.

I have a plan to refresh constraints before release 0.4.19. If a new theme is released earlier such a refresh will bring it in constraints.

@psobolewskiPhD
Copy link
Member

This was discussed at the docs working group meeting today. The consensus was to wait until after 0.4.19 release, with the goal of the next release being 0.5.0 and using the split repo setup rather than cherry picking and getting a fresh look!

@psobolewskiPhD psobolewskiPhD added this to the 0.5.0 milestone Nov 9, 2023
@psobolewskiPhD psobolewskiPhD added the enhancement New feature or request label Nov 9, 2023
@melissawm
Copy link
Member Author

This is rebased and should be ready to go along with napari/napari-sphinx-theme#134

@jni
Copy link
Member

jni commented Dec 29, 2023

@melissawm the CI disagrees... 😅 Perhaps you can point it to your branch for now, with a comment that it needs to be updated to depend on napari-sphinx-theme directly once that branch is released?

@melissawm
Copy link
Member Author

Yeah I was assuming this would only go in after the theme was updated, but I can do this for the preview.

@melissawm melissawm force-pushed the napari-theme-var branch 2 times, most recently from ee81cda to aef185e Compare December 29, 2023 14:13
@github-actions github-actions bot added the task label Dec 29, 2023
@melissawm
Copy link
Member Author

melissawm commented Dec 29, 2023

Ok it looks like it's alive - you can see it here https://output.circle-artifacts.com/output/job/c9c574d3-71c6-434f-b5ab-85bdb7ff68c3/artifacts/0/docs/docs/_build/index.html?pr=267 🥳

(note the calendar events are not showing up since we don't use the calendar API key in the circleci set up - I can fix that in a separate commit. The deploy does have the correct env variable set up though.)

@melissawm
Copy link
Member Author

Ok, here's a new attempt! This time I decided to try my hand at javascript (just a little 😅 )

How does that look? https://melissawm.github.io/napari-theme-var/community/meeting_schedule.html

@psobolewskiPhD
Copy link
Member

Looks awesome to me!
And I love that the links just work!
🎉

@psobolewskiPhD
Copy link
Member

psobolewskiPhD commented Jan 16, 2024

It's a bit annoying the docs pip constraints are in the other repo.
I think we will need to:

  1. merge the theme pr
  2. merge this pr
  3. checkout main napari, install pip-tools run:
    pip-compile --allow-unsafe --extra=optional --extra=pyqt5 --extra=pyqt6_experimental --extra=pyside2 --extra=pyside6_experimental --extra=testing --extra=testing_extra --output-file=napari_repo/resources/constraints/constraints_py3.10_docs.txt --strip-extras docs/requirements.txt napari_repo/resources/constraints/pydantic_le_2.txt napari_repo/resources/constraints/version_denylist.txt napari_repo/setup.cfg resources/constraints/version_denylist_examples.txt
    and make a PR to napari/napari with that constraints file.
    Is that correct @Czaki ?

Edit: except that napari_repo and docs need to be the proper names of the local repos.

jni pushed a commit to napari/napari-sphinx-theme that referenced this pull request Jan 16, 2024
…#134)

Refactors colors, styling and fonts from napari-sphinx-theme. Also removes extra react components that are not needed for the napari theme.

Includes the community calendar feature, but calendar is now managed on the docs side.

To see how this would look like, you can fetch this PR and build the docs locally (after fetching napari/docs#267), or you can see the deployed site here: melissawm.github.io/napari-theme-var

# Important

After merging, this will also require a new release of the napari-sphinx-theme.

Closes #113

See also napari/docs#267

# List of commits

* Full refactor of napari-sphinx-theme to depend on pydata-sphinx-theme
* Addressing review comments
* Clean up previous theme configs
* Move napari logo to partials
* Update README
* Fix accent color for search box
* Set version number
* Pin pydata-sphinx-theme version and fix calendar event display
requirements.txt Outdated Show resolved Hide resolved
@melissawm
Copy link
Member Author

Please squash before merging 😄

@psobolewskiPhD
Copy link
Member

Alas, I can't get the pip-tools thing to work (testing on current stuff) because I'm on arm64 and there are missing wheels (triangle, pyside2, maybe more). I guess it should be run under linux, like CI?
I don't have a VM handy at the moment.

@psobolewskiPhD
Copy link
Member

Oh and we need a release of the theme!

@melissawm
Copy link
Member Author

@jni has cut a 0.3.0 release of the theme so we're good there 🎉 @psobolewskiPhD I'm on linux so if you point me to the instructions I might be able to update the constraints, let me know!

@jni
Copy link
Member

jni commented Jan 17, 2024

Correction: @jni attempted to push a 0.3.0 release, but the workflow failed. 😂 See https://pypi.org/project/napari-sphinx-theme/ and napari/napari-sphinx-theme#135.

jni pushed a commit to napari/napari that referenced this pull request Jan 17, 2024
# References and relevant issues
Related to napari/napari-sphinx-theme#134,
napari/docs#267

# Description
Updates docs constraints file for the new napari-sphinx-theme release.
@jni jni changed the title Update to use the new napari-sphinx-theme Update to use napari-sphinx-theme 0.3.0 Jan 18, 2024
@jni jni merged commit 9855a4d into napari:main Jan 18, 2024
6 checks passed
@jni
Copy link
Member

jni commented Jan 18, 2024

For anyone coming across this and related PRs, sorry about the fast merges, but @melissawm, @psobolewskiPhD, and I happened to coincide sync and we worked together on merging all of these in sequence, forgoing protocol, since they all depend on each other and merging some but not others could result in broken builds and other inconsistencies. The related PRs are:

You can relive all the action in the docs-wg thread on Zulip! We now resume our regularly scheduled programming. But check out the new docs! 😍 https://napari.org/dev (new on left, old on right)

image

@Czaki Czaki modified the milestones: 0.5.0, 0.4.19 Jan 21, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
documentation Improvements or additions to documentation enhancement New feature or request task
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants