From 87b2a3de7dfe454739417cb092007fd54fa78f5a Mon Sep 17 00:00:00 2001 From: Jonathan Zernik Date: Sat, 18 Jul 2020 19:25:31 -0700 Subject: [PATCH] Format imports with isort in makefile (#84) --- Makefile | 1 + itests/test.py | 21 +++++------------- itests/util.py | 4 +--- setup.py | 3 +-- .../admin/squeak_admin_server_handler.py | 2 -- .../admin/squeak_admin_server_servicer.py | 5 +---- squeakserver/common/blockchain_client.py | 3 +-- squeakserver/node/block_info.py | 1 - .../node/squeak_block_periodic_worker.py | 1 - .../node/squeak_block_queue_worker.py | 1 - squeakserver/node/squeak_block_verifier.py | 1 - squeakserver/node/squeak_maker.py | 3 +-- squeakserver/node/squeak_node.py | 14 ++++++------ squeakserver/server/lightning_address.py | 1 - squeakserver/server/main.py | 22 +++++++++---------- squeakserver/server/postgres_db.py | 6 +---- squeakserver/server/squeak_profile.py | 1 - squeakserver/server/squeak_server_handler.py | 4 +--- squeakserver/server/squeak_server_servicer.py | 6 +---- squeakserver/server/squeak_validator.py | 5 +---- squeakserver/server/util.py | 1 - tests/server/conftest.py | 4 +--- tox.ini | 9 +++++++- 23 files changed, 43 insertions(+), 76 deletions(-) diff --git a/Makefile b/Makefile index ec1effed..49d242da 100644 --- a/Makefile +++ b/Makefile @@ -14,6 +14,7 @@ codeformat: # tox -e black tox -e autoflake tox -e autopep8 + tox -e isort itest: ./itests/run_itest.sh diff --git a/itests/test.py b/itests/test.py index cd346f59..a201c7a4 100644 --- a/itests/test.py +++ b/itests/test.py @@ -4,25 +4,16 @@ import logging import time import grpc - +from lnd_lightning_client import LNDLightningClient +from squeak.core import HASH_LENGTH, CheckSqueak, CSqueak, MakeSqueakFromStr +from squeak.core.encryption import CEncryptedDecryptionKey, generate_data_key +from squeak.core.signing import CSigningKey, CSqueakAddress from squeak.params import SelectParams -from squeak.core import CSqueak -from squeak.core import CheckSqueak -from squeak.core import HASH_LENGTH -from squeak.core import MakeSqueakFromStr -from squeak.core.encryption import CEncryptedDecryptionKey -from squeak.core.encryption import generate_data_key -from squeak.core.signing import CSigningKey -from squeak.core.signing import CSqueakAddress from proto import lnd_pb2 as ln from proto import lnd_pb2_grpc as lnrpc -from proto import squeak_server_pb2 -from proto import squeak_server_pb2_grpc -from proto import squeak_admin_pb2 -from proto import squeak_admin_pb2_grpc - -from lnd_lightning_client import LNDLightningClient +from proto import (squeak_admin_pb2, squeak_admin_pb2_grpc, squeak_server_pb2, + squeak_server_pb2_grpc) def build_squeak_msg(squeak): diff --git a/itests/util.py b/itests/util.py index 73f766a0..ff86acb1 100644 --- a/itests/util.py +++ b/itests/util.py @@ -1,9 +1,7 @@ import time - from bitcoin.core import lx -from squeak.core import HASH_LENGTH -from squeak.core import MakeSqueakFromStr +from squeak.core import HASH_LENGTH, MakeSqueakFromStr from squeak.core.signing import CSigningKey diff --git a/setup.py b/setup.py index c8d89099..147f7140 100644 --- a/setup.py +++ b/setup.py @@ -1,7 +1,6 @@ import io -from setuptools import find_packages -from setuptools import setup +from setuptools import find_packages, setup with io.open("README.md", "rt", encoding="utf8") as f: readme = f.read() diff --git a/squeakserver/admin/squeak_admin_server_handler.py b/squeakserver/admin/squeak_admin_server_handler.py index a4e7fa5d..79d7b3b8 100644 --- a/squeakserver/admin/squeak_admin_server_handler.py +++ b/squeakserver/admin/squeak_admin_server_handler.py @@ -1,10 +1,8 @@ import logging - from squeakserver.common.lnd_lightning_client import LNDLightningClient from squeakserver.node.squeak_node import SqueakNode - logger = logging.getLogger(__name__) diff --git a/squeakserver/admin/squeak_admin_server_servicer.py b/squeakserver/admin/squeak_admin_server_servicer.py index 686d72c5..6aa173e7 100644 --- a/squeakserver/admin/squeak_admin_server_servicer.py +++ b/squeakserver/admin/squeak_admin_server_servicer.py @@ -3,10 +3,7 @@ from concurrent import futures import grpc - -from proto import squeak_admin_pb2 -from proto import squeak_admin_pb2_grpc - +from proto import squeak_admin_pb2, squeak_admin_pb2_grpc logger = logging.getLogger(__name__) diff --git a/squeakserver/common/blockchain_client.py b/squeakserver/common/blockchain_client.py index c8a08ba7..c9293b4b 100644 --- a/squeakserver/common/blockchain_client.py +++ b/squeakserver/common/blockchain_client.py @@ -1,5 +1,4 @@ -from abc import ABC -from abc import abstractmethod +from abc import ABC, abstractmethod from typing import Optional diff --git a/squeakserver/node/block_info.py b/squeakserver/node/block_info.py index 4fbee54f..933efa87 100644 --- a/squeakserver/node/block_info.py +++ b/squeakserver/node/block_info.py @@ -1,4 +1,3 @@ from collections import namedtuple - BlockInfo = namedtuple('BlockInfo', 'block_hash, block_height') diff --git a/squeakserver/node/squeak_block_periodic_worker.py b/squeakserver/node/squeak_block_periodic_worker.py index 95cca033..2455bc1e 100644 --- a/squeakserver/node/squeak_block_periodic_worker.py +++ b/squeakserver/node/squeak_block_periodic_worker.py @@ -1,7 +1,6 @@ import logging import threading - logger = logging.getLogger(__name__) diff --git a/squeakserver/node/squeak_block_queue_worker.py b/squeakserver/node/squeak_block_queue_worker.py index 58cd41c2..ec1542d6 100644 --- a/squeakserver/node/squeak_block_queue_worker.py +++ b/squeakserver/node/squeak_block_queue_worker.py @@ -1,7 +1,6 @@ import logging import threading - logger = logging.getLogger(__name__) diff --git a/squeakserver/node/squeak_block_verifier.py b/squeakserver/node/squeak_block_verifier.py index 702fb17b..943726be 100644 --- a/squeakserver/node/squeak_block_verifier.py +++ b/squeakserver/node/squeak_block_verifier.py @@ -1,7 +1,6 @@ import logging import queue - logger = logging.getLogger(__name__) diff --git a/squeakserver/node/squeak_maker.py b/squeakserver/node/squeak_maker.py index 87aa1a61..945247ab 100644 --- a/squeakserver/node/squeak_maker.py +++ b/squeakserver/node/squeak_maker.py @@ -1,12 +1,11 @@ import logging import time -from squeak.core.signing import CSigningKey from squeak.core import MakeSqueakFromStr +from squeak.core.signing import CSigningKey from squeakserver.node.block_info import BlockInfo - logger = logging.getLogger(__name__) diff --git a/squeakserver/node/squeak_node.py b/squeakserver/node/squeak_node.py index 16c5bdd8..fc4eb7b9 100644 --- a/squeakserver/node/squeak_node.py +++ b/squeakserver/node/squeak_node.py @@ -1,15 +1,15 @@ -from squeak.core.signing import CSigningKey -from squeak.core.signing import CSqueakAddress -from squeak.core.encryption import generate_initialization_vector -from squeak.core.encryption import CEncryptedDecryptionKey +from squeak.core.encryption import (CEncryptedDecryptionKey, + generate_initialization_vector) +from squeak.core.signing import CSigningKey, CSqueakAddress -from squeakserver.node.squeak_block_verifier import SqueakBlockVerifier -from squeakserver.node.squeak_block_periodic_worker import SqueakBlockPeriodicWorker +from squeakserver.node.squeak_block_periodic_worker import \ + SqueakBlockPeriodicWorker from squeakserver.node.squeak_block_queue_worker import SqueakBlockQueueWorker +from squeakserver.node.squeak_block_verifier import SqueakBlockVerifier from squeakserver.node.squeak_maker import SqueakMaker from squeakserver.server.buy_offer import BuyOffer -from squeakserver.server.util import generate_offer_preimage from squeakserver.server.squeak_profile import SqueakProfile +from squeakserver.server.util import generate_offer_preimage class SqueakNode: diff --git a/squeakserver/server/lightning_address.py b/squeakserver/server/lightning_address.py index d1ae7be0..8d6450ef 100644 --- a/squeakserver/server/lightning_address.py +++ b/squeakserver/server/lightning_address.py @@ -1,4 +1,3 @@ from collections import namedtuple - LightningAddressHostPort = namedtuple('LightningAddress', ['host', 'port']) diff --git a/squeakserver/server/main.py b/squeakserver/server/main.py index f1a7b50c..8d8c8d5a 100644 --- a/squeakserver/server/main.py +++ b/squeakserver/server/main.py @@ -2,25 +2,25 @@ import argparse import logging import sys import threading - from configparser import ConfigParser from squeak.params import SelectParams import proto.lnd_pb2 as ln import proto.lnd_pb2_grpc as lnrpc - -from squeakserver.admin.squeak_admin_server_servicer import SqueakAdminServerServicer -from squeakserver.admin.squeak_admin_server_handler import SqueakAdminServerHandler +from squeakserver.admin.squeak_admin_server_handler import \ + SqueakAdminServerHandler +from squeakserver.admin.squeak_admin_server_servicer import \ + SqueakAdminServerServicer +from squeakserver.blockchain.bitcoin_blockchain_client import \ + BitcoinBlockchainClient from squeakserver.common.lnd_lightning_client import LNDLightningClient -from squeakserver.server.lightning_address import LightningAddressHostPort -from squeakserver.server.squeak_server_servicer import SqueakServerServicer -from squeakserver.server.squeak_server_handler import SqueakServerHandler -from squeakserver.server.db_params import parse_db_params -from squeakserver.server.postgres_db import PostgresDb -from squeakserver.blockchain.bitcoin_blockchain_client import BitcoinBlockchainClient from squeakserver.node.squeak_node import SqueakNode - +from squeakserver.server.db_params import parse_db_params +from squeakserver.server.lightning_address import LightningAddressHostPort +from squeakserver.server.postgres_db import PostgresDb +from squeakserver.server.squeak_server_handler import SqueakServerHandler +from squeakserver.server.squeak_server_servicer import SqueakServerServicer logger = logging.getLogger(__name__) diff --git a/squeakserver/server/postgres_db.py b/squeakserver/server/postgres_db.py index 50df33ee..a7f4deca 100644 --- a/squeakserver/server/postgres_db.py +++ b/squeakserver/server/postgres_db.py @@ -1,15 +1,11 @@ import logging - from contextlib import contextmanager from psycopg2 import pool - from squeak.core import CSqueak -from squeakserver.server.util import get_hash - from squeakserver.server.squeak_profile import SqueakProfile - +from squeakserver.server.util import get_hash logger = logging.getLogger(__name__) diff --git a/squeakserver/server/squeak_profile.py b/squeakserver/server/squeak_profile.py index fe67e50d..2fa6777f 100644 --- a/squeakserver/server/squeak_profile.py +++ b/squeakserver/server/squeak_profile.py @@ -1,5 +1,4 @@ from collections import namedtuple - SqueakProfile = namedtuple( 'SqueakProfile', 'profile_id, profile_name, private_key, address, sharing, following') diff --git a/squeakserver/server/squeak_server_handler.py b/squeakserver/server/squeak_server_handler.py index 97b33d65..42dd39ce 100644 --- a/squeakserver/server/squeak_server_handler.py +++ b/squeakserver/server/squeak_server_handler.py @@ -1,9 +1,7 @@ import logging - -from squeakserver.server.util import get_hash from squeakserver.node.squeak_node import SqueakNode - +from squeakserver.server.util import get_hash logger = logging.getLogger(__name__) diff --git a/squeakserver/server/squeak_server_servicer.py b/squeakserver/server/squeak_server_servicer.py index feea57c2..04254346 100644 --- a/squeakserver/server/squeak_server_servicer.py +++ b/squeakserver/server/squeak_server_servicer.py @@ -2,15 +2,11 @@ import logging from concurrent import futures import grpc - from squeak.core import CSqueak -from proto import squeak_server_pb2 -from proto import squeak_server_pb2_grpc - +from proto import squeak_server_pb2, squeak_server_pb2_grpc from squeakserver.server.util import get_hash - logger = logging.getLogger(__name__) diff --git a/squeakserver/server/squeak_validator.py b/squeakserver/server/squeak_validator.py index 7038d190..5f8673ab 100644 --- a/squeakserver/server/squeak_validator.py +++ b/squeakserver/server/squeak_validator.py @@ -1,9 +1,6 @@ import logging -from squeak.core import CheckSqueak -from squeak.core import CheckSqueakError -from squeak.core import CSqueak - +from squeak.core import CheckSqueak, CheckSqueakError, CSqueak logger = logging.getLogger(__name__) diff --git a/squeakserver/server/util.py b/squeakserver/server/util.py index 01521b05..89cafa66 100644 --- a/squeakserver/server/util.py +++ b/squeakserver/server/util.py @@ -1,6 +1,5 @@ import os - DATA_KEY_LENGTH = 32 diff --git a/tests/server/conftest.py b/tests/server/conftest.py index 120aa27d..5b58f351 100644 --- a/tests/server/conftest.py +++ b/tests/server/conftest.py @@ -1,10 +1,8 @@ import time import pytest - from bitcoin.core import lx -from squeak.core import HASH_LENGTH -from squeak.core import MakeSqueakFromStr +from squeak.core import HASH_LENGTH, MakeSqueakFromStr from squeak.core.signing import CSigningKey from squeakserver.server.squeak_validator import SqueakValidator diff --git a/tox.ini b/tox.ini index b5d37c72..0ac76d40 100644 --- a/tox.ini +++ b/tox.ini @@ -62,4 +62,11 @@ basepython = python3.8 deps = autoflake commands = - autoflake --in-place --recursive --remove-all-unused-imports . \ No newline at end of file + autoflake --in-place --recursive --remove-all-unused-imports . + +[testenv:isort] +basepython = python3.8 +deps = + isort +commands = + isort . \ No newline at end of file