mirror of
https://github.com/venthur/blag.git
synced 2025-11-25 12:42:41 +00:00
Compare commits
26 Commits
2.3.1
...
rebuild_ne
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
60bd86ec22 | ||
|
|
69b729a471 | ||
|
|
f09e841200 | ||
|
|
c94f9793b0 | ||
|
|
5cddb62603 | ||
|
|
85e57a7ef2 | ||
|
|
ef18685cef | ||
|
|
6b699f58ad | ||
|
|
a3da95ea19 | ||
|
|
c4f3c09730 | ||
|
|
5943dab690 | ||
|
|
e631b17fb1 | ||
|
|
07be96aa7c | ||
|
|
0d03733b4f | ||
|
|
8fed4894ee | ||
|
|
12db99f20a | ||
|
|
086832986b | ||
|
|
8112d9fb30 | ||
|
|
e977383ae0 | ||
|
|
0c606c7673 | ||
|
|
c8a0587d78 | ||
|
|
be079e8699 | ||
|
|
60b7679c14 | ||
|
|
71c866c9b3 | ||
|
|
c87a300c71 | ||
|
|
a939e6503c |
4
.github/dependabot.yml
vendored
4
.github/dependabot.yml
vendored
@@ -4,6 +4,10 @@ updates:
|
||||
directory: "/"
|
||||
schedule:
|
||||
interval: "weekly"
|
||||
groups:
|
||||
all:
|
||||
patterns:
|
||||
- "*"
|
||||
|
||||
- package-ecosystem: "github-actions"
|
||||
directory: "/"
|
||||
|
||||
1
.github/workflows/python-package.yaml
vendored
1
.github/workflows/python-package.yaml
vendored
@@ -20,6 +20,7 @@ jobs:
|
||||
- "3.10"
|
||||
- "3.11"
|
||||
- "3.12"
|
||||
- "3.13"
|
||||
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
|
||||
12
CHANGELOG.md
12
CHANGELOG.md
@@ -1,5 +1,17 @@
|
||||
# Changelog
|
||||
|
||||
## [unreleased]
|
||||
|
||||
* Added Python 3.13 to github actions
|
||||
|
||||
## [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
|
||||
|
||||
* added manpage
|
||||
|
||||
4
Makefile
4
Makefile
@@ -65,6 +65,10 @@ serve-docs: $(VENV)
|
||||
manpage: $(VENV)
|
||||
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
|
||||
clean:
|
||||
rm -rf build dist *.egg-info
|
||||
|
||||
12
blag/blag.py
12
blag/blag.py
@@ -323,6 +323,18 @@ def process_markdown(
|
||||
for src, dst in convertibles:
|
||||
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:
|
||||
body = fh.read()
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
"""Version information for the blag package."""
|
||||
|
||||
__VERSION__ = "2.3.1"
|
||||
__VERSION__ = "2.3.2"
|
||||
|
||||
10
debian/changelog
vendored
10
debian/changelog
vendored
@@ -1,3 +1,13 @@
|
||||
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
|
||||
|
||||
1
docs/CHANGELOG.md
Symbolic link
1
docs/CHANGELOG.md
Symbolic link
@@ -0,0 +1 @@
|
||||
../CHANGELOG.md
|
||||
@@ -13,6 +13,7 @@ nav:
|
||||
- blag.markdown: markdown.md
|
||||
- blag.devserver: devserver.md
|
||||
- blag.quickstart: quickstart.md
|
||||
- Changelog: CHANGELOG.md
|
||||
|
||||
theme:
|
||||
name: material
|
||||
|
||||
@@ -65,7 +65,6 @@ addopts = """
|
||||
|
||||
[tool.ruff]
|
||||
line-length = 79
|
||||
target-version = "py310"
|
||||
|
||||
[tool.ruff.lint]
|
||||
select = [
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
build==1.2.1
|
||||
mkdocs==1.6.0
|
||||
mkdocs-material==9.5.28
|
||||
mkdocstrings[python]==0.25.1
|
||||
twine==5.1.1
|
||||
wheel==0.43.0
|
||||
pytest==8.2.2
|
||||
pytest-cov==5.0.0
|
||||
ruff==0.5.1
|
||||
mypy==1.10.1
|
||||
types-markdown==3.6.0.20240316
|
||||
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 +1,4 @@
|
||||
markdown==3.6
|
||||
markdown==3.7
|
||||
feedgenerator==2.1.0
|
||||
jinja2==3.1.4
|
||||
jinja2==3.1.5
|
||||
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}")
|
||||
Reference in New Issue
Block a user