Handle Fabric-level assumptions about PyCrypto's use #1462

Merged
merged 1 commit into from Dec 9, 2016

Projects

None yet

2 participants

@alex
Contributor
alex commented May 1, 2016

This is in prep for bumping the paramiko dependency, where Cryptography is used instead of PyCrypto.

@alex alex Handle PyCrypto not being installed cleanly
This is in prep for bumping the paramiko dependency, where Cryptography is used instead of PyCrypto.
47e1304
@bitprophet
Member

Can you rebase this against...let's see, the 1.10 branch, please? If we do go this route I'd like to put it out for all supported lines. thanks!

@bitprophet bitprophet added the Support label May 5, 2016
@bitprophet bitprophet added this to the 1.10.4 milestone May 5, 2016
@alex
Contributor
alex commented May 6, 2016

@bitprophet as in, close this PR and file a new one against that branch?

@bitprophet bitprophet changed the base branch to fabric:1.10 from fabric:master Aug 22, 2016
@bitprophet bitprophet changed the base branch to fabric:master from fabric:1.10 Aug 22, 2016
@bitprophet
Member

Booo the base-branch changing stuff isn't terrifically clean :( just acts like a straight up merge or something so all of $NEWER_BASE_BRANCH commits end up applied to $OLDER_BASE_BRANCH.

Doesn't actually mattress for something this small but I was hoping that new GH feature would save me the manual cherry-picking/rebasing. Oh well. Will do that momentarily...

@bitprophet
Member
bitprophet commented Aug 22, 2016 edited

Actually waffling on whether this should go into the older releases or not. Changing the Paramiko dep in bugfix releases feels like a no-no; should be trivial for users to upgrade to 1.14 if we do it there. Merging this without also changing the Paramiko dep feels pointless. So yea, meh. Let's just do it in 1.13. I do waste too much time on older release lines sometimes >_>

@bitprophet bitprophet modified the milestone: 1.13, 1.10.5 Aug 22, 2016
@bitprophet bitprophet changed the title from Handle PyCrypto not being installed cleanly to Handle Fabric-level assumptions about PyCrypto's use Dec 6, 2016
@bitprophet bitprophet merged commit 47e1304 into fabric:master Dec 9, 2016

1 check failed

continuous-integration/travis-ci/pr The Travis CI build could not complete due to an error
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment