Refresh css on building package

.gitignore

@@ -10,6 +10,8 @@
 !.sonarcloud.properties
 !.mailmap
 
+src/argus/htmx/static/styles.css
+
 # local config files
 cmd.sh
 localsettings.py

Makefile

@@ -1,15 +1,17 @@
-.PHONY: clean testclean distclean coverageclean cacheclean nuke tailwind docclean upgrade-tailwind tailwind-watch
-
-TAILWINDDIR=src/argus/htmx/tailwindtheme
-STATICDIR=src/argus/htmx/static
-PYTHONPATH=./src
+.PHONY: clean build testclean distclean docclean coverageclean cacheclean nuke tailwindcli tailwind tailwind-watch upgrade-tailwind
 
+STYLE_SOURCES := $(shell find src/argus -name '*.html')
+TAILWINDDIR:=src/argus/htmx/tailwindtheme
+STATICDIR:=src/argus/htmx/static
+PYTHONPATH:=./src
 
 clean:
 	-find . -name __pycache__ -print0 | xargs -0 rm -rf
 	-find . -name "*.pyc" -print0 | xargs -0 rm -rf
 	-find . -name "*.egg-info" -print0 | xargs -0 rm -rf
 
+build: tailwind
+
 cacheclean:
 	-find . -name ".ruff_cache" -print0 | xargs -0 rm -rf
 
@@ -31,8 +33,11 @@ testclean: coverageclean clean
 
 nuke: clean docclean distclean testclean cacheclean
 
-tailwind:
-	$(TAILWINDDIR)/tailwindcss -c $(TAILWINDDIR)/tailwind.config.js -i $(TAILWINDDIR)/styles.css -o $(STATICDIR)/styles.css
+tailwindcli:
+	@which tailwind || echo "tailwindcss not in path"
+
+tailwind: tailwindcli
+	tailwindcss -c $(TAILWINDDIR)/tailwind.config.js -i $(TAILWINDDIR)/styles.css -o $(STATICDIR)/styles.css
 
 tailwind-watch:
 	$(TAILWINDDIR)/tailwindcss -c $(TAILWINDDIR)/tailwind.config.js -i $(TAILWINDDIR)/styles.css -o $(STATICDIR)/styles.css --watch

docs/customization/htmx-frontend.rst

@@ -41,70 +41,82 @@ example.
 Themes and styling
 ==================
 
-How to customize the look:
-
-* Override Argus' Tailwind CSS theme defaults and/or choose which daisyUI color
-  themes to include. You can do so by updating the default
-  :setting:`TAILWIND_THEME_OVERRIDE` and :setting:`DAISYUI_THEMES` settings
-  respectively before running a ``tailwind_config`` management command:
-
-  Via environment variables, for example::
-
-    TAILWIND_THEME_OVERRIDE = '
-      {
-        "borderWidth": {
-          "DEFAULT": "1px"
-        },
-        "extend": {
-          "borderRadius": {
-            "4xl": "2rem"
-          }
-        }
-      }
-    '
-    DAISYUI_THEMES = '
-      [
-        "light",
-        "dark",
-        "cyberpunk",
-        "dim",
-        "autumn",
-        { "mytheme": {
-            "color-scheme": "dark",
-            "primary": "#009eb6",
-            "primary-content": "#00090c",
-            "secondary": "#00ac00",
-            "secondary-content": "#000b00",
-            "accent": "#ff0000",
-            "accent-content": "#160000",
-            "neutral": "#262c0e",
-            "neutral-content": "#cfd1ca",
-            "base-100": "#292129",
-            "base-200": "#221b22",
-            "base-300": "#1c161c",
-            "base-content": "#d0cdd0",
-            "info": "#00feff",
-            "info-content": "#001616",
-            "success": "#b1ea50",
-            "success-content": "#0c1302",
-            "warning": "#d86d00",
-            "warning-content": "#110400",
-            "error": "#ff6280",
-            "error-content": "#160306"
-            }
-        }
-      ]
-    '
+In order to customize the CSS you need to have ``tailwindcss`` in the shell
+``$PATH``. Running ``make upgrade-tailwind`` will download a binary to
+``src/argus/htmx/tailwindtheme/tailwindcss`` which can then be copied or linked
+to a directory in $PATH, or you can add the absolute path to the parent
+directory of ``tailwindcss`` to your ``$PATH`` by changing the environment
+variable as per your shell.
+
+Alter themes
+------------
+
+Override Argus' Tailwind CSS theme defaults and/or choose which daisyUI color
+themes to include. You can do so by updating the default
+:setting:`TAILWIND_THEME_OVERRIDE` and :setting:`DAISYUI_THEMES` settings
+respectively before running a ``tailwind_config`` management command:
+
+Via environment variables, for example::
+
+TAILWIND_THEME_OVERRIDE = '
+{
+"borderWidth": {
+  "DEFAULT": "1px"
+},
+"extend": {
+  "borderRadius": {
+    "4xl": "2rem"
+  }
+}
+}
+'
+DAISYUI_THEMES = '
+[
+"light",
+"dark",
+"cyberpunk",
+"dim",
+"autumn",
+{ "mytheme": {
+    "color-scheme": "dark",
+    "primary": "#009eb6",
+    "primary-content": "#00090c",
+    "secondary": "#00ac00",
+    "secondary-content": "#000b00",
+    "accent": "#ff0000",
+    "accent-content": "#160000",
+    "neutral": "#262c0e",
+    "neutral-content": "#cfd1ca",
+    "base-100": "#292129",
+    "base-200": "#221b22",
+    "base-300": "#1c161c",
+    "base-content": "#d0cdd0",
+    "info": "#00feff",
+    "info-content": "#001616",
+    "success": "#b1ea50",
+    "success-content": "#0c1302",
+    "warning": "#d86d00",
+    "warning-content": "#110400",
+    "error": "#ff6280",
+    "error-content": "#160306"
+    }
+}
+]
+'
 
-  Or by providing corresponding values in your local settings that star-imports from an `argus-server`_ settings file::
+Or by providing corresponding values in your local settings that star-imports from an `argus-server`_ settings file::
 
-        TAILWIND_THEME_OVERRIDE = {...}
-        DAISYUI_THEMES = [...]
+   TAILWIND_THEME_OVERRIDE = {...}
+   DAISYUI_THEMES = [...]
 
-  Some links that may be relevant for the customization values mentioned above:
-    * `daisyUI themes`_
-    * `list of daisyUI color names`_
-    * `Tailwind CSS theme customization`_
+Some links that may be relevant for the customization values mentioned above:
+
+* `daisyUI themes`_
+* `list of daisyUI color names`_
+* `Tailwind CSS theme customization`_
+
+Alter CSS and stylesheets
+-------------------------
 
 * Override the default main stylesheet path by setting
   ``ARGUS_STYLESHEET_PATH`` in the environment. The path is under

docs/development/howtos/release-checklist.rst

@@ -180,3 +180,12 @@ Checklist
    #. Copy the changelog into the box below, dedent the headers once.
 
    #. Finally, click the "Publish release"-button. Done!
+
+Post-release clean up
+---------------------
+
+The packaging will have generated package files in ``dist/``, these can be
+removed by running ``make distclean``.
+
+The file ``src/argus/htmx/static/styles.css`` will also have been regenerated,
+don't commit it so as to keep merge conflicts down.

pyproject.toml

@@ -1,5 +1,5 @@
 [build-system]
-requires = ["hatchling", "versioningit>=3.0.0"]
+requires = ["hatchling", "hatch-build-scripts", "versioningit>=3.0.0"]
 build-backend = "hatchling.build"
 
 [project]
@@ -88,6 +88,15 @@ exclude = [
     "/*.sh",
 ]
 
+[[tool.hatch.build.hooks.build-scripts.scripts]]
+# build css
+commands = [
+    "make tailwind"
+]
+artifacts = [
+    "src/argus/htmx/static/styles.css",
+]
+
 [tool.versioningit.write]
 file = "src/argus/version.py"