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.

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

0.7.5 Cherry Picks #1967

Merged
merged 17 commits into from
Oct 11, 2022
Merged

0.7.5 Cherry Picks #1967

merged 17 commits into from
Oct 11, 2022

Conversation

TheTechmage
Copy link
Contributor

@TheTechmage TheTechmage commented Oct 6, 2022 •
edited
Loading

@TheTechmage
fix: Safely shutdown when root_profile uninitialized
94def2d 
If an exception was thrown during the initialization of the
root_profile, we would throw an exception during shutdown and fail to
end the process. This would leave ACA-Py running, without
accepting/handling any further requests. Adding guards for shutdown code
that uses the root_profile should avoid this situation

Signed-off-by: Colton Wolkins (Indicio work address) <[email protected]>
@TheTechmage
Copy link
Contributor Author

TheTechmage commented Oct 6, 2022 •
edited
Loading

Both #1940 and #1962 appear to have merge conflicts in one form or another. The commits from #1940 made assumptions about work that had been made within other commits (most notably, within the tests).

I moved on to merging #1962, but this appears to have been a mistake. I will switch back to merging #1940 and resolving any merge conflicts before proceeding on with #1962.

@dbluhm dbluhm added this to the Version 0.7.5 milestone Oct 6, 2022
shaangill025 and others added 8 commits October 6, 2022 15:59
@shaangill025 @TheTechmage
updates to protocol_registry
f0441b2 
Signed-off-by: Shaanjot Gill <[email protected]>
Signed-off-by: Colton Wolkins (Indicio work address) <[email protected]>
@TheTechmage
flake8 & unit test fix
df6ae12 
Signed-off-by: DESKTOP-TAED8OJ\shaangill025 <[email protected]>
Signed-off-by: Colton Wolkins (Indicio work address) <[email protected]>
@shaangill025 @TheTechmage
templated msg_type work
f03a5cb 
Signed-off-by: Shaanjot Gill <[email protected]>
Signed-off-by: Colton Wolkins (Indicio work address) <[email protected]>
@shaangill025 @TheTechmage
update test_dispatcher to use mock, asyncMock
c235817 
Signed-off-by: Shaanjot Gill <[email protected]>
Signed-off-by: Colton Wolkins (Indicio work address) <[email protected]>
@shaangill025 @TheTechmage
reduce complexity - protocol_registry
70ee886 
Signed-off-by: Shaanjot Gill <[email protected]>
Signed-off-by: Colton Wolkins (Indicio work address) <[email protected]>
@shaangill025 @TheTechmage
reduce complexity - register_message_types
8bf3626 
Signed-off-by: Shaanjot Gill <[email protected]>
Signed-off-by: Colton Wolkins (Indicio work address) <[email protected]>
@shaangill025 @TheTechmage
cleanup
88d037c 
Signed-off-by: Shaanjot Gill <[email protected]>
Signed-off-by: Colton Wolkins (Indicio work address) <[email protected]>
@TheTechmage
ci: Add missing libraries required for tests
0fb0171 
Signed-off-by: Colton Wolkins (Indicio work address) <[email protected]>
@TheTechmage TheTechmage force-pushed the hotfix/0.7.5-working branch from e8c6354 to 0fb0171 Compare October 7, 2022 14:01
@TheTechmage
Copy link
Contributor Author

Force-push due to a commit missing a valid GPG signature

shaangill025 and others added 8 commits October 10, 2022 08:50
@shaangill025 @TheTechmage
OOB v1.1 support w/ backward comp
59615c4 
Signed-off-by: Shaanjot Gill <[email protected]>
Signed-off-by: Colton Wolkins (Indicio work address) <[email protected]>
@shaangill025 @TheTechmage
rework based upon feedback
9cbcaa7 
Signed-off-by: Shaanjot Gill <[email protected]>
Signed-off-by: Colton Wolkins (Indicio work address) <[email protected]>
@shaangill025 @TheTechmage
update protocol_registry and cleanup
6d00225 
Signed-off-by: Shaanjot Gill <[email protected]>
Signed-off-by: Colton Wolkins (Indicio work address) <[email protected]>
@shaangill025 @TheTechmage
create 1.0 OOB invitation
99bddac 
Signed-off-by: Shaanjot Gill <[email protected]>
Signed-off-by: Colton Wolkins (Indicio work address) <[email protected]>
@shaangill025 @TheTechmage
test fix and sonar check cleanup
4017c98 
Signed-off-by: Shaanjot Gill <[email protected]>
Signed-off-by: Colton Wolkins (Indicio work address) <[email protected]>
@shaangill025 @TheTechmage
change parameter to service_accept and typo fix
31eff25 
Signed-off-by: Shaanjot Gill <[email protected]>
Signed-off-by: Colton Wolkins (Indicio work address) <[email protected]>
@shaangill025 @TheTechmage
include _type and _version in AgentMessage
0a16226 
Signed-off-by: Shaanjot Gill <[email protected]>
Signed-off-by: Colton Wolkins (Indicio work address) <[email protected]>
@TheTechmage
chore: Fix broken tests from Cherry-Pick
c17f965 
After Cherrypicking openwallet-foundation#1962, the unit tests began to fail due to
changes elsewhere in the codebase. This commit intends to fix those
failures.

Signed-off-by: Colton Wolkins (Indicio work address) <[email protected]>
@sonarqubecloud
Copy link

Kudos, SonarCloud Quality Gate passed!    Quality Gate passed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 0 Code Smells

No Coverage information No Coverage information
No Duplication information No Duplication information

@codecov-commenter
Copy link

Codecov Report

❗ No coverage uploaded for pull request base (hotfix/0.7.5@e84fc18). Click here to learn what that means.
The diff coverage is n/a.

@@               Coverage Diff               @@
##             hotfix/0.7.5    #1967   +/-   ##
===============================================
  Coverage                ?   93.59%           
===============================================
  Files                   ?      537           
  Lines                   ?    34266           
  Branches                ?        0           
===============================================
  Hits                    ?    32070           
  Misses                  ?     2196           
  Partials                ?        0

@TheTechmage TheTechmage marked this pull request as ready for review October 10, 2022 21:47
swcurran
swcurran approved these changes Oct 11, 2022
View reviewed changes
Copy link
Contributor

@swcurran swcurran left a comment

Choose a reason for hiding this comment

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

AATH Tests run with ACA-Py and with AFJ-ACA-Py and all tests passing with 0.7.4 are passing with this branch. As well, @frostyfrog ran the integration tests and they passed.

@swcurran swcurran merged commit 75b0b4e into openwallet-foundation:hotfix/0.7.5 Oct 11, 2022
@swcurran
Copy link
Contributor

swcurran commented Oct 18, 2022 •
edited
Loading

@frostyfrog -- we need to cherry pick another PR: #1973 -- a one liner. Could you please do that? It is updating a dependency for web.py from a git reference to a released version.

@frostyfrog @dbluhm @WadeBarnes -- opinion needed: Assuming this cherry pick goes well, do you think I should do an 0.7.5-rc1 release or would it be safe enough to go straight to 0.7.5 final after local pre-release testing?

@WadeBarnes
Copy link
Contributor

I'd go with an 0.7.5-rc1.

@TheTechmage TheTechmage mentioned this pull request Oct 19, 2022
Closed
7 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@swcurran swcurran swcurran approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
Version 0.7.5
Development

Successfully merging this pull request may close these issues.
6 participants
@TheTechmage @codecov-commenter @swcurran @WadeBarnes @dbluhm @shaangill025