-
Notifications
You must be signed in to change notification settings - Fork 1.1k
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
Move diplomacy to standalone library absorbing aop #3571
Move diplomacy to standalone library absorbing aop #3571
Conversation
bf556df
to
f21658b
Compare
Very nice, I greatly appreciate the effort to preserve the deprecated package paths. |
yeah, I mostly followed the lead of @sequencer and attempted to capture as minimal of a change as possible for this initial split. I also have other PRs ready to go that update each of the individual modules internally to use the new diplomacy library directly. I've also run tests locally and everything seems to be passing without issue. so this should be ready for review. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Basically LTGM, really really really thank to your rebasing!!!
There are some nitpits in the commit. please keep the patch as minimal as possible. I'll take a look at your reabsed version of diplomacy today!
.gitmodules
Outdated
@@ -7,3 +7,6 @@ | |||
[submodule "dependencies/chisel"] | |||
path = dependencies/chisel | |||
url = https://github.com/chipsalliance/chisel.git | |||
[submodule "dependencies/diplomacy"] | |||
path = dependencies/diplomacy | |||
url = https://github.com/lordspacehog/diplomacy.git |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
should be chipsalliance/diplomacy in the future.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
yeah, My current plan is to do a 2nd PR to cut it over,. or we can wait until diplomacy is published to ivy and i can just the setup over to use ivy.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
updated this PR to point at the new branch in the chipsalliance/diplomacy repo
@lordspacehog Can you give me an small memo on how to split the diplomacy, I used to have my own way, and I need to verify your version to carefully review it:) |
@sequencer This new diplomacy split is a new history pull from rocket-chip/dev using git filter-repo (https://github.com/newren/git-filter-repo). You should either force push over your local master or use a different branch name pointed to the new history for now. The exact process i used was as follows:
From there i manually went through and reconciled the changes between your diplomacy repo, the main chipsalliance diplomacy repo, and the changes that happened directly in the rocket-chip repo. |
f21658b
to
2f2f469
Compare
@lordspacehog I sent u an invitation, please directly push to a branch to chipsalliance/diplomacy, and I can take a look ;p |
@sequencer accepted the invite, but it looks like i don't have push access to the repo, only triage. if you can update that i'll get a branch pushed ASAP. i'll also stage an update to this PR to set that new branch as the submodule target. |
Access granted. |
58217be
to
76fa451
Compare
Splits out the aop and diplomacy modules into a standalone library. Adds the new library as a dependency and updates the in-tree diplomacy and aop modules to reference the new library with deprecation warnings.
76fa451
to
27f23ee
Compare
cc @lordspacehog, I reviewed and pushed the master branch to https://github.com/chipsalliance/diplomacy. please set that as upstream and go though CI;p |
Updates the diplomacy dependency submodule to track chipsalliance/diplomacy master branch.
@sequencer updated the submodule reference. |
it might have additional things to clean up. Merge it for now. I’ll take care of them later this week |
Related issue: #3037
Type of change: other enhancement
Impact: API Deprecation in favor of standalone diplomacy
Development Phase: implementation
Release Notes
Splits out the aop and diplomacy modules into a standalone library. Adds the new library as a dependency and updates the in-tree diplomacy and aop modules to reference the new library with deprecation warnings.