Fixes #5453 updates cffi & argon2_cffi #5458
Merged
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
emkll
reviewed
Aug 19, 2020
| --hash=sha256:edabd457cd23a02965166026fd9bfd196f4324fe6032e866d0f3bd0301cd486f \ | ||
| --hash=sha256:fdf1c1dc5bafc32bc5d08b054f94d659422b05aba244d6be4ddc1c72d9aa70fb \ | ||
| # via argon2-cffi, cryptography | ||
| cffi==1.14.0 \ |
There was a problem hiding this comment.
cffi version reviewed in the PR description is 1.14.2, as such, the hashes are different. Should we use 1.14.2 here?
There was a problem hiding this comment.
I will update it in some time.
53 tasks
12 tasks
Updates both the releases to the latest, these versions builds properly on Python3.8 on Ubuntu Focal 20.04
kushaldas
force-pushed
the
upgrade_ffi_twins
branch
from
7cbd0b6 to
11700f0
Compare
emkll
reviewed
Aug 20, 2020
There was a problem hiding this comment.
Went through the test plan and everything looks good to me:
- CI is green
- Verify hashes introduced in the PR (for the source tar.gz files with the following)
- https://github.com/freedomofpress/securedrop-debian-packaging/wiki/cffi-1.11.5-to-1.14.2
- https://github.com/freedomofpress/securedrop-debian-packaging/wiki/argon2_cffi-18.1.0-to-20.1.0
One last question for you @kushaldas : would it make sense to track the same version of cffi (1.4.2) in develop-requirements.txt as well? It's currently on 1.4.0 [1](which may have been the source of the initial confusion). It seems fine for me to merge as-is, but curious what you think.
9 tasks
Based on the review feedback we now have the same version in development and main application requirements files.
kushaldas
force-pushed
the
upgrade_ffi_twins
branch
from
3411829 to
481cf80
Compare
emkll
approved these changes
Aug 24, 2020
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
Ready for review
Description of Changes
Fixes #5453
Updates both the releases to the latest, these versions builds
properly on Python3.8 on Ubuntu Focal 20.04
Testing
Deployment
Any special considerations for deployment? Consider both:
Checklist
If you made changes to the server application code:
make lint) and tests (make 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 locallyIf you added or updated a code dependency:
Choose one of the following: