8000 build: pin pyopenssl (backport #18918) by mergify[bot] · Pull Request #18920 · frappe/frappe · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

build: pin pyopenssl (backport #18918) #18920

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 3 commits into from
Nov 17, 2022
Merged

build: pin pyopenssl (backport #18918) #18920

merged 3 commits into from
Nov 17, 2022

Conversation

mergify[bot]
Copy link
Contributor
@mergify mergify bot commented Nov 17, 2022

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

On branch mergify/bp/develop/pr-18918
Your branch is up to date with 'origin/develop'.

You are currently cherry-picking commit b47108bdab.
  (all conflicts fixed: 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)

nothing to commit, working tree clean

Cherry-pick of f70db1f has failed:

On branch mergify/bp/develop/pr-18918
Your branch is ahead of 'origin/develop' by 1 commit.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit f70db1f539.
  (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:   pyproject.toml

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

@ankush @mergify
chore: disable flaky test
93a9883 
This is
- flaky
- difficult to find source of flake because of crazy tests
- adds little value tbh

[skip ci]

(cherry picked from commit b47108b)
@ankush @mergify
build: pin pyopenssl
678b4da 
(cherry picked from commit f70db1f)

# Conflicts:
#	pyproject.toml
@mergify mergify bot requested review from a team and shariquerik and removed request for a team November 17, 2022 11:16
@mergify mergify bot added the conflicts label Nov 17, 2022
@mergify mergify bot assigned ankush Nov 17, 2022
@ankush ankush added Skip CI Doesn't run Ci for this PR. and removed conflicts labels Nov 17, 2022
@ankush ankush merged commit 9dbccc9 into develop Nov 17, 2022
@mergify mergify bot deleted the mergify/bp/develop/pr-18918 branch November 17, 2022 11:18
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Dec 2, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@shariquerik shariquerik Awaiting requested review from shariquerik

Assignees

@ankush ankush

Labels
Skip CI Doesn't run Ci for this PR.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@ankush
0