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

Fix doc build #3416

Merged
merged 1 commit into from
Mar 16, 2022
Merged

Fix doc build #3416

merged 1 commit into from
Mar 16, 2022

Conversation

jasongrout
Copy link
Member

@jasongrout jasongrout commented Mar 16, 2022

Rely on the default of readthedocs installing things with pip, rather than insisting on setuptools (which doesn't work anymore for us).

@jasongrout jasongrout added this to the 7.7 milestone Mar 16, 2022
@jasongrout jasongrout changed the title Pin version of ipyleaflet to get around doc building errors Fix doc build Mar 16, 2022
@jasongrout jasongrout merged commit c255e99 into jupyter-widgets:7.x Mar 16, 2022
@jasongrout
Copy link
Member Author

@meeseeksdev please backport to master

@lumberbot-app
Copy link

lumberbot-app bot commented Mar 16, 2022

Owee, I'm MrMeeseeks, Look at me.

There seem to be a conflict, please backport manually. Here are approximate instructions:

  1. Checkout backport branch and update it.
git checkout master
git pull
  1. Cherry pick the first parent branch of the this PR on top of the older branch:
git cherry-pick -m1 c255e99f7433972b8586c187f8f97799fc18b90f
  1. You will likely have some merge/cherry-pick conflict here, fix them and commit:
git commit -am 'Backport PR #3416: Fix doc build'
  1. Push to a named branch:
git push YOURFORK master:auto-backport-of-pr-3416-on-master
  1. Create a PR against branch master, I would have named this PR:

"Backport PR #3416 on branch master (Fix doc build)"

And apply the correct labels and milestones.

Congratulations — you did some good work! Hopefully your backport PR will be tested by the continuous integration and merged soon!

Remember to remove the Still Needs Manual Backport label once the PR gets merged.

If these instructions are inaccurate, feel free to suggest an improvement.

@jasongrout
Copy link
Member Author

@meeseeksdev please backport to master

Actually, looks like this is already fixed in master.

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.

1 participant