From 5a1f551ce544aa879de3e51ad407c9b25e8edc65 Mon Sep 17 00:00:00 2001 From: Jack Robison Date: Fri, 24 Aug 2018 12:21:11 -0400 Subject: [PATCH] requirements and bytes/string --- lbrynet/lbry_file/client/EncryptedFileDownloader.py | 2 +- requirements.txt | 5 ++--- requirements_testing.txt | 2 +- setup.py | 7 ++++--- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/lbrynet/lbry_file/client/EncryptedFileDownloader.py b/lbrynet/lbry_file/client/EncryptedFileDownloader.py index e7a396a25..797e1c9b1 100644 --- a/lbrynet/lbry_file/client/EncryptedFileDownloader.py +++ b/lbrynet/lbry_file/client/EncryptedFileDownloader.py @@ -22,7 +22,7 @@ class EncryptedFileDownloader(CryptStreamDownloader): payment_rate_manager, wallet, key, stream_name) self.stream_hash = stream_hash self.storage = storage - self.file_name = os.path.basename(unhexlify(file_name)) + self.file_name = os.path.basename(unhexlify(file_name).decode()) self._calculated_total_bytes = None @defer.inlineCallbacks diff --git a/requirements.txt b/requirements.txt index cf473fea1..a8d87a846 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,10 +1,10 @@ certifi==2018.4.16 -Twisted==16.6.0 +Twisted==18.7.0'= cryptography==2.3 appdirs==1.4.3 argparse==1.2.1 docopt==0.6.2 -base58==0.2.2 +base58==1.0.0 colorama==0.3.7 dnspython==1.12.0 ecdsa==0.13 @@ -23,7 +23,6 @@ service_identity==16.0.0 six>=1.9.0 slowaes==0.1a1 txJSON-RPC==0.5 -zope.interface==4.3.3 treq==17.8.0 typing git+https://github.com/lbryio/torba.git#egg=torba diff --git a/requirements_testing.txt b/requirements_testing.txt index 100f5a8fd..c88f6d749 100644 --- a/requirements_testing.txt +++ b/requirements_testing.txt @@ -1,3 +1,3 @@ mock>=2.0,<3.0 -Faker==0.8 +Faker==0.8.17 git+https://github.com/lbryio/orchstr8.git#egg=orchstr8 diff --git a/setup.py b/setup.py index 95ff95ce2..a0cf7a8f9 100644 --- a/setup.py +++ b/setup.py @@ -23,10 +23,10 @@ setup( }, install_requires=[ 'aiohttp', - 'twisted[tls]>=18.7.0', + 'twisted[tls]==18.7.0', 'appdirs', 'distro', - 'base58', + 'base58==1.0.0', 'envparse', 'jsonrpc', 'cryptography', @@ -44,7 +44,8 @@ setup( extras_require={ 'test': ( 'mock>=2.0,<3.0', - 'faker==0.8.17' + 'faker==0.8.17', + 'orchstr8>=0.0.4' ) } )