[qa] python-bitcoinrpc is no longer a subtree #7052

pull MarcoFalke wants to merge 1 commits into bitcoin:master from MarcoFalke:MarcoFalke-2015-qaSubtree changing 1 files +2 −4

MarcoFalke commented at 11:15 AM on November 18, 2015: member

Follow up of #6097?

Not sure what we are doing right now, but it is no longer a subtree.

[ci skip]

in qa/rpc-tests/README.md:None in 070486b81a outdated

   0 | @@ -1,10 +1,8 @@
   1 |  Regression tests
   2 |  ================
   3 |  
   4 | -### [python-bitcoinrpc](https://github.com/jgarzik/python-bitcoinrpc)
   5 | -Git subtree of [https://github.com/jgarzik/python-bitcoinrpc](https://github.com/jgarzik/python-bitcoinrpc).
   6 | -Changes to python-bitcoinrpc should be made upstream, and then
   7 | -pulled here using git subtree.
   8 | +### [test_framework](test_framework)
   9 | +This contains some files of the [python-bitcoinrpc by jgarzik](https://github.com/jgarzik/python-bitcoinrpc).

jonasschnelli commented at 7:16 PM on November 18, 2015:

Only some files are taken from python-bitcoinrpc, I think the python test-framework code was originally written by @gavinandresen (https://github.com/bitcoin/bitcoin/pull/4485). IMO we should remove the description for the test_framework folder itself.

MarcoFalke commented at 12:09 PM on November 19, 2015:

@jonasschnelli @jgarzik I think it's only authproxy.py

So I addressed that, I guess.

jonasschnelli added the label Tests on Nov 18, 2015
jgarzik commented at 7:31 PM on November 18, 2015: contributor

I'm happy to sync up, however, as @jonasschnelli says, only some of the files are from python-bitcoinrpc.

[qa] python-bitcoinrpc is no longer a subtree

* Only authproxy.py is taken from the python-bitcoinrpc

a0953cdf07

MarcoFalke force-pushed on Nov 19, 2015
jonasschnelli commented at 12:34 PM on November 19, 2015: contributor

ACK
fanquake commented at 12:39 PM on November 19, 2015: member

ACK

On Thursday, November 19, 2015, Jonas Schnelli notifications@github.com wrote:

ACK

— Reply to this email directly or view it on GitHub #7052 (comment).
laanwj commented at 8:29 AM on November 24, 2015: member

Right. What we use amounts to only one file (authproxy.py), and it is a very stable library, so it is easier to just copy it and make it part of the test framework than keep around a subtree. The subtree needed a circuitous work-around (updating sys.path) to use it in place.
laanwj merged this on Nov 24, 2015
laanwj closed this on Nov 24, 2015
laanwj referenced this in commit ed34e0577e on Nov 24, 2015
MarcoFalke deleted the branch on Nov 24, 2015
MarcoFalke locked this on Sep 8, 2021

Contributors

Labels

Linked (view graph)

#6097 [QA] restructure rpc tests directory