Merge pull request 'fix/xmllist-updates' (#4983) from fix/xmllist-updates into master

Reviewed-on: #4983

Dockerfile

@@ -29,6 +29,6 @@ RUN pip install -r /website-source/requirements.txt
 COPY . /website-source/
 WORKDIR /website-source
 
-ENTRYPOINT [ "bash", "./entrypoint.sh", "--full" ]
+ENTRYPOINT [ "bash", "./entrypoint.sh" ]
 
 

build/phase1/create_activities_file.py

@@ -11,14 +11,17 @@ from urllib.parse import urlparse
 
 logger = logging.getLogger(__name__)
 
-raw_url = urlparse("https://git.fsfe.org/FSFE/activities/raw/branch/master/activities.csv")
+raw_url = urlparse(
+    "https://git.fsfe.org/FSFE/activities/raw/branch/master/activities.csv"
+)
+
 
 def create_activities_file():
     git_token = os.environ.get("GIT_TOKEN")
     if git_token is None:
         logger.warn("GIT_TOKEN is not set, skipping generation of activities file")
         return
-    
+
     url = raw_url._replace(query=f"token={git_token}").geturl()
     r = requests.get(url)
 
@@ -40,11 +43,11 @@ def create_activities_file():
         activities += f'    <option value="{tag}||{description}"'
         if event:
             activities += f' data-event="{event}"'
-        
-        activities += '>'
+
+        activities += ">"
         activities += f"{tag} ({description})"
         activities += "</option>\n"
-    
+
     content = f"""<?xml version="1.0" encoding="UTF-8"?>
 
 <data>
@@ -58,5 +61,5 @@ def create_activities_file():
     activities_path = Path("global/data/modules/fsfe-activities-options.en.xml")
     with open(activities_path, "w") as f:
         f.write(content)
-    
-    logger.info(f"Wrote activity file to {str(activities_path)}")
+
+    logger.info(f"Wrote activity file to {str(activities_path)}")

build/phase1/update_localmenus.py

@@ -8,7 +8,7 @@ from pathlib import Path
 
 import lxml.etree as etree
 
-from build.lib.misc import get_basepath
+from build.lib.misc import get_basepath, update_if_changed
 
 logger = logging.getLogger(__name__)
 
@@ -71,7 +71,10 @@ def _write_localmenus(
                     ),
                 ).text = localmenu.text
 
-        page.getroottree().write(file, xml_declaration=True, encoding="utf-8")
+        update_if_changed(
+            file,
+            etree.tostring(page, encoding="utf-8").decode("utf-8"),
+        )
 
 
 def update_localmenus(languages: list[str], pool: multiprocessing.Pool) -> None:

build/phase1/update_xmllists.py

@@ -127,7 +127,7 @@ def _check_xmllist_deps(file: Path) -> None:
     xmls = set()
     with file.open(mode="r") as fileobj:
         for line in fileobj:
-            for newfile in Path("").glob(line + ".??.xml"):
+            for newfile in Path("").glob(line.strip() + ".??.xml"):
                 xmls.add(newfile)
     touch_if_newer_dep(file, list(xmls))
 

build/phase2/process_xhtml_files.py

@@ -36,7 +36,11 @@ def _process_dir(languages: list[str], target: Path, dir: Path) -> None:
                             else basename.with_suffix(".en.xhtml")
                         ),
                         processor,
-                        target_file.with_suffix("").with_suffix(".xmllist"),
+                        (
+                            source_file.parent.joinpath(
+                                "." + basename.name
+                            ).with_suffix(".xmllist")
+                        ),
                         Path(f"global/data/texts/.texts.{lang}.xml"),
                         Path(f"global/data/topbanner/.topbanner.{lang}.xml"),
                         Path("global/data/texts/texts.en.xml"),