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

Attempt to deploy the docs #5087

Closed
wants to merge 8 commits into from
Closed

Attempt to deploy the docs #5087

wants to merge 8 commits into from

Conversation

maximlt
Copy link
Member

@maximlt maximlt commented Sep 20, 2021

Currently ibis-framework cannot be installed on Ubuntu from conda-forge (conda-forge/ibis-framework-feedstock#54), yet it can be installed from defaults.

The only dependency that is not available on defaults from the -o doc option is awscli. It's thus removed from setup.py and installed after develop install from conda-forge. Note this is already done for selenium and geckodriver. After this change, develop_install won't rely on conda-forge anymore.

This PR also adds the possibility to trigger the docs workflow manually from the UI (https://github.blog/changelog/2020-07-06-github-actions-manual-triggers-with-workflow_dispatch/).

@jlstevens
Copy link
Contributor

jlstevens commented Sep 21, 2021

Happy to merge whenever you say it is ready (now I've seen it build and the output looks good).

That said, I suppose it is worth testing the manual trigger first...

@maximlt maximlt changed the base branch from branch_1.14 to branch_1.14.7 September 21, 2021 10:01
@maximlt
Copy link
Member Author

maximlt commented Sep 21, 2021

@jlstevens I squashed some commits and forced push. And created a new 1.14.7 branch against which this PR is now on. I've also removed the 1.14.6a4 dummy tag I used to trigger the docs build.

The manual trigger button doesn't appear as of yet. I have in mind that once this is merged it should appear.

@jlstevens
Copy link
Contributor

jlstevens commented Sep 21, 2021

And created a new 1.14.7 branch against which this PR is now on.

I believe what should happen is this:

  1. This PR should be against master.
  2. Then this can be squash merged to master (I would double check recent fixes to CI are on master..I think so and they should be!)
  3. The branch_1.14.7 branch should be a PR opened against branch_1.14
  4. The squash-merged commit from this PR should be cherry-picked to it.

That way the doc fix here is on both master and the 1.14.7 hotfix. @philippjfr Do you agree?

In other words, if this PR is rebased against master, I am happy to go ahead and merge! I am happy to open the 1.14.7 PR and do the cherry pick after the merge.

@philippjfr
Copy link
Member

That way the doc fix here is on both master and the 1.14.7 hotfix. @philippjfr Do you agree?

Yes, that's the correct approach, generally things should land on master first and backported if needed. Indeed I suggest we create a backport label for PRs. All PRs which are to land in a hotfix release should then be labeled with backport and have the release assigned.

@maximlt maximlt mentioned this pull request Sep 21, 2021
@maximlt maximlt closed this Sep 21, 2021
@maximlt maximlt deleted the fix_docs_build branch December 7, 2021 06:32
Copy link

This pull request has been automatically locked since there has not been any recent activity after it was closed. Please open a new issue for related bugs.

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Oct 24, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants