mirror of
https://github.com/venthur/blag.git
synced 2025-11-26 05:02:58 +00:00
Compare commits
11 Commits
2.3.3
...
rebuild_ne
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
60bd86ec22 | ||
|
|
69b729a471 | ||
|
|
f09e841200 | ||
|
|
c94f9793b0 | ||
|
|
5cddb62603 | ||
|
|
a3da95ea19 | ||
|
|
c4f3c09730 | ||
|
|
5943dab690 | ||
|
|
71c866c9b3 | ||
|
|
c87a300c71 | ||
|
|
a939e6503c |
@@ -1,12 +1,8 @@
|
|||||||
# Changelog
|
# Changelog
|
||||||
|
|
||||||
## [2.3.3] -- 2025-04-27
|
## [unreleased]
|
||||||
|
|
||||||
* 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
|
||||||
|
|
||||||
|
|||||||
9
Makefile
9
Makefile
@@ -53,11 +53,6 @@ update-pygmentize: $(VENV)
|
|||||||
$(BIN)/pygmentize -f html -S default > blag/static/code-light.css
|
$(BIN)/pygmentize -f html -S default > blag/static/code-light.css
|
||||||
$(BIN)/pygmentize -f html -S monokai > blag/static/code-dark.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
|
.PHONY: docs
|
||||||
docs: $(VENV)
|
docs: $(VENV)
|
||||||
$(BIN)/mkdocs build
|
$(BIN)/mkdocs build
|
||||||
@@ -70,6 +65,10 @@ serve-docs: $(VENV)
|
|||||||
manpage: $(VENV)
|
manpage: $(VENV)
|
||||||
help2man $(BIN)/blag --no-info -n "blog-aware, static site generator" -o debian/blag.1
|
help2man $(BIN)/blag --no-info -n "blog-aware, static site generator" -o debian/blag.1
|
||||||
|
|
||||||
|
.PHONY: benchmark
|
||||||
|
benchmark: $(VENV)
|
||||||
|
$(BIN)/pytest --no-cov -capture=no -rA tests/benchmark.py
|
||||||
|
|
||||||
.PHONY: clean
|
.PHONY: clean
|
||||||
clean:
|
clean:
|
||||||
rm -rf build dist *.egg-info
|
rm -rf build dist *.egg-info
|
||||||
|
|||||||
14
blag/blag.py
14
blag/blag.py
@@ -323,6 +323,18 @@ def process_markdown(
|
|||||||
for src, dst in convertibles:
|
for src, dst in convertibles:
|
||||||
logger.debug(f"Processing {src}")
|
logger.debug(f"Processing {src}")
|
||||||
|
|
||||||
|
# see first if the dst actually needs re-building. for that we compare
|
||||||
|
# the mtimes and assume mtime_dst > mtime_src means that it needs not
|
||||||
|
# to be rebuilt
|
||||||
|
if os.path.exists(f"{output_dir}/{dst}"):
|
||||||
|
mtime_src = os.stat(f"{input_dir}/{src}").st_mtime
|
||||||
|
mtime_dst = os.stat(f"{output_dir}/{dst}").st_mtime
|
||||||
|
if mtime_dst >= mtime_src:
|
||||||
|
logger.debug(
|
||||||
|
"Skipping, as target exists and is newer than source."
|
||||||
|
)
|
||||||
|
continue
|
||||||
|
|
||||||
with open(f"{input_dir}/{src}") as fh:
|
with open(f"{input_dir}/{src}") as fh:
|
||||||
body = fh.read()
|
body = fh.read()
|
||||||
|
|
||||||
@@ -396,7 +408,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='utf-8')
|
feed.write(fh, encoding="utf8")
|
||||||
|
|
||||||
|
|
||||||
def generate_index(
|
def generate_index(
|
||||||
|
|||||||
@@ -1,3 +1,3 @@
|
|||||||
"""Version information for the blag package."""
|
"""Version information for the blag package."""
|
||||||
|
|
||||||
__VERSION__ = "2.3.3"
|
__VERSION__ = "2.3.2"
|
||||||
|
|||||||
10
debian/changelog
vendored
10
debian/changelog
vendored
@@ -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
|
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,13 +10,13 @@ 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-files = ["LICENSE"]
|
license = { file="LICENSE" }
|
||||||
requires-python = ">=3.10"
|
requires-python = ">=3.10"
|
||||||
dynamic = ["version"]
|
dynamic = ["version"]
|
||||||
dependencies = [
|
dependencies = [
|
||||||
|
"markdown",
|
||||||
"feedgenerator",
|
"feedgenerator",
|
||||||
"jinja2",
|
"jinja2",
|
||||||
"markdown",
|
|
||||||
"pygments",
|
"pygments",
|
||||||
]
|
]
|
||||||
|
|
||||||
@@ -34,14 +34,13 @@ dev = [
|
|||||||
"mkdocs",
|
"mkdocs",
|
||||||
"mkdocs-material",
|
"mkdocs-material",
|
||||||
"mkdocstrings[python]",
|
"mkdocstrings[python]",
|
||||||
"mypy",
|
"twine",
|
||||||
"pip-tools",
|
"wheel",
|
||||||
"pytest",
|
"pytest",
|
||||||
"pytest-cov",
|
"pytest-cov",
|
||||||
"ruff",
|
"ruff",
|
||||||
"twine",
|
"mypy",
|
||||||
"types-markdown",
|
"types-markdown",
|
||||||
"wheel",
|
|
||||||
]
|
]
|
||||||
|
|
||||||
[tool.setuptools.dynamic]
|
[tool.setuptools.dynamic]
|
||||||
|
|||||||
@@ -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
|
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==1.6.1
|
||||||
mkdocs-autorefs==1.4.1
|
mkdocs-material==9.5.49
|
||||||
mkdocs-get-deps==0.2.0
|
mkdocstrings[python]==0.27.0
|
||||||
mkdocs-material==9.6.11
|
twine==6.0.1
|
||||||
mkdocs-material-extensions==1.3.1
|
|
||||||
mkdocstrings==0.29.1
|
|
||||||
mkdocstrings-python==1.16.10
|
|
||||||
more-itertools==10.6.0
|
|
||||||
mypy==1.15.0
|
|
||||||
mypy-extensions==1.0.0
|
|
||||||
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
|
wheel==0.45.1
|
||||||
|
pytest==8.3.4
|
||||||
# The following packages are considered to be unsafe in a requirements file:
|
pytest-cov==6.0.0
|
||||||
# pip
|
ruff==0.8.4
|
||||||
# setuptools
|
mypy==1.14.0
|
||||||
|
types-markdown==3.7.0.20241204
|
||||||
|
|||||||
@@ -1,12 +1,4 @@
|
|||||||
#
|
|
||||||
# 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
|
markdown==3.7
|
||||||
markupsafe==3.0.2
|
feedgenerator==2.1.0
|
||||||
pygments==2.19.1
|
jinja2==3.1.5
|
||||||
pytz==2025.2
|
pygments==2.18.0
|
||||||
|
|||||||
37
tests/benchmark.py
Normal file
37
tests/benchmark.py
Normal file
@@ -0,0 +1,37 @@
|
|||||||
|
"""Benchmark the performance of the blag build command."""
|
||||||
|
|
||||||
|
import logging
|
||||||
|
import os
|
||||||
|
from argparse import Namespace
|
||||||
|
|
||||||
|
from pytest import LogCaptureFixture
|
||||||
|
|
||||||
|
import blag
|
||||||
|
from blag.blag import build
|
||||||
|
|
||||||
|
|
||||||
|
def test_performance(args: Namespace, caplog: LogCaptureFixture) -> None:
|
||||||
|
"""Test performance of the build command."""
|
||||||
|
caplog.set_level(logging.ERROR)
|
||||||
|
|
||||||
|
FILES = 10000
|
||||||
|
print(f"Generating {FILES} markdown files")
|
||||||
|
# create random markdown files in the content directory
|
||||||
|
with open(os.path.join(blag.__path__[0], "content", "testpage.md")) as fh:
|
||||||
|
markdown = fh.read()
|
||||||
|
for i in range(FILES):
|
||||||
|
with open(f"content/{i}.md", "w") as f:
|
||||||
|
f.write(markdown)
|
||||||
|
f.write(str(i))
|
||||||
|
|
||||||
|
from time import time
|
||||||
|
|
||||||
|
t = time()
|
||||||
|
build(args)
|
||||||
|
t_first = time() - t
|
||||||
|
|
||||||
|
t = time()
|
||||||
|
build(args)
|
||||||
|
t_second = time() - t
|
||||||
|
print(f"First run: {t_first:.2f}s, second run: {t_second:.2f}s")
|
||||||
|
print(f"Speedup: {t_first/t_second:.2f}")
|
||||||
@@ -99,15 +99,6 @@ 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