Update workflow

- change to `gitea.com` for used actons
- bump checkout 4 -> 5
- bump setup-python 5 -> 6
- bump python version 3.11 -> 3.12
- only run actions on version tag.

update changelog
- fix history
- add section for this update.

.gitea/workflows/python-package.yaml

@@ -0,0 +1,36 @@
+name: CI/CD Pipeline
+
+on:
+  push:
+    tags:
+      - "v**"
+
+
+jobs:
+  job1:
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: https://gitea.com/actions/checkout@v5
+    - uses: https://gitea.com/actions/setup-python@v6
+      with:
+        python-version: "3.12"
+
+    - run: |
+        make venv
+    - run: |
+        make lint
+    - run: |
+        make mypy
+    - run: |
+        make test
+    - run: |
+        make test-release
+    -
+      name: Push to docker pypi registry.
+      env:
+        TWINE_USERNAME: ${{ secrets.REGISTRY_USERNAME }}
+        TWINE_PASSWORD: ${{ secrets.REGISTRY_TOKEN }}
+        TWINE_REPOSITORY_URL: "https://gitea.raer.me/api/packages/freyjagp/pypi"
+      run: |
+        venv/bin/python3 -m twine upload --verbose dist/*

.github/dependabot.yml

@@ -1,15 +0,0 @@
-version: 2
-updates:
-  - package-ecosystem: "pip"
-    directory: "/"
-    schedule:
-      interval: "weekly"
-    groups:
-      all:
-        patterns:
-          - "*"
-
-  - package-ecosystem: "github-actions"
-    directory: "/"
-    schedule:
-      interval: "weekly"

.github/workflows/python-package.yaml

@@ -1,76 +0,0 @@
-name: CI/CD Pipeline
-
-on:
-  - push
-  - pull_request
-
-jobs:
-  test:
-    name: Test Python ${{ matrix.python-version }} on ${{ matrix.os }}
-    runs-on: ${{ matrix.os }}
-
-    strategy:
-      fail-fast: false
-      matrix:
-        os:
-          - ubuntu-latest
-          - macos-latest
-          - windows-latest
-        python-version:
-          - "3.10"
-          - "3.11"
-          - "3.12"
-
-    steps:
-    - uses: actions/checkout@v4
-    - uses: actions/setup-python@v5
-      with:
-        python-version: ${{ matrix.python-version }}
-
-    - run: |
-        make venv
-    - run: |
-        make test
-
-  lint:
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@v4
-    - uses: actions/setup-python@v5
-      with:
-        python-version: "3.x"
-
-    - run: |
-        make venv
-    - run: |
-        make lint
-
-  mypy:
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@v4
-    - uses: actions/setup-python@v5
-      with:
-        python-version: "3.x"
-
-    - run: |
-        make venv
-    - run: |
-        make mypy
-
-
-  test-release:
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@v4
-    - uses: actions/setup-python@v5
-      with:
-        python-version: "3.x"
-
-    - run: |
-        make venv
-    - run: |
-        make test-release

.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,13 +1,48 @@
 # Changelog
 
 
+## [2.4.3(Unreleased)] --
+
+Update workflow
+
+- change to `gitea.com` for used actons
+- bump checkout 4 -> 5
+- bump setup-python 5 -> 6
+- bump python version 3.11 -> 3.12
+
+## [2.4.2] -- 2025-09-10
+
+- Merged original dev's work on v2.3.x into my fork.
+
+## [2.4.1] -- 2024-10-26
+
+* Merged original dev's work on v2.3.x into my fork.
+* update gitea workflow to hopefully build/push any updates made to my fork of blag.
+
 ## [2.4.0] -- 2024-09-05
 
 * 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
+  in directories. This happens for example with temporary emacs files.
 * Added changelog to docs
+* removed ruff's target-version from pyproject.toml, this value defaults to the
+  projects requires-python
 
 ## [2.3.1] -- 2024-07-06
 

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/devserver.py

@@ -42,7 +42,12 @@ def get_last_modified(dirs: list[str]) -> float:
     for dir in dirs:
         for root, dirs, files in os.walk(dir):
             for f in files:
-                mtime = os.stat(os.path.join(root, f)).st_mtime
+                try:
+                    mtime = os.stat(os.path.join(root, f)).st_mtime
+                except FileNotFoundError:
+                    # ignore files that have been deleted since the os.walk
+                    # call (for example temporary emacs files)
+                    continue
                 if mtime > last_mtime:
                     last_mtime = mtime
 

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.0"
+__VERSION__ = "2.4.2"

debian/changelog

@@ -1,3 +1,23 @@
+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
+    files in directories. This happens for example with temporary emacs files.
+  * Added changelog to docs
+  * removed ruff's target-version from pyproject.toml, this value defaults to
+    the projects requires-python
+
+ -- Bastian Venthur <venthur@debian.org>  Sun, 13 Oct 2024 20:12:29 +0200
+
 blag (2.3.1) unstable; urgency=medium
 
   * added manpage

push

@@ -1,11 +0,0 @@
-#!/bin/bash
-
-
-REPO="gitea"
-
-
-
-python3 -m pip install --upgrade twine
-
-
-python3 -m twine upload --repository $REPO dist/*

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]
@@ -65,7 +66,6 @@ addopts = """
 
 [tool.ruff]
 line-length = 79
-target-version = "py310"
 
 [tool.ruff.lint]
 select = [

requirements-dev.txt

@@ -1,11 +0,0 @@
-build==1.2.1
-mkdocs==1.6.0
-mkdocs-material==9.5.31
-mkdocstrings[python]==0.25.2
-twine==5.1.1
-wheel==0.44.0
-pytest==8.3.2
-pytest-cov==5.0.0
-ruff==0.6.0
-mypy==1.11.1
-types-markdown==3.6.0.20240316

requirements.txt

@@ -1,5 +0,0 @@
-markdown==3.6
-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