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

v1.5 docs target fix #10439

Merged
merged 1 commit into from Mar 4, 2020
Merged

v1.5 docs target fix #10439

merged 1 commit into from Mar 4, 2020

Conversation

joestringer
Copy link
Member

@joestringer joestringer commented Mar 3, 2020

Needed minor rebase but the end-resulting added lines were identical to upstream.

Once this PR is merged, you can update the PR labels via:

$ for pr in 10419; do contrib/backporting/set-labels.py $pr done 1.5; done

This change is Reviewable

[ upstream commit d009884 ]

Backporter's notes: Did not apply cleanly; simple merge required.

A dependency for building docs imports the PyEnchant library.
Which by default pulls in the 'latest' version, this was updated from
2.0.0 to 3.0.1 on 2020/03/01.

Using PyEnchant 3.0.1 `make html` fails to build locally as well as in
the
[test-docs-please](https://jenkins.cilium.io/job/Cilium-PR-Doc-Tests/1921/console)
command/build.

This change locks PyEnchant at 2.0.0 for the time being until there's a
reason to figure out the dependency problems. The root cause isn't
obvious, PyEnchant claims `The 'enchant' C library was not found` but
it is being installed by `apk` in the container. Potentially file
locations have changed in a newer version of the C library and newer
PyEnchant expects new locations.

Related: #10391

Signed-off-by: Joshua Roppo <joshroppo@gmail.com>
Signed-off-by: Joe Stringer <joe@cilium.io>
@joestringer joestringer requested a review from a team as a code owner March 3, 2020 19:58
@joestringer joestringer added backport/1.5 kind/backports This PR provides functionality previously merged into master. labels Mar 3, 2020
@joestringer
Copy link
Member Author

test-docs-please

@joestringer joestringer merged commit 81d131d into v1.5 Mar 4, 2020
@joestringer joestringer deleted the pr/v1.5-backport-10419 branch March 4, 2020 00:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
kind/backports This PR provides functionality previously merged into master.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants