Merge branch 'v2.4.2' into main

.readthedocs.yaml

@@ -3,13 +3,13 @@ version: 2
 build:
   os: ubuntu-22.04
   tools:
-    python: "3.11"
+    python: "3.12"
 
 mkdocs:
   configuration: mkdocs.yml
 
 python:
   install:
-  - requirements: requirements.txt
-  - requirements: requirements-dev.txt
-  - path: .
+    - path: .
+      extra_requirements:
+        - dev

CHANGELOG.md

@@ -1,6 +1,11 @@
 # Changelog
 
 
+
+## [2.4.0] -- 2024-10-26
+
+* Merged original dev's work on v2.3.x into my fork.
+
 ## [2.4.0] -- 2024-10-26
 
 * Merged master (original dev's work) into main (my fork)
@@ -11,6 +16,18 @@
 * added strikethru and footnotes to blag renders.
 
 ## [unreleased] --
+## [unreleased] --
+
+* Removed requirements.txt and requirements-dev.txt
+
+## [2.3.3] -- 2025-04-27
+
+* Fixed Atom feed encoding to 'utf-8'
+* Added Python 3.13 to github actions
+* `requirements*.txt` files are handled by pip-tools. Updates are handled by
+  make update-requirements based on the dependencies described in the
+  pyproject.toml
+
 ## [2.3.2] -- 2024-10-13
 
 * Ignore FileNotFoundError when trying to get the last modified time of files

Makefile

@@ -16,11 +16,9 @@ endif
 .PHONY: all
 all: lint mypy test test-release
 
-$(VENV): requirements.txt requirements-dev.txt pyproject.toml
+$(VENV): pyproject.toml
 	$(PY) -m venv $(VENV)
-	$(BIN)/pip install --upgrade -r requirements.txt
-	$(BIN)/pip install --upgrade -r requirements-dev.txt
-	$(BIN)/pip install -e .['dev']
+	$(BIN)/pip install --upgrade -e .['dev']
 	touch $(VENV)
 
 .PHONY: test

blag/blag.py

@@ -396,7 +396,7 @@ def generate_feed(
         )
 
     with open(f"{output_dir}/atom.xml", "w") as fh:
-        feed.write(fh, encoding="utf8")
+        feed.write(fh, encoding='utf-8')
 
 
 def generate_index(

blag/static/style.css

@@ -1,33 +1,16 @@
 @import "code-light.css" (prefers-color-scheme: light);
 @import "code-dark.css" (prefers-color-scheme: dark);
 
-@media (prefers-color-scheme: light) {
-    :root {
-        --background: #FFFFFF;
-        --background-dim: #f5f7f9;
-
-        --foreground: #2B303A;
-        --foreground-dim: #576379;
-        --foreground-heavy: #191C22;
-
-        --primary-color: #375287;
-    }
+:root {
+    color-scheme: light dark;
+    --background: light-dark(#FFFFFF, #2B363B);
+    --background-dim: light-dark(#f5f7f9, #2F3C42);
+    --foreground: light-dark(#2B303A, #f0f2f3);
+    --foreground-dim: light-dark(#576379, #d5d5d5);
+    --foreground-heavy: light-dark(#191C22, #f2f4f5);
+    --primary-color: light-dark(#375287, #A1C5FF);
 }
 
-@media (prefers-color-scheme: dark) {
-    :root {
-        --background: #2B363B;
-        --background-dim: #2F3C42;
-
-        --foreground: #f0f2f3;
-        --foreground-dim: #d5d5d5;
-        --foreground-heavy: #f2f4f5;
-
-        --primary-color: #A1C5FF;
-    }
-}
-
-
 html {
   font-size: 18px;
   font-family: serif;

blag/version.py

@@ -1,3 +1,3 @@
 """Version information for the blag package."""
 
-__VERSION__ = "2.4.1"
+__VERSION__ = "2.4.2"

debian/changelog

@@ -1,3 +1,13 @@
+blag (2.3.3) unstable; urgency=medium
+
+  * Fixed Atom feed encoding to 'utf-8'
+  * Added Python 3.13 to github actions
+  * `requirements*.txt` files are handled by pip-tools. Updates are handled by
+    make update-requirements based on the dependencies described in the
+    pyproject.toml
+
+ -- Bastian Venthur <venthur@debian.org>  Sun, 27 Apr 2025 11:42:13 +0200
+
 blag (2.3.2) unstable; urgency=medium
 
   * Ignore FileNotFoundError when trying to get the last modified time of

pyproject.toml

@@ -10,14 +10,15 @@ authors = [
 description = "blog-aware, static site generator"
 keywords = ["markdown", "blag", "blog", "static site generator", "cli"]
 readme = "README.md"
-license = { file="LICENSE" }
+license-files = ["LICENSE"]
 requires-python = ">=3.10"
 dynamic = ["version"]
 dependencies = [
-    "markdown",
     "feedgenerator",
     "jinja2",
+    "markdown",
     "pygments",
+    "pymdown-extensions"
 ]
 
 [project.scripts]
@@ -34,13 +35,13 @@ dev = [
     "mkdocs",
     "mkdocs-material",
     "mkdocstrings[python]",
-    "twine",
-    "wheel",
+    "mypy",
     "pytest",
     "pytest-cov",
     "ruff",
-    "mypy",
+    "twine",
     "types-markdown",
+    "wheel",
 ]
 
 [tool.setuptools.dynamic]

requirements-dev.txt

@@ -1,11 +0,0 @@
-build==1.2.2.post1
-mkdocs==1.6.1
-mkdocs-material==9.5.39
-mkdocstrings[python]==0.26.1
-twine==5.1.1
-wheel==0.44.0
-pytest==8.3.3
-pytest-cov==5.0.0
-ruff==0.6.9
-mypy==1.11.2
-types-markdown==3.7.0.20240822

requirements.txt

@@ -1,5 +0,0 @@
-markdown==3.7
-feedgenerator==2.1.0
-jinja2==3.1.4
-pygments==2.18.0
-pymdown-extensions==10.9

tests/test_blag.py

@@ -99,6 +99,15 @@ def test_generate_feed_with_description(cleandir: str) -> None:
     assert '<content type="html">content' in feed
 
 
+def test_feed_is_unicode(cleandir: str) -> None:
+    """Test generate_feed."""
+    articles: list[tuple[str, dict[str, Any]]] = []
+    blag.generate_feed(articles, "build", " ", " ", " ", " ")
+    with open("build/atom.xml") as fh:
+        feed = fh.read()
+    assert 'encoding="utf-8"' in feed
+
+
 def test_parse_args_build() -> None:
     """Test parse_args with build."""
     # test default args