Skip to content

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Aug 15, 2023

This is an automatic backport of pull request #10610 done by Mergify.
Cherry-pick of 80e95d1 has failed:

On branch mergify/bp/stable/0.25/pr-10610
Your branch is up to date with 'origin/stable/0.25'.

You are currently cherry-picking commit 80e95d11c.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   .azure/docs-linux.yml
	modified:   .azure/tutorials-linux.yml
	new file:   .github/workflows/docs_deploy.yml
	modified:   .gitignore
	modified:   azure-pipelines.yml
	new file:   tools/docs_exclude.txt
	new file:   tools/github_poBranch_update_key.enc
	new file:   tools/install_ubuntu_docs_dependencies.sh
	new file:   tools/rclone.conf.enc
	modified:   tox.ini

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   docs/conf.py

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

* Add GitHub Actions documentation-deployment pipeline

This brings a documentation-deployment pipeline into the Qiskit/Terra
repository, allowing it to fully deploy its documentation to
`qiskit.org`, a task previously only the metapackage could perform.
This does not fully unify the documentation with files from the
metapackage, it just adds a pipeline to do the final deployment.

This includes a revitalised translatable-strings pipeline, which was
previously broken on the metapackage for the last month or two. It also
previously included a fair amount of legacy weight that was no longer
relevant.

* Add missing secret insertions

* Improve logic for deployments

This changes the logic for the deployments so that pushes to 'stable/*'
no longer trigger any deployment to qiskit.org.  Instead, tag events
trigger a deployment to the relevant stable branch, and a tag event of
the _latest_ tag triggers a deployment to the documentation root.

The translatables logic is modified to push only the latest full-release
tag.

(cherry picked from commit 80e95d1)

# Conflicts:
#	docs/conf.py
@mergify mergify bot requested a review from a team as a code owner August 15, 2023 19:08
@mergify mergify bot added the conflicts used by mergify when there are conflicts in a port label Aug 15, 2023
@qiskit-bot
Copy link
Collaborator

Thank you for opening a new pull request.

Before your PR can be merged it will first need to pass continuous integration tests and be reviewed. Sometimes the review process can be slow, so please be patient.

While you're waiting, please feel free to review other open PRs. While only a subset of people are authorized to approve pull requests for merging, everyone is encouraged to review open pull requests. Doing reviews helps reduce the burden on the core team and helps make the project's code better for everyone.

One or more of the the following people are requested to review this:

@coveralls
Copy link

coveralls commented Aug 15, 2023

Pull Request Test Coverage Report for Build 5879327489

  • 0 of 0 changed or added relevant lines in 0 files are covered.
  • 35 unchanged lines in 5 files lost coverage.
  • Overall coverage decreased (-0.04%) to 87.23%

Files with Coverage Reduction New Missed Lines %
crates/qasm2/src/expr.rs 1 93.76%
qiskit/extensions/unitary.py 1 93.75%
qiskit/extensions/quantum_initializer/squ.py 2 80.0%
crates/qasm2/src/lex.rs 7 90.89%
crates/qasm2/src/parse.rs 24 96.2%
Totals Coverage Status
Change from base Build 5872516943: -0.04%
Covered Lines: 74074
Relevant Lines: 84918

💛 - Coveralls

@mtreinish
Copy link
Member

An interesting note on this backport is we will be tagging 0.25.1 which will trigger the build to be uploaded to the wrong path: documentation/stable/0.25 instead of the intended documentation/stable/0.44. For the purposes of this backport and the 0.25.1 release I'll just hard code the path on tag events to stable/0.44 as this is the only path that we will ever push to from the stable/0.25 branch.

@1ucian0
Copy link
Member

1ucian0 commented Aug 16, 2023

I tried to address the conflicts. But probably somebody else should have a look.

docs/conf.py Outdated
Comment on lines 136 to 141
html_theme_options = {
"logo_only": True,
"display_version": True,
"prev_next_buttons_location": "bottom",
"style_external_links": True,
}
Copy link
Collaborator

Choose a reason for hiding this comment

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

@1ucian0 bad change

@mtreinish mtreinish added Changelog: None Do not include in changelog and removed conflicts used by mergify when there are conflicts in a port labels Aug 16, 2023
For any tag we publish from the `stable/0.25` branch the publish path
should be both `stable/0.44` (which matches the qiskit package version) 
and the root as it's the current release. When we stop publishing from
the stable/0.25 branch after the release of 0.45.0rc1 the existing logic 
will work and we'll no longer have any 0.25.x releases. But for the
0.25.x release series only the version numbers are not unified so we
need to manually ensure we're publishing to the right paths.
@@ -26,7 +26,16 @@
# The short X.Y version
version = "0.25"
# The full version, including alpha/beta/rc tags
release = "0.25.0"
release = "0.45.0"
Copy link
Collaborator

Choose a reason for hiding this comment

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

@mtreinish bad merge conflict, right?

Suggested change
release = "0.45.0"
release = "0.25.0"

Copy link
Member

Choose a reason for hiding this comment

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

It's actually 0.44.0 now and will be 0.44.1 on the 0.25.1 release, but I had fixed this in #10644 so I didn't view it as critical for this PR.

Copy link
Collaborator

@Eric-Arellano Eric-Arellano left a comment

Choose a reason for hiding this comment

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

Sgtm to hardcode things for 0.44.

@mtreinish mtreinish added this pull request to the merge queue Aug 16, 2023
Merged via the queue into stable/0.25 with commit 67061ae Aug 16, 2023
@mergify mergify bot deleted the mergify/bp/stable/0.25/pr-10610 branch August 16, 2023 20:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changelog: None Do not include in changelog
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants