mirror of
https://github.com/venthur/blag.git
synced 2025-11-26 05:02:58 +00:00
Compare commits
29 Commits
rebuild_ne
...
dev-v2.4.3
| Author | SHA1 | Date | |
|---|---|---|---|
|
38a91e0abc
|
|||
|
d304d08638
|
|||
|
49810998f7
|
|||
|
1fa08afc6d
|
|||
|
|
41b0962ec0 | ||
|
|
720a92d72d | ||
|
|
9b11c67253 | ||
|
|
ce0f9f6fa7 | ||
|
|
ba4bf8481c | ||
|
|
ae544e3d02 | ||
|
|
904f231754 | ||
|
|
87a6ff09d5 | ||
|
|
419b0aea3a | ||
|
|
b0139dad8d | ||
|
|
05af204254 | ||
|
|
031e3f92cd | ||
|
|
729b1acf65 | ||
|
|
d8c41cc9fb | ||
|
|
00e02f13dc | ||
|
|
5c7213eac0 | ||
|
|
8a275c0923 | ||
|
|
abf7dc0485 | ||
|
38a506649c
|
|||
|
7ab8da8dcd
|
|||
|
636f635fea
|
|||
|
243f889725
|
|||
|
8f90987c09
|
|||
|
d4fb67577d
|
|||
|
4cc23cea5f
|
36
.gitea/workflows/python-package.yaml
Normal file
36
.gitea/workflows/python-package.yaml
Normal file
@@ -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/*
|
||||||
15
.github/dependabot.yml
vendored
15
.github/dependabot.yml
vendored
@@ -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"
|
|
||||||
77
.github/workflows/python-package.yaml
vendored
77
.github/workflows/python-package.yaml
vendored
@@ -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
|
|
||||||
@@ -3,13 +3,13 @@ version: 2
|
|||||||
build:
|
build:
|
||||||
os: ubuntu-22.04
|
os: ubuntu-22.04
|
||||||
tools:
|
tools:
|
||||||
python: "3.11"
|
python: "3.12"
|
||||||
|
|
||||||
mkdocs:
|
mkdocs:
|
||||||
configuration: mkdocs.yml
|
configuration: mkdocs.yml
|
||||||
|
|
||||||
python:
|
python:
|
||||||
install:
|
install:
|
||||||
- requirements: requirements.txt
|
- path: .
|
||||||
- requirements: requirements-dev.txt
|
extra_requirements:
|
||||||
- path: .
|
- dev
|
||||||
|
|||||||
34
CHANGELOG.md
34
CHANGELOG.md
@@ -1,8 +1,40 @@
|
|||||||
# Changelog
|
# Changelog
|
||||||
|
|
||||||
## [unreleased]
|
|
||||||
|
|
||||||
|
## [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
|
* 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
|
## [2.3.2] -- 2024-10-13
|
||||||
|
|
||||||
|
|||||||
6
Makefile
6
Makefile
@@ -16,11 +16,9 @@ endif
|
|||||||
.PHONY: all
|
.PHONY: all
|
||||||
all: lint mypy test test-release
|
all: lint mypy test test-release
|
||||||
|
|
||||||
$(VENV): requirements.txt requirements-dev.txt pyproject.toml
|
$(VENV): pyproject.toml
|
||||||
$(PY) -m venv $(VENV)
|
$(PY) -m venv $(VENV)
|
||||||
$(BIN)/pip install --upgrade -r requirements.txt
|
$(BIN)/pip install --upgrade -e .['dev']
|
||||||
$(BIN)/pip install --upgrade -r requirements-dev.txt
|
|
||||||
$(BIN)/pip install -e .['dev']
|
|
||||||
touch $(VENV)
|
touch $(VENV)
|
||||||
|
|
||||||
.PHONY: test
|
.PHONY: test
|
||||||
|
|||||||
@@ -396,7 +396,7 @@ def generate_feed(
|
|||||||
)
|
)
|
||||||
|
|
||||||
with open(f"{output_dir}/atom.xml", "w") as fh:
|
with open(f"{output_dir}/atom.xml", "w") as fh:
|
||||||
feed.write(fh, encoding="utf8")
|
feed.write(fh, encoding='utf-8')
|
||||||
|
|
||||||
|
|
||||||
def generate_index(
|
def generate_index(
|
||||||
|
|||||||
@@ -30,6 +30,8 @@ def markdown_factory() -> Markdown:
|
|||||||
"""
|
"""
|
||||||
md = Markdown(
|
md = Markdown(
|
||||||
extensions=[
|
extensions=[
|
||||||
|
"footnotes", # Add footnotes support
|
||||||
|
"pymdownx.tilde", # Add strukethrough support
|
||||||
"meta",
|
"meta",
|
||||||
"fenced_code",
|
"fenced_code",
|
||||||
"codehilite",
|
"codehilite",
|
||||||
|
|||||||
@@ -1,3 +1,3 @@
|
|||||||
"""Version information for the blag package."""
|
"""Version information for the blag package."""
|
||||||
|
|
||||||
__VERSION__ = "2.3.2"
|
__VERSION__ = "2.4.2"
|
||||||
|
|||||||
10
debian/changelog
vendored
10
debian/changelog
vendored
@@ -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
|
blag (2.3.2) unstable; urgency=medium
|
||||||
|
|
||||||
* Ignore FileNotFoundError when trying to get the last modified time of
|
* Ignore FileNotFoundError when trying to get the last modified time of
|
||||||
|
|||||||
@@ -10,14 +10,15 @@ authors = [
|
|||||||
description = "blog-aware, static site generator"
|
description = "blog-aware, static site generator"
|
||||||
keywords = ["markdown", "blag", "blog", "static site generator", "cli"]
|
keywords = ["markdown", "blag", "blog", "static site generator", "cli"]
|
||||||
readme = "README.md"
|
readme = "README.md"
|
||||||
license = { file="LICENSE" }
|
license-files = ["LICENSE"]
|
||||||
requires-python = ">=3.10"
|
requires-python = ">=3.10"
|
||||||
dynamic = ["version"]
|
dynamic = ["version"]
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"markdown",
|
|
||||||
"feedgenerator",
|
"feedgenerator",
|
||||||
"jinja2",
|
"jinja2",
|
||||||
|
"markdown",
|
||||||
"pygments",
|
"pygments",
|
||||||
|
"pymdown-extensions"
|
||||||
]
|
]
|
||||||
|
|
||||||
[project.scripts]
|
[project.scripts]
|
||||||
@@ -34,13 +35,13 @@ dev = [
|
|||||||
"mkdocs",
|
"mkdocs",
|
||||||
"mkdocs-material",
|
"mkdocs-material",
|
||||||
"mkdocstrings[python]",
|
"mkdocstrings[python]",
|
||||||
"twine",
|
"mypy",
|
||||||
"wheel",
|
|
||||||
"pytest",
|
"pytest",
|
||||||
"pytest-cov",
|
"pytest-cov",
|
||||||
"ruff",
|
"ruff",
|
||||||
"mypy",
|
"twine",
|
||||||
"types-markdown",
|
"types-markdown",
|
||||||
|
"wheel",
|
||||||
]
|
]
|
||||||
|
|
||||||
[tool.setuptools.dynamic]
|
[tool.setuptools.dynamic]
|
||||||
|
|||||||
@@ -1,11 +0,0 @@
|
|||||||
build==1.2.2.post1
|
|
||||||
mkdocs==1.6.1
|
|
||||||
mkdocs-material==9.5.49
|
|
||||||
mkdocstrings[python]==0.27.0
|
|
||||||
twine==6.0.1
|
|
||||||
wheel==0.45.1
|
|
||||||
pytest==8.3.4
|
|
||||||
pytest-cov==6.0.0
|
|
||||||
ruff==0.8.4
|
|
||||||
mypy==1.14.0
|
|
||||||
types-markdown==3.7.0.20241204
|
|
||||||
@@ -1,4 +0,0 @@
|
|||||||
markdown==3.7
|
|
||||||
feedgenerator==2.1.0
|
|
||||||
jinja2==3.1.5
|
|
||||||
pygments==2.18.0
|
|
||||||
@@ -99,6 +99,15 @@ def test_generate_feed_with_description(cleandir: str) -> None:
|
|||||||
assert '<content type="html">content' in feed
|
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:
|
def test_parse_args_build() -> None:
|
||||||
"""Test parse_args with build."""
|
"""Test parse_args with build."""
|
||||||
# test default args
|
# test default args
|
||||||
|
|||||||
Reference in New Issue
Block a user