Fix up flake8 issues, terminate tests on flake8 "analyze" target in GNU makefile

Author: pjkundert

.github/workflows/main.yml

@@ -35,7 +35,7 @@ jobs:
         python3 -m pip install -r requirements-tests.txt
     - name: Lint with flake8
       run: |
-        make analyze || true
+        make analyze
     - name: Test with pytest
       run: |
         make test

slip39/api.py

@@ -18,6 +18,9 @@
 import hdwallet
 from hdwallet		import cryptocurrencies
 
+from .defaults		import BITS_DEFAULT, BITS, MNEM_ROWS_COLS, GROUP_REQUIRED_RATIO, CRYPTO_PATHS
+from .util		import ordinal
+
 log				= logging.getLogger( __package__ )
 
 # Support for private key encryption via BIP-38 and Ethereum JSON wallet is optional; pip install slip39[wallet]
@@ -46,17 +49,13 @@
         log.exception( message )
     paper_wallet_issues.append( message )
 
-from .defaults		import BITS_DEFAULT, BITS, MNEM_ROWS_COLS, GROUP_REQUIRED_RATIO, CRYPTO_PATHS
-from .util		import ordinal
-
 
 RANDOM_BYTES			= secrets.token_bytes
 
 
-
 def paper_wallet_available():
     """Determine if encrypted BIP-38 and Ethereum JSON Paper Wallets are available."""
-    available			=  AES and scrypt and eth_account
+    available			= AES and scrypt and eth_account
     if not available:
         log.warning( f"Paper Wallets unavailable; perhaps run: 'python3 -m pip install slip39[gui,wallet]': {', '.join( paper_wallet_issues )}" )
     return available
@@ -161,7 +160,7 @@ class BinanceMainnet( cryptocurrencies.Cryptocurrency ):
     DEFAULT_PATH = f"m/44'/{str(COIN_TYPE)}/0'/0/0"
     WIF_SECRET_KEY = 0x80
 
-    
+
 class Account( hdwallet.HDWallet ):
 
     """Supports producing Legacy addresses for Bitcoin, and Litecoin.  Doge (D...) and Ethereum (0x...)
@@ -348,13 +347,13 @@ def wrapper( self, *args, **kwds ):
             symbol              = self.hdwallet._cryptocurrency.SYMBOL
             try:
                 self.hdwallet._cryptocurrency.SYMBOL \
-                                = self.CRYPTO_LOCAL_SYMBOL.get( symbol, symbol )
+                                = self.CRYPTO_LOCAL_SYMBOL.get( symbol, symbol )        # noqa: E126
                 return method( self, *args, **kwds )
             finally:
                 self.hdwallet._cryptocurrency.SYMBOL \
-                                = symbol
+                                = symbol						# noqa: E126
         return wrapper
- 
+
     @substitute_symbol
     def legacy_address( self ):
         return self.hdwallet.p2pkh_address()

slip39/generator/main.py

@@ -85,8 +85,8 @@ def main( argv=None ):
                      help="Use the supplied 128-, 256- or 512-bit hex value as the secret seed; '-' (default) reads it from stdin (eg. output from slip39.recover)" )
     ap.add_argument( '-f', '--format', action='append',
                      default=[],
-                     help=f"Specify crypto address formats: {', '.join( Account.FORMATS )}; default: " +', '.join(
-                         f'{c}:{Account.address_format(c)}' for c in Account.CRYPTO_NAMES.values()
+                     help=f"Specify crypto address formats: {', '.join( Account.FORMATS )}; default: " + ', '.join(
+                         f"{c}:{Account.address_format(c)}" for c in Account.CRYPTO_NAMES.values()
                      ))
     ap.add_argument( '-c', '--cryptocurrency', action='append',
                      default=[],

slip39/main.py

@@ -42,8 +42,8 @@ def main( argv=None ):
                      ))
     ap.add_argument( '-c', '--cryptocurrency', action='append',
                      default=[],
-                     help=f"A crypto name and optional derivation path (eg. '../<range>/<range>'); defaults: " + ', '.join(
-                         f'{c}:{Account.path_default(c)}' for c in Account.CRYPTO_NAMES.values()
+                     help="A crypto name and optional derivation path (eg. '../<range>/<range>'); defaults: " + ', '.join(
+                         f"{c}:{Account.path_default(c)}" for c in Account.CRYPTO_NAMES.values()
                      ))
     ap.add_argument( '-p', '--path',
                      default=None,