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

Pin z3-solver on macOS VMs (backport #11408) #11409

Merged
merged 1 commit into from
Dec 14, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Dec 13, 2023

This is an automatic backport of pull request #11408 done by Mergify.
Cherry-pick of c865c56 has failed:

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

You are currently cherry-picking commit c865c563b.
  (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)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   constraints.txt

no changes added to commit (use "git add" and/or "git commit -a")

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

@mergify mergify bot requested a review from a team as a code owner December 13, 2023 17:25
@mergify mergify bot added the conflicts used by mergify when there are conflicts in a port label Dec 13, 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:

  • @Qiskit/terra-core

@github-actions github-actions bot added type: qa Issues and PRs that relate to testing and code quality Changelog: None Do not include in changelog labels Dec 13, 2023
We currently use macOS 11.7 images in our CI and CPython 3.8 for the
all-optionals test run.  `z3-solver` recently released 4.12.3.0, which
upped the macOS platform version from 10.16 to 11.7.  This in theory
should be fine for our VM image, but the pre-built version of CPython
3.8 we have access to was built for an older macOS, so does not match a
`macos_11_7_x86_64` platform tag, and forces us to build Z3 from source,
often timing out the job.

This should have no effect on user machines, which will be typically be
using newer versions of Python, or will be able to install from source
if required.

This CI-only constraint can be relaxed when the version of CPython we
use on the macOS VMs supports the 11.7 macOS API version.

(cherry picked from commit c865c56)
@jakelishman jakelishman force-pushed the mergify/bp/stable/0.45/pr-11408 branch from f5a147f to df83e11 Compare December 13, 2023 17:42
@jakelishman jakelishman removed the conflicts used by mergify when there are conflicts in a port label Dec 13, 2023
@jakelishman
Copy link
Member

@Mergifyio backport stable/0.46

Copy link
Contributor Author

mergify bot commented Dec 13, 2023

backport stable/0.46

✅ Backports have been created

@coveralls
Copy link

Pull Request Test Coverage Report for Build 7199022876

  • 0 of 0 changed or added relevant lines in 0 files are covered.
  • 17 unchanged lines in 2 files lost coverage.
  • Overall coverage decreased (-0.02%) to 86.924%

Files with Coverage Reduction New Missed Lines %
crates/qasm2/src/lex.rs 5 91.16%
crates/qasm2/src/parse.rs 12 96.67%
Totals Coverage Status
Change from base Build 7055030816: -0.02%
Covered Lines: 74186
Relevant Lines: 85346

💛 - Coveralls

@jakelishman jakelishman added this pull request to the merge queue Dec 13, 2023
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Dec 13, 2023
@jakelishman jakelishman added this pull request to the merge queue Dec 14, 2023
Merged via the queue into stable/0.45 with commit ef21b50 Dec 14, 2023
15 checks passed
@mergify mergify bot deleted the mergify/bp/stable/0.45/pr-11408 branch December 14, 2023 01:24
mergify bot added a commit that referenced this pull request Dec 14, 2023
We currently use macOS 11.7 images in our CI and CPython 3.8 for the
all-optionals test run.  `z3-solver` recently released 4.12.3.0, which
upped the macOS platform version from 10.16 to 11.7.  This in theory
should be fine for our VM image, but the pre-built version of CPython
3.8 we have access to was built for an older macOS, so does not match a
`macos_11_7_x86_64` platform tag, and forces us to build Z3 from source,
often timing out the job.

This should have no effect on user machines, which will be typically be
using newer versions of Python, or will be able to install from source
if required.

This CI-only constraint can be relaxed when the version of CPython we
use on the macOS VMs supports the 11.7 macOS API version.

(cherry picked from commit c865c56)

Co-authored-by: Jake Lishman <[email protected]>
(cherry picked from commit ef21b50)
github-merge-queue bot pushed a commit that referenced this pull request Dec 14, 2023
We currently use macOS 11.7 images in our CI and CPython 3.8 for the
all-optionals test run.  `z3-solver` recently released 4.12.3.0, which
upped the macOS platform version from 10.16 to 11.7.  This in theory
should be fine for our VM image, but the pre-built version of CPython
3.8 we have access to was built for an older macOS, so does not match a
`macos_11_7_x86_64` platform tag, and forces us to build Z3 from source,
often timing out the job.

This should have no effect on user machines, which will be typically be
using newer versions of Python, or will be able to install from source
if required.

This CI-only constraint can be relaxed when the version of CPython we
use on the macOS VMs supports the 11.7 macOS API version.

(cherry picked from commit c865c56)

Co-authored-by: Jake Lishman <[email protected]>
(cherry picked from commit ef21b50)

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
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 type: qa Issues and PRs that relate to testing and code quality
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants