Skip to content
This repository has been archived by the owner on Jan 5, 2024. It is now read-only.

Update PyYAML to 5.1 #24

Merged
merged 1 commit into from Apr 16, 2019
Merged

Update PyYAML to 5.1 #24

merged 1 commit into from Apr 16, 2019

Conversation

rmol
Copy link
Contributor

@rmol rmol commented Mar 29, 2019

This change updates the PyYAML requirement to 5.1.

Fixes #134.

@rmol rmol changed the title Update PyYAML to 5.1 [WIP] Update PyYAML to 5.1 Mar 29, 2019
@rmol rmol changed the title [WIP] Update PyYAML to 5.1 Update PyYAML to 5.1 Apr 1, 2019
setup.py Outdated
@@ -5,7 +5,7 @@

setuptools.setup(
name="securedrop-proxy",
version="0.1.2",
version="0.1.3",
Copy link
Contributor

Choose a reason for hiding this comment

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

the other place we'll want to bump the version is in the proxy Response here: https://github.com/freedomofpress/securedrop-proxy/blob/master/securedrop_proxy/proxy.py#L21

@redshiftzero
Copy link
Contributor

hey @kushaldas - want to do the diff/changelog review for these dependency updates?

@redshiftzero
Copy link
Contributor

e56f799 lgtm! I just enabled builds from forks in Circle CI so that tests will run on next push

Also simplify package versioning with a VERSION file containing the
version string, e.g. 0.1.3, which will be read in setup.py and
securedrop_proxy/version.py. Now we just have to remember to update
the package version in one place.

Add a test making sure that the proxy reports the same version used in
setup.py.
@redshiftzero
Copy link
Contributor

To the diff/changelog reviewer: we reviewed pyyaml updates over in freedomofpress/securedrop-sdk#72 so the reviewer here just needs to verify the hashes are the same

@kushaldas
Copy link
Contributor

kushaldas commented Apr 16, 2019

@redshiftzero as we discussed yesterday, we will review the source code diffs of the pyyaml while building/syncing wheels step. For this PR, we will not need that.

I am going to do the diff review here.

@kushaldas
Copy link
Contributor

@rmol @redshiftzero the update to PyYAML 5.1 is approved. The diff looks okay to me.

https://github.com/freedomofpress/securedrop-debian-packaging/wiki/PyYAML-5.1

Copy link
Contributor

@redshiftzero redshiftzero left a comment

Choose a reason for hiding this comment

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

verified same hashes as in freedomofpress/securedrop-sdk#72, diff otherwise looks good including version handling, thanks @rmol!

@redshiftzero redshiftzero merged commit a78da7e into freedomofpress:master Apr 16, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[securedrop-proxy] Update pyyaml when 4.2 release is available
3 participants