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 Documenter 0.27.23 => 1.2.1 #47105

Merged
merged 43 commits into from
Dec 5, 2023
Merged

Conversation

mortenpi
Copy link
Contributor

@mortenpi mortenpi commented Oct 8, 2022

Currently mainly to test a few things on CI here, but will update this to an actual PR once 0.28.0 is out.

@kshyatt kshyatt added the docsystem The documentation building system label Oct 9, 2022
@mortenpi mortenpi changed the title WIP: Use Documenter 0.28 (-dev for now) Use Documenter 1.0.0 Sep 15, 2023
@mortenpi
Copy link
Contributor Author

mortenpi commented Sep 15, 2023

This should be good to go, except that #51328 should get merged first.

Other than just bringing the various Documenter improvements, one big thing here is that it will fix the source URLs of the standard libraries.

@mortenpi mortenpi marked this pull request as ready for review September 15, 2023 12:24
fredrikekre pushed a commit that referenced this pull request Sep 15, 2023
A couple small fixes and cosmetic improvements to the Unicode table in
the docs:

* Most importantly, makes sure that the resulting object from the
at-eval block is `Markdown.MD`, which which will be necessary for
Documenter 1.0 (#47105). It also fixes the `Markdown.Table` structure --
each of the cells should be an array, not just a string, so it adds one
more layer of nesting.
* Cosmetically, center-aligns the characters, and wraps the latex
commands in `<code>`
@mortenpi mortenpi closed this Sep 15, 2023
@mortenpi mortenpi reopened this Sep 15, 2023
Copy link
Member

@LilithHafner LilithHafner left a comment

Choose a reason for hiding this comment

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

CI is green; can we merge?

A few minor comments aside, the diff here LGTM. Unless you think that merging this will cause significant issues missed by CI, let's do this!

doc/make.jl Show resolved Hide resolved
doc/make.jl Show resolved Hide resolved
doc/make.jl Outdated Show resolved Hide resolved
doc/make.jl Show resolved Hide resolved
doc/make.jl Outdated
)
end

@info read(`$(Sys.which("git")) --version`, String)
Copy link
Member

Choose a reason for hiding this comment

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

I see you added a dep on LibGit2 for LibGit2.GITHUB_REGEX here and Documenter.jl also depends on LibGit2. Is this info statement because Documentor also uses git via shelling out? If not it may be misleading. (somewhat related: JuliaLang/Pkg.jl#2679)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

This is just a debug print and I'll remove this. Generally, I need to do a pass on this PR before we merge, to clean it all up.

The issue I ran into here was that Git on the Windows runners is ancient (and I was trying to figure out what version it is exactly). But I resolved that by switching Documenter to Git.jl (which is the better than relying on the system's git binary anyway).

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Just a note here though: kinda silly to depend on LibGit2 just for this regex nowadays. JuliaDocs/Documenter.jl#2363

@mortenpi
Copy link
Contributor Author

CI is green; can we merge?

No, it needs a new Documenter version. It's depending on a branch right now. But soon -- it looks like between fixing the stdlib logic and switching Documenter to Git.jl, it is indeed finally working 🎉

Co-authored-by: Lilith Orion Hafner <lilithhafner@gmail.com>
@mortenpi
Copy link
Contributor Author

Assuming all goes well on the CI, I think this is now ready to be merged.

@LilithHafner LilithHafner added the merge me PR is reviewed. Merge when all tests are passing label Nov 29, 2023
@LilithHafner LilithHafner changed the title Use Documenter 1.0.0 Update Documenter 0.27.23 => 1.2.0 Nov 29, 2023
@mortenpi mortenpi changed the title Update Documenter 0.27.23 => 1.2.0 Update Documenter 0.27.23 => 1.2.1 Dec 4, 2023
@N5N3 N5N3 merged commit e0d9cb2 into JuliaLang:master Dec 5, 2023
7 checks passed
@N5N3
Copy link
Member

N5N3 commented Dec 5, 2023

Tried this locally and this PR seems to fix #44068.

@LilithHafner LilithHafner removed the merge me PR is reviewed. Merge when all tests are passing label Dec 5, 2023
@LilithHafner
Copy link
Member

Oops, sorry I never got around to clicking merge once the CI passed. Thanks @N5N3!

@mortenpi mortenpi deleted the mp/documenter-0.28 branch December 5, 2023 22:11
@mortenpi
Copy link
Contributor Author

mortenpi commented Dec 6, 2023

It looks like this didn't fix the standard library links.. the CI build tree difference is causing yet more issues 😢 (which I can replicate locally if I unpack a tarball into usr/).

Although, in this case, it also looks like Documenter is doing something a bit fishy, since it's failing to create the source links, but it's also not printing any warnings.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
docsystem The documentation building system
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants