Fixes #4036 #4037 #4038 Fixes gnupg and setuptools related errors #4042
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
For the python-gnupg to work properly on Xenial, we should call `gpg` binary instead of `gpg2` (which we use in Trusty).
With the upgraded setuptools package, the errors in both the mentioned issues get fixed.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Status
DO NOT MERGE
Description of Changes
Fixes #4036 #4037 #4038
With the upgraded setuptools package, the errors
in first two issues get fixed,
For the python-gnupg to work properly on Xenial, we should
call
gpgbinary instead ofgpg2(which we use in Trusty).Testing
Minimal testing
BASE_OS=xenial securedrop/bin/dev-shell bin/run-test -v tests/test_i18n_tool.py tests/test_i18n.py tests/test_integration.py tests/test_2fa.pyand
make test-xenial.Deployment
Any special considerations for deployment? Consider both:
We have to verify that everything works fine.
No changes here.
Checklist
If you made changes to the server application code:
make ci-lint) and tests (make -C securedrop test) pass in the development containerIf you made changes to
securedrop-admin:make -C admin test) pass in the admin development containerIf you made changes to the system configuration:
If you made non-trivial code changes:
If you made changes to documentation:
make docs-lint) passed locally