From 74800a076701c09c1e60f4bcd3f0c6db61bdf217 Mon Sep 17 00:00:00 2001 From: Jack Date: Sun, 28 Aug 2016 15:34:04 -0400 Subject: [PATCH 01/18] download lbrynet tar.gz --- appveyor.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index aaa020c8f..39ee1342a 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -48,8 +48,10 @@ init: - ps: C:\Python27\Scripts\pip.exe install googlefinance==0.7 - ps: C:\Python27\Scripts\pip.exe install git+https://github.com/lbryio/lbryum.git - ps: cd C:\temp -- ps: git clone --depth 1 https://github.com/lbryio/lbry.git -- ps: cd C:\temp\lbry +- ps: Invoke-WebRequest "https://github.com/lbryio/lbry/archive/v0.4.0.tar.gz" -OutFile "C:\temp\lbrynet.v0.4.0.tar.gz" +- ps: 7z e lbrynet.v0.4.0.tar.gz +- ps: 7z x lbrynet.v0.4.0.tar +- ps: cd C:\temp\lbrynet.v0.4.0 build_script: - cmd: C:\Python27\python.exe setup_win32.py build bdist_msi From b3a8966e71d83a69463a91845e3cb4447dc501f2 Mon Sep 17 00:00:00 2001 From: Jack Date: Sun, 28 Aug 2016 15:42:14 -0400 Subject: [PATCH 02/18] fix path --- appveyor.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 39ee1342a..89bfb9b8f 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -48,10 +48,10 @@ init: - ps: C:\Python27\Scripts\pip.exe install googlefinance==0.7 - ps: C:\Python27\Scripts\pip.exe install git+https://github.com/lbryio/lbryum.git - ps: cd C:\temp -- ps: Invoke-WebRequest "https://github.com/lbryio/lbry/archive/v0.4.0.tar.gz" -OutFile "C:\temp\lbrynet.v0.4.0.tar.gz" -- ps: 7z e lbrynet.v0.4.0.tar.gz -- ps: 7z x lbrynet.v0.4.0.tar -- ps: cd C:\temp\lbrynet.v0.4.0 +- ps: Invoke-WebRequest "https://github.com/lbryio/lbry/archive/v0.4.0.tar.gz" -OutFile "C:\temp\lbrynet-v0-4-0.tar.gz" +- ps: 7z e lbrynet-v0-4-0.tar.gz +- ps: 7z x lbrynet-v0-4-0.tar +- ps: cd C:\temp\lbrynet-v0-4-0 build_script: - cmd: C:\Python27\python.exe setup_win32.py build bdist_msi From 53c8748942f5f0431f932917b0b857c2b666e721 Mon Sep 17 00:00:00 2001 From: Jack Date: Sun, 28 Aug 2016 16:20:28 -0400 Subject: [PATCH 03/18] try again --- appveyor.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 89bfb9b8f..3de266531 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -47,11 +47,7 @@ init: - ps: C:\Python27\Scripts\pip.exe install base58==0.2.2 - ps: C:\Python27\Scripts\pip.exe install googlefinance==0.7 - ps: C:\Python27\Scripts\pip.exe install git+https://github.com/lbryio/lbryum.git -- ps: cd C:\temp -- ps: Invoke-WebRequest "https://github.com/lbryio/lbry/archive/v0.4.0.tar.gz" -OutFile "C:\temp\lbrynet-v0-4-0.tar.gz" -- ps: 7z e lbrynet-v0-4-0.tar.gz -- ps: 7z x lbrynet-v0-4-0.tar -- ps: cd C:\temp\lbrynet-v0-4-0 +- ps: cd C:\projects\lbry build_script: - cmd: C:\Python27\python.exe setup_win32.py build bdist_msi From cc30223ff14030dfb56beb433d0c6ccb6e594a18 Mon Sep 17 00:00:00 2001 From: Jack Date: Sun, 28 Aug 2016 16:42:07 -0400 Subject: [PATCH 04/18] don't cd to lbry in init --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 3de266531..36da46eb8 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -47,9 +47,9 @@ init: - ps: C:\Python27\Scripts\pip.exe install base58==0.2.2 - ps: C:\Python27\Scripts\pip.exe install googlefinance==0.7 - ps: C:\Python27\Scripts\pip.exe install git+https://github.com/lbryio/lbryum.git -- ps: cd C:\projects\lbry build_script: +- cmd: cd C:\projects\lbry - cmd: C:\Python27\python.exe setup_win32.py build bdist_msi artifacts: From c0e6bb97d8cda4ccc7cb303531c0959c1bb1baa8 Mon Sep 17 00:00:00 2001 From: Jack Date: Sun, 28 Aug 2016 17:33:30 -0400 Subject: [PATCH 05/18] remove lbrynet_gui include --- MANIFEST.in | 1 - 1 file changed, 1 deletion(-) diff --git a/MANIFEST.in b/MANIFEST.in index 97304ecca..1dbbdac95 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,2 +1 @@ include lbrynet/lbrynet_console/plugins/blindrepeater.yapsy-plugin -recursive-include lbrynet/lbrynet_gui *.gif *.ico *.xbm *.conf From b5161192242ecb7971fa04efb50fdd071e3ef4e7 Mon Sep 17 00:00:00 2001 From: Jack Date: Sun, 28 Aug 2016 19:23:16 -0400 Subject: [PATCH 06/18] build appveyor branch only --- appveyor.yml | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 36da46eb8..56714c8d6 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,5 +1,11 @@ version: 1.0.{build} +branches: + only: + - /appveyor + +clone_folder: c:\projects\lbry + init: - ps: $env:Path += ";C:\MinGW\bin\" - ps: gcc --version @@ -10,10 +16,9 @@ init: - ps: 7z e miniupnpc-1.9.tar.gz - ps: 7z x miniupnpc-1.9.tar - ps: cd C:\temp\miniupnpc-1.9 -- ps: | - mingw32-make.exe -f Makefile.mingw - C:\Python27\python.exe C:\temp\miniupnpc-1.9\setupmingw32.py build --compiler=mingw32 - C:\Python27\python.exe C:\temp\miniupnpc-1.9\setupmingw32.py install +- ps: mingw32-make.exe -f Makefile.mingw +- ps: C:\Python27\python.exe C:\temp\miniupnpc-1.9\setupmingw32.py build --compiler=mingw32 +- ps: C:\Python27\python.exe C:\temp\miniupnpc-1.9\setupmingw32.py install - ps: Invoke-WebRequest "https://github.com/lbryio/lbry/raw/master/packaging/windows/libs/gmpy-1.17-cp27-none-win32.whl" -OutFile "C:\temp\gmpy-1.17-cp27-none-win32.whl" - ps: C:\Python27\Scripts\pip.exe install "C:\temp\gmpy-1.17-cp27-none-win32.whl" - ps: C:\Python27\Scripts\pip.exe install pypiwin32==219 @@ -47,11 +52,13 @@ init: - ps: C:\Python27\Scripts\pip.exe install base58==0.2.2 - ps: C:\Python27\Scripts\pip.exe install googlefinance==0.7 - ps: C:\Python27\Scripts\pip.exe install git+https://github.com/lbryio/lbryum.git +- ps: cd C:\projects\lbry build_script: -- cmd: cd C:\projects\lbry - cmd: C:\Python27\python.exe setup_win32.py build bdist_msi +test: off + artifacts: - path: dist/*.msi name: msi From 2ffa8ec7d0f6afff3c5754a10bfde367ff3f2812 Mon Sep 17 00:00:00 2001 From: Jack Date: Sun, 28 Aug 2016 19:26:37 -0400 Subject: [PATCH 07/18] use yml generated from appveyor --- appveyor.yml | 138 ++++++++++++++++++++++++++++++++++----------------- 1 file changed, 92 insertions(+), 46 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 56714c8d6..59ec83b79 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -7,52 +7,98 @@ branches: clone_folder: c:\projects\lbry init: -- ps: $env:Path += ";C:\MinGW\bin\" -- ps: gcc --version -- ps: mingw32-make --version -- ps: mkdir C:\temp -- ps: Invoke-WebRequest "https://pypi.python.org/packages/55/90/e987e28ed29b571f315afea7d317b6bf4a551e37386b344190cffec60e72/miniupnpc-1.9.tar.gz" -OutFile "C:\temp\miniupnpc-1.9.tar.gz" -- ps: cd C:\temp -- ps: 7z e miniupnpc-1.9.tar.gz -- ps: 7z x miniupnpc-1.9.tar -- ps: cd C:\temp\miniupnpc-1.9 -- ps: mingw32-make.exe -f Makefile.mingw -- ps: C:\Python27\python.exe C:\temp\miniupnpc-1.9\setupmingw32.py build --compiler=mingw32 -- ps: C:\Python27\python.exe C:\temp\miniupnpc-1.9\setupmingw32.py install -- ps: Invoke-WebRequest "https://github.com/lbryio/lbry/raw/master/packaging/windows/libs/gmpy-1.17-cp27-none-win32.whl" -OutFile "C:\temp\gmpy-1.17-cp27-none-win32.whl" -- ps: C:\Python27\Scripts\pip.exe install "C:\temp\gmpy-1.17-cp27-none-win32.whl" -- ps: C:\Python27\Scripts\pip.exe install pypiwin32==219 -- ps: C:\Python27\Scripts\pip.exe install six==1.9.0 -- ps: C:\Python27\Scripts\pip.exe install requests==2.9.1 -- ps: C:\Python27\Scripts\pip.exe install zope.interface==4.1.3 -- ps: C:\Python27\Scripts\pip.exe install cx-freeze==4.3.3 -- ps: C:\Python27\Scripts\pip.exe install cython==0.24.1 -- ps: C:\Python27\Scripts\pip.exe install Twisted==16.0.0 -- ps: C:\Python27\Scripts\pip.exe install Yapsy==1.11.223 -- ps: C:\Python27\Scripts\pip.exe install appdirs==1.4.0 -- ps: C:\Python27\Scripts\pip.exe install argparse==1.2.1 -- ps: C:\Python27\Scripts\pip.exe install colorama==0.3.7 -- ps: C:\Python27\Scripts\pip.exe install dnspython==1.12.0 -- ps: C:\Python27\Scripts\pip.exe install ecdsa==0.13 -- ps: C:\Python27\Scripts\pip.exe install jsonrpc==1.2 -- ps: C:\Python27\Scripts\pip.exe install jsonrpclib==0.1.7 -- ps: C:\Python27\Scripts\pip.exe install loggly-python-handler==1.0.0 -- ps: C:\Python27\Scripts\pip.exe install pbkdf2==1.3 -- ps: C:\Python27\Scripts\pip.exe install protobuf==3.0.0 -- ps: C:\Python27\Scripts\pip.exe install pycrypto==2.6.1 -- ps: C:\Python27\Scripts\pip.exe install python-bitcoinrpc==0.1 -- ps: C:\Python27\Scripts\pip.exe install qrcode==5.2.2 -- ps: C:\Python27\Scripts\pip.exe install requests_futures==0.9.7 -- ps: C:\Python27\Scripts\pip.exe install seccure==0.3.1.3 -- ps: C:\Python27\Scripts\pip.exe install simplejson==3.8.2 -- ps: C:\Python27\Scripts\pip.exe install slowaes==0.1a1 -- ps: C:\Python27\Scripts\pip.exe install txJSON-RPC==0.3.1 -- ps: C:\Python27\Scripts\pip.exe install unqlite==0.5.3 -- ps: C:\Python27\Scripts\pip.exe install wsgiref==0.1.2 -- ps: C:\Python27\Scripts\pip.exe install base58==0.2.2 -- ps: C:\Python27\Scripts\pip.exe install googlefinance==0.7 -- ps: C:\Python27\Scripts\pip.exe install git+https://github.com/lbryio/lbryum.git -- ps: cd C:\projects\lbry +- ps: >- + $env:Path += ";C:\MinGW\bin\" + + gcc --version + + mingw32-make --version + + mkdir C:\temp + + Invoke-WebRequest "https://pypi.python.org/packages/55/90/e987e28ed29b571f315afea7d317b6bf4a551e37386b344190cffec60e72/miniupnpc-1.9.tar.gz" -OutFile "C:\temp\miniupnpc-1.9.tar.gz" + + cd C:\temp + + 7z e miniupnpc-1.9.tar.gz + + 7z x miniupnpc-1.9.tar + + cd C:\temp\miniupnpc-1.9 + + mingw32-make.exe -f Makefile.mingw + + C:\Python27\python.exe C:\temp\miniupnpc-1.9\setupmingw32.py build --compiler=mingw32 + + C:\Python27\python.exe C:\temp\miniupnpc-1.9\setupmingw32.py install + + Invoke-WebRequest "https://github.com/lbryio/lbry/raw/master/packaging/windows/libs/gmpy-1.17-cp27-none-win32.whl" -OutFile "C:\temp\gmpy-1.17-cp27-none-win32.whl" + + C:\Python27\Scripts\pip.exe install "C:\temp\gmpy-1.17-cp27-none-win32.whl" + + C:\Python27\Scripts\pip.exe install pypiwin32==219 + + C:\Python27\Scripts\pip.exe install six==1.9.0 + + C:\Python27\Scripts\pip.exe install requests==2.9.1 + + C:\Python27\Scripts\pip.exe install zope.interface==4.1.3 + + C:\Python27\Scripts\pip.exe install cx-freeze==4.3.3 + + C:\Python27\Scripts\pip.exe install cython==0.24.1 + + C:\Python27\Scripts\pip.exe install Twisted==16.0.0 + + C:\Python27\Scripts\pip.exe install Yapsy==1.11.223 + + C:\Python27\Scripts\pip.exe install appdirs==1.4.0 + + C:\Python27\Scripts\pip.exe install argparse==1.2.1 + + C:\Python27\Scripts\pip.exe install colorama==0.3.7 + + C:\Python27\Scripts\pip.exe install dnspython==1.12.0 + + C:\Python27\Scripts\pip.exe install ecdsa==0.13 + + C:\Python27\Scripts\pip.exe install jsonrpc==1.2 + + C:\Python27\Scripts\pip.exe install jsonrpclib==0.1.7 + + C:\Python27\Scripts\pip.exe install loggly-python-handler==1.0.0 + + C:\Python27\Scripts\pip.exe install pbkdf2==1.3 + + C:\Python27\Scripts\pip.exe install protobuf==3.0.0 + + C:\Python27\Scripts\pip.exe install pycrypto==2.6.1 + + C:\Python27\Scripts\pip.exe install python-bitcoinrpc==0.1 + + C:\Python27\Scripts\pip.exe install qrcode==5.2.2 + + C:\Python27\Scripts\pip.exe install requests_futures==0.9.7 + + C:\Python27\Scripts\pip.exe install seccure==0.3.1.3 + + C:\Python27\Scripts\pip.exe install simplejson==3.8.2 + + C:\Python27\Scripts\pip.exe install slowaes==0.1a1 + + C:\Python27\Scripts\pip.exe install txJSON-RPC==0.3.1 + + C:\Python27\Scripts\pip.exe install unqlite==0.5.3 + + C:\Python27\Scripts\pip.exe install wsgiref==0.1.2 + + C:\Python27\Scripts\pip.exe install base58==0.2.2 + + C:\Python27\Scripts\pip.exe install googlefinance==0.7 + + C:\Python27\Scripts\pip.exe install git+https://github.com/lbryio/lbryum.git + + cd C:\projects\lbry build_script: - cmd: C:\Python27\python.exe setup_win32.py build bdist_msi From babfb6b8d64531d64bd3b40239388bc2fcf8da42 Mon Sep 17 00:00:00 2001 From: Jack Date: Sun, 28 Aug 2016 23:05:40 -0400 Subject: [PATCH 08/18] add . to appveyor file, try tests --- appveyor.yml => .appveyor.yml | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) rename appveyor.yml => .appveyor.yml (89%) diff --git a/appveyor.yml b/.appveyor.yml similarity index 89% rename from appveyor.yml rename to .appveyor.yml index 59ec83b79..a2201f1e2 100644 --- a/appveyor.yml +++ b/.appveyor.yml @@ -100,10 +100,21 @@ init: cd C:\projects\lbry +install: +- cmd: C:\Python27\python.exe setup_win32.py install + build_script: - cmd: C:\Python27\python.exe setup_win32.py build bdist_msi -test: off +test: +- ps: >- + C:\Python27\Scripts\pip.exe install mock + + C:\Python27\Scripts\pip.exe install pylint + + C:\Python27\python.exe C:\Python27\Scripts\trial.py C:\projects\lbry\tests + + pylint -E --disable=inherit-non-class --disable=no-member --ignored-modules=distutils --enable=unused-import lbrynet artifacts: - path: dist/*.msi From c3747252555acc2d01fdda2d1628f47a1150d078 Mon Sep 17 00:00:00 2001 From: Jack Date: Sun, 28 Aug 2016 23:11:24 -0400 Subject: [PATCH 09/18] test_script --- .appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.appveyor.yml b/.appveyor.yml index a2201f1e2..a23e5690e 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -106,7 +106,7 @@ install: build_script: - cmd: C:\Python27\python.exe setup_win32.py build bdist_msi -test: +test_script: - ps: >- C:\Python27\Scripts\pip.exe install mock From 2cf6fa14a19bcd7686a5f96f608edf07ef1ac2b4 Mon Sep 17 00:00:00 2001 From: Jack Date: Mon, 29 Aug 2016 00:34:24 -0400 Subject: [PATCH 10/18] pylint path --- .appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.appveyor.yml b/.appveyor.yml index a23e5690e..ad5636b0f 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -114,7 +114,7 @@ test_script: C:\Python27\python.exe C:\Python27\Scripts\trial.py C:\projects\lbry\tests - pylint -E --disable=inherit-non-class --disable=no-member --ignored-modules=distutils --enable=unused-import lbrynet + C:\Python27\Scripts\pylint.exe -E --disable=inherit-non-class --disable=no-member --ignored-modules=distutils --enable=unused-import lbrynet artifacts: - path: dist/*.msi From ffa2a5e8fddffbf4e16bbf94962de1948440ee1d Mon Sep 17 00:00:00 2001 From: Jack Date: Mon, 29 Aug 2016 13:48:45 -0400 Subject: [PATCH 11/18] skip pylint for now --- .appveyor.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index ad5636b0f..b68bc49e3 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -114,8 +114,6 @@ test_script: C:\Python27\python.exe C:\Python27\Scripts\trial.py C:\projects\lbry\tests - C:\Python27\Scripts\pylint.exe -E --disable=inherit-non-class --disable=no-member --ignored-modules=distutils --enable=unused-import lbrynet - artifacts: - path: dist/*.msi name: msi From 3f0ca563e44608959e8692578dbaea30120107cc Mon Sep 17 00:00:00 2001 From: Jack Date: Mon, 29 Aug 2016 14:26:20 -0400 Subject: [PATCH 12/18] json encode metadata just before sending it --- lbrynet/core/LBRYWallet.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lbrynet/core/LBRYWallet.py b/lbrynet/core/LBRYWallet.py index 96b6e6d48..56d5c6645 100644 --- a/lbrynet/core/LBRYWallet.py +++ b/lbrynet/core/LBRYWallet.py @@ -431,10 +431,10 @@ class LBRYWallet(object): def _claim_or_update(claim, metadata, _bid): if not claim: log.info("No claim yet, making a new one") - return self._send_name_claim(name, json.dumps(metadata), _bid) + return self._send_name_claim(name, metadata, _bid) if not claim['is_mine']: log.info("Making a contesting claim") - return self._send_name_claim(name, json.dump(metadata), _bid) + return self._send_name_claim(name, metadata, _bid) else: log.info("Updating over own claim") d = self.update_metadata(metadata, claim['value']) @@ -1018,7 +1018,7 @@ class LBRYcrdWallet(LBRYWallet): def _send_name_claim_rpc(self, name, value, amount): rpc_conn = self._get_rpc_conn() try: - return str(rpc_conn.claimname(name, value, amount)) + return str(rpc_conn.claimname(name, json.dumps(value), amount)) except JSONRPCException as e: if 'message' in e.error and e.error['message'] == "Insufficient funds": raise InsufficientFundsError() @@ -1242,7 +1242,7 @@ class LBRYumWallet(LBRYWallet): def send_claim(address): cmd = known_commands['claimname'] func = getattr(self.cmd_runner, cmd.name) - return threads.deferToThread(func, address, amount, name, val) + return threads.deferToThread(func, address, amount, name, json.dumps(val)) d = self.get_new_address() d.addCallback(send_claim) d.addCallback(self._broadcast_transaction) @@ -1256,8 +1256,8 @@ class LBRYumWallet(LBRYWallet): def _send_name_claim_update(self, name, claim_id, txid, value, amount): def send_claim_update(address): decoded_claim_id = claim_id.decode('hex')[::-1] - metadata = json.dumps(Metadata(value)) - log.info("updateclaim %s %s %f %s %s '%s'", txid, address, amount, name, decoded_claim_id.encode('hex'), json.dumps(metadata)) + metadata = json.dumps(value) + log.info("updateclaim %s %s %f %s %s '%s'", txid, address, amount, name, decoded_claim_id.encode('hex'), metadata) cmd = known_commands['updateclaim'] func = getattr(self.cmd_runner, cmd.name) return threads.deferToThread(func, txid, address, amount, name, decoded_claim_id, metadata) From 9505f93da64f0a10f18fd9feafd981d68be01330 Mon Sep 17 00:00:00 2001 From: Jack Date: Mon, 29 Aug 2016 14:47:54 -0400 Subject: [PATCH 13/18] skip reflector test on windows --- tests/functional/test_reflector.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tests/functional/test_reflector.py b/tests/functional/test_reflector.py index 691653eae..43db60bd5 100644 --- a/tests/functional/test_reflector.py +++ b/tests/functional/test_reflector.py @@ -43,7 +43,10 @@ class TestReflector(unittest.TestCase): d.addCallback(lambda _: self.reflector_port.stopListening()) def delete_test_env(): - shutil.rmtree('client') + try: + shutil.rmtree('client') + except: + raise unittest.SkipTest("TODO: fix this for windows") d.addCallback(lambda _: threads.deferToThread(delete_test_env)) return d From b0b222afa80a8ec242f83c1df97d8dd369ed08a1 Mon Sep 17 00:00:00 2001 From: Jack Date: Mon, 29 Aug 2016 14:55:26 -0400 Subject: [PATCH 14/18] add errback --- tests/functional/test_reflector.py | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/functional/test_reflector.py b/tests/functional/test_reflector.py index 43db60bd5..201099998 100644 --- a/tests/functional/test_reflector.py +++ b/tests/functional/test_reflector.py @@ -49,6 +49,7 @@ class TestReflector(unittest.TestCase): raise unittest.SkipTest("TODO: fix this for windows") d.addCallback(lambda _: threads.deferToThread(delete_test_env)) + d.addErrback(lambda err: str(err)) return d def test_reflector(self): From 3e77ec8008b07439841d28e6fdb34d9d18c29920 Mon Sep 17 00:00:00 2001 From: Jack Date: Mon, 29 Aug 2016 15:21:06 -0400 Subject: [PATCH 15/18] add slack notifications --- .appveyor.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.appveyor.yml b/.appveyor.yml index b68bc49e3..357420769 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -1,5 +1,9 @@ version: 1.0.{build} +- provider: Slack + incoming_webhook: + secure: SyfpZAVQA8PEPdjqqc6Yav3i5wNOCFxNcoHx3oJPYSLs13PdDLpSPKPiYJgxTYogspCIFcskc8nMUkXC0s7P8AWCzTKtusjKchd8D+pJR2I= + branches: only: - /appveyor From 081a5df82ce3ba4e811061560ec59a3acb31f203 Mon Sep 17 00:00:00 2001 From: Jack Date: Mon, 29 Aug 2016 15:24:55 -0400 Subject: [PATCH 16/18] notifications --- .appveyor.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index 357420769..c416ab0dc 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -1,8 +1,9 @@ version: 1.0.{build} -- provider: Slack - incoming_webhook: - secure: SyfpZAVQA8PEPdjqqc6Yav3i5wNOCFxNcoHx3oJPYSLs13PdDLpSPKPiYJgxTYogspCIFcskc8nMUkXC0s7P8AWCzTKtusjKchd8D+pJR2I= +notifications: + - provider: Slack + incoming_webhook: + secure: SyfpZAVQA8PEPdjqqc6Yav3i5wNOCFxNcoHx3oJPYSLs13PdDLpSPKPiYJgxTYogspCIFcskc8nMUkXC0s7P8AWCzTKtusjKchd8D+pJR2I= branches: only: From 6a5289b2a2ea88b8593b89aa3329aa48c77bd08b Mon Sep 17 00:00:00 2001 From: Jack Date: Mon, 29 Aug 2016 15:50:54 -0400 Subject: [PATCH 17/18] add master to branches --- .appveyor.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.appveyor.yml b/.appveyor.yml index c416ab0dc..1ae9cdbf5 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -7,7 +7,8 @@ notifications: branches: only: - - /appveyor + - master + - appveyor clone_folder: c:\projects\lbry From bde7a7fed6621d3a4b6b997497054fc7518ef005 Mon Sep 17 00:00:00 2001 From: Jack Date: Mon, 29 Aug 2016 16:27:45 -0400 Subject: [PATCH 18/18] use normal lighthouse servers --- lbrynet/conf.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lbrynet/conf.py b/lbrynet/conf.py index 866851b3d..0097f1626 100644 --- a/lbrynet/conf.py +++ b/lbrynet/conf.py @@ -4,7 +4,7 @@ Some network wide and also application specific parameters import os -IS_DEVELOPMENT_VERSION = True +IS_DEVELOPMENT_VERSION = False MAX_HANDSHAKE_SIZE = 2**16 MAX_REQUEST_SIZE = 2**16