Moved non-integrated parts out of main source tree

pyproject.toml

@@ -12,6 +12,8 @@ packages = [
 
 [tool.poetry.scripts]
 macrogen = 'macrogen.main:main'
+witness-report = 'macrogen.uris:_witness_report'
+
 
 [tool.poetry.dependencies]
 python = "^3.7"

src/macrogen/uris.py

@@ -2,9 +2,6 @@
 """
 Handle URIs and the objects they point to
 """
-from pathlib import Path
-
-import codecs
 import csv
 import json
 import re
@@ -13,6 +10,7 @@
 from functools import wraps, total_ordering
 from operator import itemgetter
 from os.path import commonprefix
+from pathlib import Path
 from typing import Tuple
 
 import pandas as pd
@@ -381,7 +379,7 @@ def sigil_sort_key(self) -> Tuple[str, int, str]:
         match = re.match(r'^([12]?\s*[IV]{0,3}\s*[^0-9]+)(\d*)(.*)$', self.sigil)
         if match is None:
             logger.warning("Failed to split sigil %s", self.sigil)
-            return [self.sigil, 99999, ""];
+            return (self.sigil, 99999, "")
         split = list(match.groups())
 
         if split[0] == "H P":  # Paraliponemon

tests/skiptest_dates.py

@@ -5,8 +5,8 @@
 
 pytestmark = pytest.mark.skip()
 
-from macrogen.dates import collect_wiki_dates, TimeSpan
-from macrogen import dates
+from util_scripts.dates import collect_wiki_dates, TimeSpan
+from util_scripts import dates
 
 
 @pytest.mark.parametrize("string, parsed", [

src/macrogen/dates.py → util_scripts/dates.py

@@ -17,7 +17,7 @@
 
 import faust
 from attic.graph import AbsoluteDating
-from .uris import Witness
+from macrogen.uris import Witness
 
 
 class TimeSpan(object):