Correct tabulate, ship fonts, further licensing tests

Author: pjkundert

GNUmakefile

@@ -41,7 +41,7 @@ else
 endif
 
 # To see all pytest output, uncomment --capture=no, ...
-PYTESTOPTS	= --capture=no --log-cli-level=5  # INFO
+PYTESTOPTS	= --capture=no --log-cli-level=WARNING
 
 PY3TEST		= $(PY3) -m pytest $(PYTESTOPTS)
 
@@ -709,7 +709,7 @@ upload-check:
 	    || ( echo -e "\n\n*** Missing Python modules; run:\n\n        $(PY3) -m pip install --upgrade twine\n" \
 	        && false )
 upload: 	upload-check wheel
-	python3 -m twine upload --repository pypi dist/slip39-$(VERSION)*
+	$(PY3) -m twine upload --repository pypi dist/slip39-$(VERSION)*
 
 clean:
 	@rm -rf MANIFEST *.png build dist auto *.egg-info $(shell find . -name '__pycache__' )

requirements-invoice.txt

@@ -2,9 +2,10 @@ eth-account		>=0.8.0,<0.9
 py-solc-x		>=1.1.1,<1.2
 pycryptodome		>=3.16,	<4 
 requests		>=2.20,	<3
+
 # Update to 0.9.1 w/ type deduction w/ missing/empty support
 #tabulate		>=0.9.1,<1
-git+https://github.com/pjkundert/python-tabulate@feature-empties#egg=tabulate
+
 dkimpy[ed25519]		>=1.0.5,<2
 
 # These versions are very brittle; must be upgraded in lock-step (see web3.py/setup.py)

requirements.txt

@@ -1,7 +1,7 @@
 base58			>=2.0.1,<3
 chacha20poly1305	>=0.0.3
 click			>=8.1.3,<9
-crypto-licensing	>=3.3.0,<4
+crypto-licensing	>=3.3.1,<4
 cx_Freeze		>=6.12		; sys_platform == "win32"
 fpdf2			>=2.5.7,<3
 hdwallet		>=2.2.1,<3

setup.py

@@ -163,12 +163,15 @@
 
 package_dir			= {
     "slip39":			"./slip39",
-    "slip39.layout":		"./slip39/layout",
+    "slip39.cli":		"./slip39/cli",
     "slip39.invoice":		"./slip39/invoice",
+    "slip39.layout":		"./slip39/layout",
+    "slip39.layout.font":	"./slip39/layout/font",
     "slip39.recovery":		"./slip39/recovery",
     "slip39.generator":		"./slip39/generator",
     "slip39.gui":		"./slip39/gui",
-    "slip39.cli":		"./slip39/cli",
+    # Until tabulate fixes empty cell type deduction, separators
+    "slip39.tabulate":		"./slip39/tabulate",
 }
 
 package_data			= {

slip39/communications.py

@@ -30,7 +30,9 @@
 from crypto_licensing.licensing import doh
 from email		import utils, message_from_file, message_from_string
 from email.mime		import multipart, text
-from tabulate		import tabulate
+
+#from tabulate		import tabulate
+from .tabulate		import tabulate
 
 from .util		import is_listlike, commas, uniq, log_cfg, log_level
 

slip39/invoice/artifact.py

@@ -28,7 +28,7 @@
 from calendar		import monthrange
 
 import fpdf
-import tabulate
+from ..			import tabulate
 
 from crypto_licensing.misc import get_localzone, Duration
 
@@ -51,7 +51,7 @@
 """
 log				= logging.getLogger( "artifact" )
 
-# Custom tabula1te format that provides "====" SEPARATING_LINE between line-items and totals
+# Custom tabulate format that provides "====" SEPARATING_LINE between line-items and totals
 tabulate._table_formats["totalize"] = tabulate.TableFormat(
     lineabove		= tabulate.Line("", "-", "  ", ""),
     linebelowheader	= tabulate.Line("", "-", "  ", ""),

slip39/invoice/artifact_test.py

@@ -8,7 +8,8 @@
 
 import pytest
 
-import tabulate
+#import tabulate
+from ..			import tabulate
 
 from crypto_licensing.misc import parse_datetime
 

slip39/invoice/multipayout.py

@@ -24,7 +24,9 @@
 from itertools		import count
 
 from web3		import Web3		# noqa F401
-from tabulate		import tabulate
+
+#from tabulate		import tabulate
+from ..tabulate		import tabulate
 
 from ..util		import remainder_after, fraction_allocated, commas
 from .ethereum		import Chain, Contract, contract_address  # noqa F401

slip39/invoice/payments_test.py

@@ -128,9 +128,9 @@ def test_grants( tmp_path ):
         [
             ( licensing.KeypairPlaintext( k ) if k else None, l )
             for k,l in licensing.authorized(
-                author	= author,
+                author		= author,
                 basename	= str( base_ss ),
-                confirm	= False,
+                confirm		= False,
                 registering	= False,
                 acquiring	= False,
                 keypairs	= [ keyp_cl_raw ],
@@ -180,8 +180,7 @@ def test_grants( tmp_path ):
         },
         null
     ]
-]
-"""
+]"""
 
     client			= licensing.Agent(
         name	= "Perry Kundert",