Some cleanup; upgrade docker OS.

lcnetdev · Apr 15, 2024 · cc11c89 · cc11c89
1 parent 6bcf7bd
commit cc11c89
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 19 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM python:3.10-slim-bullseye
+FROM python:3.10-slim-bookworm
 
 RUN apt update
 RUN apt install -y build-essential tzdata gfortran libopenblas-dev libboost-all-dev

diff --git a/scriptshifter/hooks/general/__init__.py b/scriptshifter/hooks/general/__init__.py
@@ -8,19 +8,6 @@
 from scriptshifter.trans import MULTI_WS_RE
 
 
-NORM_MAP = (
-    (" .", "."),
-    (" ;", ";"),
-    (" ,", ","),
-    ("( ", "("),
-    ("[ ", "["),
-    ("{ ", "{"),
-    (" )", ")"),
-    (" ]", "]"),
-    (" }", "}"),
-    ("- -", "--"),
-)
-
 NORM1_RE = compile(r"([.,;:\)\]}])\s")
 NORM2_RE = compile(r"(\S)([.,;:\)\]}])")
 NORM3_RE = compile(r"\s([\)\]\}])")
@@ -41,8 +28,4 @@ def normalize_spacing_post_assembly(ctx):
     norm = NORM3_RE.sub(r"\1", norm)
     norm = NORM4_RE.sub(r"\1 \2", norm)
 
-    # Normalize spacing around punctuation and parentheses.
-    for a, b in NORM_MAP:
-        norm = norm.replace(a, b)
-
     return norm
diff --git a/scriptshifter/tables/__init__.py b/scriptshifter/tables/__init__.py
@@ -28,7 +28,6 @@
 
 # Available hook names.
 HOOKS = (
-    "pre_config",
     "post_config",
     "post_normalize",
     "begin_input_token",