This pull does the following in a bunch of commits:
scripted diff to use the bytes::hex() method in place of previous wrappers (b2x, bytes_to_hex_str, hexlify, …)
Update the build system (gitian and travis) to remove python2.7 and replace it with python3.5
Another scripted-diff to remove brackets after assert. This is unrelated to the python3.5 switch, but a stylistic commit, so probably not worth to split up. The motivation behind it is to avoid asserting on data structures (such as tuples of length one), which never fails:
0>>>assert(False,) # with brackets1>>>assertFalse, # without brackets2SyntaxError: invalid syntax
3>>>assertFalse# proper assertion4AssertionError
And then a final scripted diff to update the copyright headers in the test subfolder, since I touched most of the files anyway and it wouldn’t make sense to split this commit out into a separate pull.
DrahtBot
commented at 9:38 pm on December 13, 2018:
member
The following sections might be updated with supplementary metadata relevant to reviewers and maintainers.
Conflicts
Reviewers, this pull request conflicts with the following ones:
#15482 (Implement BIPXXX’s new softfork rules (The Great Consensus Cleanup) by TheBlueMatt)
#15437 (p2p: Remove BIP61 reject messages by MarcoFalke)
#13541 (wallet/rpc: sendrawtransaction maxfeerate by kallewoof)
#12911 (wallet: Show fee in results for signrawtransaction* for segwit inputs by kallewoof)
#10443 (Add fee_est tool for debugging fee estimation code by ryanofsky)
If you consider this pull request important, please also help to review the conflicting pull requests. Ideally, start with the one that should be merged first.
practicalswift
commented at 8:55 am on December 14, 2018:
contributor
Concept ACK
DrahtBot added the label
Needs rebase
on Dec 28, 2018
MarcoFalke force-pushed
on Dec 28, 2018
DrahtBot removed the label
Needs rebase
on Dec 28, 2018
fanquake
commented at 10:33 am on December 31, 2018:
member
Concept ACK.
+1 on being able to start using Type Hints.
MarcoFalke force-pushed
on Jan 29, 2019
Sjors
commented at 10:32 am on January 30, 2019:
member
Concept ACK
MarcoFalke added the label
Needs gitian build
on Feb 5, 2019
DrahtBot removed the label
Needs gitian build
on Feb 6, 2019
MarcoFalke added the label
Needs gitian build
on Feb 14, 2019
MarcoFalke deleted a comment
on Feb 14, 2019
MarcoFalke force-pushed
on Feb 14, 2019
DrahtBot removed the label
Needs gitian build
on Feb 15, 2019
MarcoFalke force-pushed
on Feb 18, 2019
MarcoFalke force-pushed
on Feb 18, 2019
MarcoFalke force-pushed
on Feb 20, 2019
MarcoFalke force-pushed
on Feb 20, 2019
MarcoFalke force-pushed
on Feb 21, 2019
MarcoFalke force-pushed
on Feb 21, 2019
MarcoFalke force-pushed
on Feb 21, 2019
MarcoFalke force-pushed
on Feb 21, 2019
MarcoFalke force-pushed
on Feb 21, 2019
MarcoFalke force-pushed
on Feb 21, 2019
MarcoFalke force-pushed
on Feb 21, 2019
MarcoFalke force-pushed
on Feb 21, 2019
MarcoFalke force-pushed
on Feb 21, 2019
MarcoFalke force-pushed
on Feb 21, 2019
MarcoFalke force-pushed
on Feb 21, 2019
MarcoFalke renamed this:
WIP: build: Require python 3.5
build: Require python 3.5
on Feb 21, 2019
MarcoFalke force-pushed
on Feb 21, 2019
MarcoFalke deleted a comment
on Feb 21, 2019
MarcoFalke
commented at 3:15 pm on February 21, 2019:
member
@jnewbery You might be interested in reviewing this, since it removes some python2.7 leftovers from “Remove Python2 support” in #11881
jnewbery
commented at 3:25 pm on February 21, 2019:
member
Looks good. I especially like scripted-diff: test: Remove brackets after assert :100: Is there a flake warning we can add to enforce in that in future?
This is for inclusion in v0.19, so I’ll review after v0.18 is forked.
DrahtBot added the label
Needs rebase
on Feb 26, 2019
MarcoFalke force-pushed
on Mar 2, 2019
MarcoFalke force-pushed
on Mar 2, 2019
DrahtBot removed the label
Needs rebase
on Mar 2, 2019
scripted-diff: test: Use py3.5 bytes::hex() method
-BEGIN VERIFY SCRIPT-
sed -i -e "s/def bytes_to_hex_str/def b_2_x/g" $(git grep -l bytes_to_hex_str)
export RE_B_0="[^()]*" # match no bracket
export RE_B_1="${RE_B_0}\(${RE_B_0}\)${RE_B_0}" # match exactly one ()
export RE_B_2="${RE_B_0}\(${RE_B_1}\)${RE_B_0}" # match wrapped (())
export RE_M="(b2x|bytes_to_hex_str)\(((${RE_B_0}|${RE_B_1}|${RE_B_2})*)\)"
sed -i --regexp-extended -e "s/${RE_M}/\2.hex()/g" $(git grep -l -E '(b2x|bytes_to_hex_str)')
sed -i --regexp-extended -e "/ +bytes_to_hex_str( as b2x)?,/d" $(git grep -l bytes_to_hex_str)
sed -i --regexp-extended -e "s/ +bytes_to_hex_str( as b2x)?,//g" $(git grep -l bytes_to_hex_str)
sed -i --regexp-extended -e "s/, bytes_to_hex_str( as b2x)?//g" $(git grep -l bytes_to_hex_str)
export RE_M="(binascii\.)?hexlify\(((${RE_B_0}|${RE_B_1}|${RE_B_2})*)\).decode\(${RE_B_0}\)"
sed -i --regexp-extended -e "s/${RE_M}/\2.hex()/g" $(git grep -l hexlify -- ':(exclude)share')
sed -i --regexp-extended -e "/from binascii import hexlify$/d" $(git grep -l hexlify -- ':(exclude)share')
sed -i --regexp-extended -e "s/(from binascii import) .*hexlify/\1 unhexlify/g" $(git grep -l hexlify -- ':(exclude)share')
sed -i -e 's/ignore-names "/ignore-names "b_2_x,/g' ./test/lint/lint-python-dead-code.sh
-END VERIFY SCRIPT-
MarcoFalke
commented at 4:02 pm on March 2, 2019:
member
Rebased
practicalswift
commented at 4:36 pm on March 2, 2019:
contributor
utACKfaa7cdf764a651975fa3c780df7df206a08254c2
Sjors
commented at 4:50 pm on March 2, 2019:
member
tACKfaa7cdf except PyEnv needs a full version number, i.e. 3.5.6. With that, I was able to run make check and the functional test suite on macOS 10.14.3, but I didn’t try the various linters and other tools.
.python-version: Specify full version 3.5.6dddd1d05d3
MarcoFalke added the label
Needs gitian build
on Mar 2, 2019
Sjors
commented at 6:11 pm on March 2, 2019:
member
utACKdddd1d0. Travis failure on p2p_invalid_messages.py seems spurious.
jnewbery
commented at 6:12 pm on March 2, 2019:
member
Travis failure on p2p_invalid_messages.py seems spurious.
I restarted the job.
practicalswift
commented at 9:29 am on March 3, 2019:
contributor
utACKdddd1d05d3df06865f5e0b1442d7425c0955de4e
DrahtBot
commented at 12:24 pm on March 3, 2019:
member
Gitian builds for commit 789b0bbf2afcbaa5ce2b99945aa4b02866a61972 (master):
This is a metadata mirror of the GitHub repository
bitcoin/bitcoin.
This site is not affiliated with GitHub.
Content is generated from a GitHub metadata backup.
generated: 2024-12-18 18:12 UTC
This site is hosted by @0xB10C More mirrored repositories can be found on mirror.b10c.me