search

sipa / bitcoin

Bitcoin integration/staging tree
http://www.bitcoin.org
MIT License
88 stars 21 forks source link

[qa] segwit: Switch to py3 #84

Closed maflcko closed 8 years ago

maflcko commented 8 years ago

Please don't squash this commit and leave it near to the HEAD, as I am not sure if the 0.12 branch will switch to python3 as well.

sipa commented 8 years ago

Tests didn't run anymore when I included this in segwit-master.

maflcko commented 8 years ago

Did you also merge bitcoin/master like you did previously for that pull reqest?

maflcko commented 8 years ago

a7eeee1 is more a patch than a commit.

(It won't work if you just cherry-pick it into segwit-master but it must be cherry-picked when you want to merge segwit-master into bitcoin/master (c.f. https://travis-ci.org/bitcoin/bitcoin/builds/129017871). If you feel strong about having every commit in segwit-master passing the test, you can also include the a7eeee1 patch in the merge(bitcoin/master, segwit-master) commit)

I have just tried to merge a7eeee1 + ad4f9c7 and the test seem to run fine.