fix workflow finally.... ;-;

.gitea/workflows/python-package.yaml

@@ -0,0 +1,38 @@
+name: CI/CD Pipeline
+
+on:
+  push:
+    branches:
+      - main
+    tags:
+      - "v**"
+
+
+jobs:
+  job1:
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: https://github.com/actions/checkout@v4
+    - uses: https://github.com/actions/setup-python@v5
+      with:
+        python-version: "3.11"
+
+    - 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,77 +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"
-          - "3.13"
-
-    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

CHANGELOG.md

@@ -1,13 +1,16 @@
 # Changelog
 
-## [2.3.3] -- 2025-04-27
 
-* Fixed Atom feed encoding to 'utf-8'
+## [2.4.0] -- 2024-10-26
-* 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
 
+* Merged master (original dev's work) into main (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] --
 ## [2.3.2] -- 2024-10-13
 
 * Ignore FileNotFoundError when trying to get the last modified time of files

Makefile

@@ -53,11 +53,6 @@ update-pygmentize: $(VENV)
 	$(BIN)/pygmentize -f html -S default > blag/static/code-light.css
 	$(BIN)/pygmentize -f html -S monokai > blag/static/code-dark.css
 
-.PHONY: update-requirements
-update-requirements: $(VENV)
-	$(BIN)/pip-compile --upgrade --no-annotate --strip-extras --output-file requirements.txt
-	$(BIN)/pip-compile --upgrade --no-annotate --strip-extras --extra dev --output-file requirements-dev.txt
-
 .PHONY: docs
 docs: $(VENV)
 	$(BIN)/mkdocs build

blag/blag.py

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

blag/markdown.py

@@ -30,6 +30,8 @@ def markdown_factory() -> Markdown:
     """
     md = Markdown(
         extensions=[
+            "footnotes",        # Add footnotes support
+            "pymdownx.tilde",   # Add strukethrough support
             "meta",
             "fenced_code",
             "codehilite",

blag/static/style.css

@@ -1,15 +1,32 @@
 @import "code-light.css" (prefers-color-scheme: light);
 @import "code-dark.css" (prefers-color-scheme: dark);
 
+@media (prefers-color-scheme: light) {
     :root {
-    color-scheme: light dark;
+        --background: #FFFFFF;
-    --background: light-dark(#FFFFFF, #2B363B);
+        --background-dim: #f5f7f9;
-    --background-dim: light-dark(#f5f7f9, #2F3C42);
+
-    --foreground: light-dark(#2B303A, #f0f2f3);
+        --foreground: #2B303A;
-    --foreground-dim: light-dark(#576379, #d5d5d5);
+        --foreground-dim: #576379;
-    --foreground-heavy: light-dark(#191C22, #f2f4f5);
+        --foreground-heavy: #191C22;
-    --primary-color: light-dark(#375287, #A1C5FF);
+
+        --primary-color: #375287;
     }
+}
+
+@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;

blag/version.py

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

debian/changelog

@@ -1,13 +1,3 @@
-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,13 +10,13 @@ authors = [
 description = "blog-aware, static site generator"
 keywords = ["markdown", "blag", "blog", "static site generator", "cli"]
 readme = "README.md"
-license-files = ["LICENSE"]
+license = { file="LICENSE" }
 requires-python = ">=3.10"
 dynamic = ["version"]
 dependencies = [
+    "markdown",
     "feedgenerator",
     "jinja2",
-    "markdown",
     "pygments",
 ]
 
@@ -34,14 +34,13 @@ dev = [
     "mkdocs",
     "mkdocs-material",
     "mkdocstrings[python]",
-    "mypy",
+    "twine",
-    "pip-tools",
+    "wheel",
     "pytest",
     "pytest-cov",
     "ruff",
-    "twine",
+    "mypy",
     "types-markdown",
-    "wheel",
 ]
 
 [tool.setuptools.dynamic]

requirements-dev.txt

@@ -1,79 +1,11 @@
-#
-# This file is autogenerated by pip-compile with Python 3.13
-# by the following command:
-#
-#    pip-compile --extra=dev --no-annotate --output-file=requirements-dev.txt --strip-extras
-#
-babel==2.17.0
-backrefs==5.8
 build==1.2.2.post1
-certifi==2025.1.31
-cffi==1.17.1
-charset-normalizer==3.4.1
-click==8.1.8
-colorama==0.4.6
-coverage==7.8.0
-cryptography==44.0.2
-docutils==0.21.2
-feedgenerator==2.1.0
-ghp-import==2.1.0
-griffe==1.7.2
-id==1.5.0
-idna==3.10
-iniconfig==2.1.0
-jaraco-classes==3.4.0
-jaraco-context==6.0.1
-jaraco-functools==4.1.0
-jeepney==0.9.0
-jinja2==3.1.6
-keyring==25.6.0
-markdown==3.7
-markdown-it-py==3.0.0
-markupsafe==3.0.2
-mdurl==0.1.2
-mergedeep==1.3.4
 mkdocs==1.6.1
-mkdocs-autorefs==1.4.1
+mkdocs-material==9.5.39
-mkdocs-get-deps==0.2.0
+mkdocstrings[python]==0.26.1
-mkdocs-material==9.6.11
+twine==5.1.1
-mkdocs-material-extensions==1.3.1
+wheel==0.44.0
-mkdocstrings==0.29.1
+pytest==8.3.3
-mkdocstrings-python==1.16.10
+pytest-cov==5.0.0
-more-itertools==10.6.0
+ruff==0.6.9
-mypy==1.15.0
+mypy==1.11.2
-mypy-extensions==1.0.0
+types-markdown==3.7.0.20240822
-nh3==0.2.21
-packaging==24.2
-paginate==0.5.7
-pathspec==0.12.1
-pip-tools==7.4.1
-platformdirs==4.3.7
-pluggy==1.5.0
-pycparser==2.22
-pygments==2.19.1
-pymdown-extensions==10.14.3
-pyproject-hooks==1.2.0
-pytest==8.3.5
-pytest-cov==6.1.1
-python-dateutil==2.9.0.post0
-pytz==2025.2
-pyyaml==6.0.2
-pyyaml-env-tag==0.1
-readme-renderer==44.0
-requests==2.32.3
-requests-toolbelt==1.0.0
-rfc3986==2.0.0
-rich==14.0.0
-ruff==0.11.4
-secretstorage==3.3.3
-six==1.17.0
-twine==6.1.0
-types-markdown==3.7.0.20250322
-typing-extensions==4.13.1
-urllib3==2.3.0
-watchdog==6.0.0
-wheel==0.45.1
-
-# The following packages are considered to be unsafe in a requirements file:
-# pip
-# setuptools

requirements.txt

@@ -1,12 +1,5 @@
-#
-# This file is autogenerated by pip-compile with Python 3.13
-# by the following command:
-#
-#    pip-compile --no-annotate --output-file=requirements.txt --strip-extras
-#
-feedgenerator==2.1.0
-jinja2==3.1.6
 markdown==3.7
-markupsafe==3.0.2
+feedgenerator==2.1.0
-pygments==2.19.1
+jinja2==3.1.4
-pytz==2025.2
+pygments==2.18.0
+pymdown-extensions==10.9

tests/test_blag.py

@@ -99,15 +99,6 @@ 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