From 6be2a62421da2cef8bae42a6f304728d71b4a0d8 Mon Sep 17 00:00:00 2001 From: Darragh Elliott Date: Wed, 20 Aug 2025 16:10:34 +0000 Subject: [PATCH] build: move python source into subfolder to more properly deliniate rename from just build, to be more informative --- build/{ => fsfe_website_build}/__init__.py | 0 build/{ => fsfe_website_build}/build.py | 0 build/{ => fsfe_website_build}/lib/__init__.py | 0 build/{ => fsfe_website_build}/lib/misc.py | 0 build/{ => fsfe_website_build}/lib/process_file.py | 2 +- build/{ => fsfe_website_build}/phase0/full.py | 2 +- build/{ => fsfe_website_build}/phase0/global_symlinks.py | 0 .../phase0/prepare_early_subdirectories.py | 0 build/{ => fsfe_website_build}/phase1/__init__.py | 0 build/{ => fsfe_website_build}/phase1/index_website.py | 2 +- .../phase1/prepare_subdirectories.py | 0 build/{ => fsfe_website_build}/phase1/run.py | 0 build/{ => fsfe_website_build}/phase1/update_css.py | 2 +- .../{ => fsfe_website_build}/phase1/update_defaultxsls.py | 0 .../{ => fsfe_website_build}/phase1/update_localmenus.py | 2 +- .../{ => fsfe_website_build}/phase1/update_stylesheets.py | 2 +- build/{ => fsfe_website_build}/phase1/update_tags.py | 2 +- build/{ => fsfe_website_build}/phase1/update_xmllists.py | 2 +- build/{ => fsfe_website_build}/phase2/__init__.py | 0 build/{ => fsfe_website_build}/phase2/copy_files.py | 0 .../phase2/create_index_symlinks.py | 2 +- .../phase2/create_language_symlinks.py | 0 build/{ => fsfe_website_build}/phase2/process_files.py | 4 ++-- build/{ => fsfe_website_build}/phase2/run.py | 0 build/{ => fsfe_website_build}/phase3/__init__.py | 0 build/{ => fsfe_website_build}/phase3/serve_websites.py | 0 build/{ => fsfe_website_build}/phase3/stage_to_target.py | 2 +- fsfe.org/internal/subdir.py | 3 +-- fsfe.org/news/subdir.py | 3 +-- pyproject.toml | 8 ++++---- status.fsfe.org/filler/early_subdir.py | 3 +-- status.fsfe.org/translations/subdir.py | 8 ++++++-- 32 files changed, 25 insertions(+), 24 deletions(-) rename build/{ => fsfe_website_build}/__init__.py (100%) rename build/{ => fsfe_website_build}/build.py (100%) rename build/{ => fsfe_website_build}/lib/__init__.py (100%) rename build/{ => fsfe_website_build}/lib/misc.py (100%) rename build/{ => fsfe_website_build}/lib/process_file.py (98%) rename build/{ => fsfe_website_build}/phase0/full.py (91%) rename build/{ => fsfe_website_build}/phase0/global_symlinks.py (100%) rename build/{ => fsfe_website_build}/phase0/prepare_early_subdirectories.py (100%) rename build/{ => fsfe_website_build}/phase1/__init__.py (100%) rename build/{ => fsfe_website_build}/phase1/index_website.py (98%) rename build/{ => fsfe_website_build}/phase1/prepare_subdirectories.py (100%) rename build/{ => fsfe_website_build}/phase1/run.py (100%) rename build/{ => fsfe_website_build}/phase1/update_css.py (95%) rename build/{ => fsfe_website_build}/phase1/update_defaultxsls.py (100%) rename build/{ => fsfe_website_build}/phase1/update_localmenus.py (98%) rename build/{ => fsfe_website_build}/phase1/update_stylesheets.py (96%) rename build/{ => fsfe_website_build}/phase1/update_tags.py (99%) rename build/{ => fsfe_website_build}/phase1/update_xmllists.py (99%) rename build/{ => fsfe_website_build}/phase2/__init__.py (100%) rename build/{ => fsfe_website_build}/phase2/copy_files.py (100%) rename build/{ => fsfe_website_build}/phase2/create_index_symlinks.py (94%) rename build/{ => fsfe_website_build}/phase2/create_language_symlinks.py (100%) rename build/{ => fsfe_website_build}/phase2/process_files.py (97%) rename build/{ => fsfe_website_build}/phase2/run.py (100%) rename build/{ => fsfe_website_build}/phase3/__init__.py (100%) rename build/{ => fsfe_website_build}/phase3/serve_websites.py (100%) rename build/{ => fsfe_website_build}/phase3/stage_to_target.py (96%) diff --git a/build/__init__.py b/build/fsfe_website_build/__init__.py similarity index 100% rename from build/__init__.py rename to build/fsfe_website_build/__init__.py diff --git a/build/build.py b/build/fsfe_website_build/build.py similarity index 100% rename from build/build.py rename to build/fsfe_website_build/build.py diff --git a/build/lib/__init__.py b/build/fsfe_website_build/lib/__init__.py similarity index 100% rename from build/lib/__init__.py rename to build/fsfe_website_build/lib/__init__.py diff --git a/build/lib/misc.py b/build/fsfe_website_build/lib/misc.py similarity index 100% rename from build/lib/misc.py rename to build/fsfe_website_build/lib/misc.py diff --git a/build/lib/process_file.py b/build/fsfe_website_build/lib/process_file.py similarity index 98% rename from build/lib/process_file.py rename to build/fsfe_website_build/lib/process_file.py index dd0ba16997..fdb7adf6ef 100644 --- a/build/lib/process_file.py +++ b/build/fsfe_website_build/lib/process_file.py @@ -9,7 +9,7 @@ from pathlib import Path import lxml.etree as etree -from build.lib.misc import get_basename, get_version, lang_from_filename +from fsfe_website_build.lib.misc import get_basename, get_version, lang_from_filename logger = logging.getLogger(__name__) diff --git a/build/phase0/full.py b/build/fsfe_website_build/phase0/full.py similarity index 91% rename from build/phase0/full.py rename to build/fsfe_website_build/phase0/full.py index 4832dc1bc5..7d8fa01466 100644 --- a/build/phase0/full.py +++ b/build/fsfe_website_build/phase0/full.py @@ -4,7 +4,7 @@ import logging -from build.lib.misc import run_command +from fsfe_website_build.lib.misc import run_command logger = logging.getLogger(__name__) diff --git a/build/phase0/global_symlinks.py b/build/fsfe_website_build/phase0/global_symlinks.py similarity index 100% rename from build/phase0/global_symlinks.py rename to build/fsfe_website_build/phase0/global_symlinks.py diff --git a/build/phase0/prepare_early_subdirectories.py b/build/fsfe_website_build/phase0/prepare_early_subdirectories.py similarity index 100% rename from build/phase0/prepare_early_subdirectories.py rename to build/fsfe_website_build/phase0/prepare_early_subdirectories.py diff --git a/build/phase1/__init__.py b/build/fsfe_website_build/phase1/__init__.py similarity index 100% rename from build/phase1/__init__.py rename to build/fsfe_website_build/phase1/__init__.py diff --git a/build/phase1/index_website.py b/build/fsfe_website_build/phase1/index_website.py similarity index 98% rename from build/phase1/index_website.py rename to build/fsfe_website_build/phase1/index_website.py index 67603b59fe..9142fd1036 100644 --- a/build/phase1/index_website.py +++ b/build/fsfe_website_build/phase1/index_website.py @@ -14,7 +14,7 @@ import lxml.etree as etree import nltk from nltk.corpus import stopwords as nltk_stopwords -from build.lib.misc import update_if_changed +from fsfe_website_build.lib.misc import update_if_changed logger = logging.getLogger(__name__) diff --git a/build/phase1/prepare_subdirectories.py b/build/fsfe_website_build/phase1/prepare_subdirectories.py similarity index 100% rename from build/phase1/prepare_subdirectories.py rename to build/fsfe_website_build/phase1/prepare_subdirectories.py diff --git a/build/phase1/run.py b/build/fsfe_website_build/phase1/run.py similarity index 100% rename from build/phase1/run.py rename to build/fsfe_website_build/phase1/run.py diff --git a/build/phase1/update_css.py b/build/fsfe_website_build/phase1/update_css.py similarity index 95% rename from build/phase1/update_css.py rename to build/fsfe_website_build/phase1/update_css.py index cdebc1da3d..94f51d0eae 100644 --- a/build/phase1/update_css.py +++ b/build/fsfe_website_build/phase1/update_css.py @@ -7,7 +7,7 @@ from pathlib import Path import minify -from build.lib.misc import run_command, update_if_changed +from fsfe_website_build.lib.misc import run_command, update_if_changed logger = logging.getLogger(__name__) diff --git a/build/phase1/update_defaultxsls.py b/build/fsfe_website_build/phase1/update_defaultxsls.py similarity index 100% rename from build/phase1/update_defaultxsls.py rename to build/fsfe_website_build/phase1/update_defaultxsls.py diff --git a/build/phase1/update_localmenus.py b/build/fsfe_website_build/phase1/update_localmenus.py similarity index 98% rename from build/phase1/update_localmenus.py rename to build/fsfe_website_build/phase1/update_localmenus.py index f0e60f28f7..6325e727b4 100755 --- a/build/phase1/update_localmenus.py +++ b/build/fsfe_website_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, update_if_changed +from fsfe_website_build.lib.misc import get_basepath, update_if_changed logger = logging.getLogger(__name__) diff --git a/build/phase1/update_stylesheets.py b/build/fsfe_website_build/phase1/update_stylesheets.py similarity index 96% rename from build/phase1/update_stylesheets.py rename to build/fsfe_website_build/phase1/update_stylesheets.py index 079e4a4a13..5cebaa73b9 100755 --- a/build/phase1/update_stylesheets.py +++ b/build/fsfe_website_build/phase1/update_stylesheets.py @@ -9,7 +9,7 @@ from pathlib import Path from lxml import etree -from build.lib.misc import touch_if_newer_dep +from fsfe_website_build.lib.misc import touch_if_newer_dep logger = logging.getLogger(__name__) diff --git a/build/phase1/update_tags.py b/build/fsfe_website_build/phase1/update_tags.py similarity index 99% rename from build/phase1/update_tags.py rename to build/fsfe_website_build/phase1/update_tags.py index 4a689e67bb..1306614bac 100755 --- a/build/phase1/update_tags.py +++ b/build/fsfe_website_build/phase1/update_tags.py @@ -9,7 +9,7 @@ from xml.sax.saxutils import escape import lxml.etree as etree -from build.lib.misc import ( +from fsfe_website_build.lib.misc import ( get_basepath, keys_exists, lang_from_filename, diff --git a/build/phase1/update_xmllists.py b/build/fsfe_website_build/phase1/update_xmllists.py similarity index 99% rename from build/phase1/update_xmllists.py rename to build/fsfe_website_build/phase1/update_xmllists.py index e05d648f57..40744b679f 100755 --- a/build/phase1/update_xmllists.py +++ b/build/fsfe_website_build/phase1/update_xmllists.py @@ -11,7 +11,7 @@ from pathlib import Path import lxml.etree as etree -from build.lib.misc import ( +from fsfe_website_build.lib.misc import ( get_basepath, lang_from_filename, touch_if_newer_dep, diff --git a/build/phase2/__init__.py b/build/fsfe_website_build/phase2/__init__.py similarity index 100% rename from build/phase2/__init__.py rename to build/fsfe_website_build/phase2/__init__.py diff --git a/build/phase2/copy_files.py b/build/fsfe_website_build/phase2/copy_files.py similarity index 100% rename from build/phase2/copy_files.py rename to build/fsfe_website_build/phase2/copy_files.py diff --git a/build/phase2/create_index_symlinks.py b/build/fsfe_website_build/phase2/create_index_symlinks.py similarity index 94% rename from build/phase2/create_index_symlinks.py rename to build/fsfe_website_build/phase2/create_index_symlinks.py index 34a81a74a6..b79a07b196 100644 --- a/build/phase2/create_index_symlinks.py +++ b/build/fsfe_website_build/phase2/create_index_symlinks.py @@ -6,7 +6,7 @@ import logging import multiprocessing from pathlib import Path -from build.lib.misc import get_basename +from fsfe_website_build.lib.misc import get_basename logger = logging.getLogger(__name__) diff --git a/build/phase2/create_language_symlinks.py b/build/fsfe_website_build/phase2/create_language_symlinks.py similarity index 100% rename from build/phase2/create_language_symlinks.py rename to build/fsfe_website_build/phase2/create_language_symlinks.py diff --git a/build/phase2/process_files.py b/build/fsfe_website_build/phase2/process_files.py similarity index 97% rename from build/phase2/process_files.py rename to build/fsfe_website_build/phase2/process_files.py index d42b17768b..fd0744f27f 100644 --- a/build/phase2/process_files.py +++ b/build/fsfe_website_build/phase2/process_files.py @@ -6,8 +6,8 @@ import logging import multiprocessing from pathlib import Path -from build.lib.misc import get_basepath -from build.lib.process_file import process_file +from fsfe_website_build.lib.misc import get_basepath +from fsfe_website_build.lib.process_file import process_file logger = logging.getLogger(__name__) diff --git a/build/phase2/run.py b/build/fsfe_website_build/phase2/run.py similarity index 100% rename from build/phase2/run.py rename to build/fsfe_website_build/phase2/run.py diff --git a/build/phase3/__init__.py b/build/fsfe_website_build/phase3/__init__.py similarity index 100% rename from build/phase3/__init__.py rename to build/fsfe_website_build/phase3/__init__.py diff --git a/build/phase3/serve_websites.py b/build/fsfe_website_build/phase3/serve_websites.py similarity index 100% rename from build/phase3/serve_websites.py rename to build/fsfe_website_build/phase3/serve_websites.py diff --git a/build/phase3/stage_to_target.py b/build/fsfe_website_build/phase3/stage_to_target.py similarity index 96% rename from build/phase3/stage_to_target.py rename to build/fsfe_website_build/phase3/stage_to_target.py index 8b530cadb7..3f20c8b5b5 100644 --- a/build/phase3/stage_to_target.py +++ b/build/fsfe_website_build/phase3/stage_to_target.py @@ -6,7 +6,7 @@ import logging import multiprocessing from pathlib import Path -from build.lib.misc import run_command +from fsfe_website_build.lib.misc import run_command logger = logging.getLogger(__name__) diff --git a/fsfe.org/internal/subdir.py b/fsfe.org/internal/subdir.py index bca71886df..fd60b7915f 100644 --- a/fsfe.org/internal/subdir.py +++ b/fsfe.org/internal/subdir.py @@ -10,8 +10,7 @@ from urllib.parse import urlparse import lxml.etree as etree import requests - -from build.lib.misc import update_if_changed +from fsfe_website_build.lib.misc import update_if_changed logger = logging.getLogger(__name__) diff --git a/fsfe.org/news/subdir.py b/fsfe.org/news/subdir.py index bb9219fa15..902ea22dcb 100644 --- a/fsfe.org/news/subdir.py +++ b/fsfe.org/news/subdir.py @@ -8,8 +8,7 @@ from pathlib import Path from textwrap import dedent import lxml.etree as etree - -from build.lib.misc import lang_from_filename, update_if_changed +from fsfe_website_build.lib.misc import lang_from_filename, update_if_changed logger = logging.getLogger(__name__) diff --git a/pyproject.toml b/pyproject.toml index c4170dc1c5..b6accaad53 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,5 +1,5 @@ [project] -name = "build" +name = "fsfe-website-build" version = "0.0.0" description = "Python tooling to build the fsfe websites" readme = "README.md" @@ -19,7 +19,7 @@ dependencies = [ ] [project.scripts] -build = "build:main" +build = "fsfe_website_build:main" [dependency-groups] dev = [ @@ -30,8 +30,8 @@ requires = ["uv_build"] build-backend = "uv_build" [tool.uv.build-backend] -module-name = "build" -module-root = "" +module-name = "fsfe_website_build" +module-root = "build" [tool.ruff.lint] select = [ diff --git a/status.fsfe.org/filler/early_subdir.py b/status.fsfe.org/filler/early_subdir.py index 43c194dc98..6fc8b8ead2 100644 --- a/status.fsfe.org/filler/early_subdir.py +++ b/status.fsfe.org/filler/early_subdir.py @@ -7,8 +7,7 @@ import multiprocessing from pathlib import Path import lxml.etree as etree - -from build.lib.misc import ( +from fsfe_website_build.lib.misc import ( update_if_changed, ) diff --git a/status.fsfe.org/translations/subdir.py b/status.fsfe.org/translations/subdir.py index eaedd1873f..92f4a1dcb5 100644 --- a/status.fsfe.org/translations/subdir.py +++ b/status.fsfe.org/translations/subdir.py @@ -9,8 +9,12 @@ import os from pathlib import Path import lxml.etree as etree - -from build.lib.misc import get_basepath, get_version, run_command, update_if_changed +from fsfe_website_build.lib.misc import ( + get_basepath, + get_version, + run_command, + update_if_changed, +) logger = logging.getLogger(__name__)