Skip to content

deps: Resolve conflicting python updates#15703

Merged
mattklein123 merged 8 commits intoenvoyproxy:mainfrom
phlax:deps-update-docs
Mar 26, 2021
Merged

deps: Resolve conflicting python updates#15703
mattklein123 merged 8 commits intoenvoyproxy:mainfrom
phlax:deps-update-docs

Conversation

@phlax
Copy link
Copy Markdown
Member

@phlax phlax commented Mar 26, 2021 •
edited
Loading

Signed-off-by: Ryan Northey ryan@synca.io

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:]

@phlax
deps: Manually resolve /docs requirement updates
9d3db71 
Signed-off-by: Ryan Northey <ryan@synca.io>
@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
Copy Markdown

repokitteh-read-only bot commented Mar 26, 2021

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
@phlax
smmap
4ee10c8 
Signed-off-by: Ryan Northey <ryan@synca.io>
@phlax
requests + urllib
fa64b3d 
Signed-off-by: Ryan Northey <ryan@synca.io>
@phlax
Copy link
Copy Markdown
Member Author

phlax commented Mar 26, 2021 •
edited
Loading

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
@phlax
Revert "smmap"
b2f3e2a 
This reverts commit 4ee10c8.

Signed-off-by: Ryan Northey <ryan@synca.io>
@phlax
Copy link
Copy Markdown
Member Author

phlax commented Mar 26, 2021

/retest

@repokitteh-read-only
Copy link
Copy Markdown

repokitteh-read-only bot commented Mar 26, 2021

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
@phlax
gitdb
1bc49fd 
Signed-off-by: Ryan Northey <ryan@synca.io>
@phlax
Revert "Revert "smmap""
58886ec 
This reverts commit b2f3e2a.

Signed-off-by: Ryan Northey <ryan@synca.io>
@phlax
Copy link
Copy Markdown
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
This was referenced Mar 26, 2021
Closed
Closed
@phlax
Copy link
Copy Markdown
Member Author

phlax commented Mar 26, 2021

merging other resolution PRs ...

/wait

phlax added 2 commits March 26, 2021 19:05
@phlax
deps: Resolve conflicts in /tools/code_format
d41609a 
Signed-off-by: Ryan Northey <ryan@synca.io>
@phlax
deps: Manually resolve /ci/flaky_test requirements
cb2512e 
Signed-off-by: Ryan Northey <ryan@synca.io>
@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
Copy Markdown
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
mattklein123
mattklein123 approved these changes Mar 26, 2021
View reviewed changes
Copy link
Copy Markdown
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

Reviewers

@mattklein123 mattklein123 mattklein123 approved these changes

@moderation moderation Awaiting requested review from moderation

Assignees

No one assigned

Labels

deps Approval required for changes to Envoy's external dependencies

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@phlax @mattklein123