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

fix/protocols #42

Merged
merged 4 commits into from
Dec 13, 2022
Merged

fix/protocols #42

merged 4 commits into from
Dec 13, 2022

Conversation

anwalker293
Copy link
Contributor

@anwalker293 anwalker293 commented Dec 12, 2022

Reconcile conflicts, get reset hard, and implement desired changes in controller/protocols.py

Signed-off-by: Alex Walker ☀️ alex.walker@indicio.tech

Signed-off-by: Alex Walker <alex.walker@indicio.tech>
Signed-off-by: Alex Walker <alex.walker@indicio.tech>
@anwalker293 anwalker293 marked this pull request as ready for review December 12, 2022 21:09
@anwalker293
Copy link
Contributor Author

(Seems like not passing the tests/Tests thing, due to an import error in tests/test_protocols.py (did not update tests/test_protocols.py in this PR/in a separate PR)) Latter PR with changes in tests/test_protocols.py successfully tests and passes all changes made to protocols.py in this PR

@dbluhm
Copy link
Member

dbluhm commented Dec 12, 2022

Please merge the PR changing tests/tests_protocols.py (#44) into this PR 🙂

@dbluhm
Copy link
Member

dbluhm commented Dec 12, 2022

The format and lint check failure is a result of recent updates to the GHA pipeline (python 3.6 is no longer available on the latest ubuntu image) -- I think we can bump the version of python getting set up from 3.6 to 3.7 to fix

Signed-off-by: Alex Walker <alex.walker@indicio.tech>
@dbluhm dbluhm merged commit 0cfefd8 into Indicio-tech:feature/revocation Dec 13, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants