Merge pull request #70 from lbryio/update-aiohttp

update aiohttp and astroid requirements
This commit is contained in:
Jack Robison 2019-02-28 12:17:08 -05:00 committed by GitHub
commit 3a1cd8985c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 4 additions and 6 deletions

View file

@ -9,8 +9,6 @@ jobs:
- stage: code quality
name: "pylint & mypy"
install:
- pip install astroid==2.0.4
# newer astroid and aiohttp fails in pylint so we pre-install older version
- pip install pylint mypy
- pip install -e .
script:

View file

@ -9,7 +9,7 @@ with open(os.path.join(BASE, 'README.md'), encoding='utf-8') as fh:
long_description = fh.read()
REQUIRES = [
'aiohttp==3.4.4', # more recent version of aiohttp break with pylint/astroid
'aiohttp==3.5.4',
'cffi==1.12.1', # TODO: 1.12.2 fails on travis in wine
'coincurve==11.0.0',
'pbkdf2==1.3',

View file

@ -350,7 +350,7 @@ class BaseTransaction:
"Cannot access net_account_balance if inputs/outputs do not "
"have is_my_account set properly."
)
elif txi.is_my_account:
if txi.is_my_account:
balance -= txi.amount
for txo in self.outputs:
if txo.is_my_account is None:
@ -358,7 +358,7 @@ class BaseTransaction:
"Cannot access net_account_balance if inputs/outputs do not "
"have is_my_account set properly."
)
elif txo.is_my_account:
if txo.is_my_account:
balance += txo.amount
return balance

View file

@ -243,7 +243,7 @@ class BlockchainProcess(asyncio.SubprocessProtocol):
if b'Error:' in data:
self.ready.set()
raise SystemError(data.decode())
elif b'Done loading' in data:
if b'Done loading' in data:
self.ready.set()
def process_exited(self):