Drop deprecated ngon parsing and fix json maintenance

flatsurvey/cache/externalize_pickles.py

@@ -41,7 +41,12 @@ def __init__(self, jsons, in_place, pickle_dir, report):
     @click.command(name="externalize-pickles")
     @click.argument("jsons", nargs=-1)
     @click.option("--inplace", default=False, is_flag=True)
-    @click.option("--pickles", type=click.Path(exists=True), help="output directory")
+    @click.option(
+        "--pickles",
+        required=True,
+        type=click.Path(exists=True),
+        help="output directory",
+    )
     def click(jsons, inplace, pickles):
         return {
             "goals": [ExternalizePickles],
@@ -58,10 +63,16 @@ def externalize(json):
                 if "pickle" in json:
                     value = json["pickle"]
 
+                    import base64
+
+                    value = base64.decodebytes(value.encode("ascii"))
+
                     if len(value) > 128:
-                        import hashlib
+                        from hashlib import sha256
 
-                        hash = hashlib.md5(value.encode("utf-8")).hexdigest()
+                        sha = sha256()
+                        sha.update(value)
+                        hash = sha.hexdigest()
 
                         import os.path
 
@@ -70,7 +81,7 @@ def externalize(json):
                         import gzip
 
                         with gzip.open(fname, mode="w") as compressed:
-                            compressed.write(value.encode("ascii"))
+                            compressed.write(value)
 
                         json["pickle"] = hash
 

flatsurvey/reporting/progress.py

@@ -38,6 +38,9 @@
 from flatsurvey.ui.group import GroupedCommand
 
 
+# TODO: This segfaults with recent versions of SageMath. PARI is not
+# thread or fork-safe in the way SageMath uses it, so threading out seems to
+# break things.
 class Progress(Reporter, Command):
     r"""
     Reports progress on the command line.