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

deps: Resolve conflicting python updates #15703

Merged
merged 8 commits into from
Mar 26, 2021

Conversation

phlax
Copy link
Member

@phlax phlax commented Mar 26, 2021

Signed-off-by: Ryan Northey [email protected]

Commit Message: deps: Resolve python requirement updates
Additional Description:
Risk Level:
Testing:
Docs Changes:
Release Notes:
Platform Specific Features:
[Optional Runtime guard:]
[Optional Fixes #Issue] Close #15691 Close #15694 Close #15697 Close #15689
[Optional Deprecated:]
[Optional API Considerations:]

@repokitteh-read-only repokitteh-read-only bot added the deps Approval required for changes to Envoy's external dependencies label Mar 26, 2021
@repokitteh-read-only
Copy link

CC @envoyproxy/dependency-shepherds: Your approval is needed for changes made to (bazel/.*repos.*\.bzl)|(bazel/dependency_imports\.bzl)|(api/bazel/.*\.bzl)|(.*/requirements\.txt)|(.*\.patch).

🐱

Caused by: #15703 was opened by phlax.

see: more, trace.

@phlax phlax changed the title deps: Manually resolve /docs requirement updates [WIP] deps: Manually resolve /docs requirement updates Mar 26, 2021
phlax added 2 commits March 26, 2021 11:57
Signed-off-by: Ryan Northey <[email protected]>
Signed-off-by: Ryan Northey <[email protected]>
@phlax
Copy link
Member Author

phlax commented Mar 26, 2021

gitdb requirement has some inconsistency preventing upgrade of smmap

upstream ticket here:

gitpython-developers/gitdb#69

@phlax phlax marked this pull request as draft March 26, 2021 12:18
This reverts commit 4ee10c8.

Signed-off-by: Ryan Northey <[email protected]>
@phlax
Copy link
Member Author

phlax commented Mar 26, 2021

/retest

@repokitteh-read-only
Copy link

Retrying Azure Pipelines:
Retried failed jobs in: envoy-presubmit

🐱

Caused by: a #15703 (comment) was created by @phlax.

see: more, trace.

phlax added 2 commits March 26, 2021 14:32
Signed-off-by: Ryan Northey <[email protected]>
This reverts commit b2f3e2a.

Signed-off-by: Ryan Northey <[email protected]>
@phlax
Copy link
Member Author

phlax commented Mar 26, 2021

gitdb requirement has some inconsistency preventing upgrade of smmap

this is now resolved upstream

@phlax phlax changed the title [WIP] deps: Manually resolve /docs requirement updates deps: Manually resolve /docs requirement updates Mar 26, 2021
@phlax phlax marked this pull request as ready for review March 26, 2021 15:03
@phlax
Copy link
Member Author

phlax commented Mar 26, 2021

merging other resolution PRs ...

/wait

@phlax phlax changed the title deps: Manually resolve /docs requirement updates deps: Manually resolve conflicting python updates Mar 26, 2021
@phlax phlax changed the title deps: Manually resolve conflicting python updates deps: Resolve conflicting python updates Mar 26, 2021
@phlax
Copy link
Member Author

phlax commented Mar 26, 2021

@moderation @mattklein123 ci is passing - ill clear the related dependa prs once this has landed and merge all the other prs

@phlax phlax requested a review from moderation March 26, 2021 21:05
Copy link
Member

@mattklein123 mattklein123 left a comment

Choose a reason for hiding this comment

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

Thank you!

@mattklein123 mattklein123 merged commit fcdaf20 into envoyproxy:main Mar 26, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
deps Approval required for changes to Envoy's external dependencies
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants