forked from github.com/blag
Compare commits
14 Commits
1fa08afc6d
...
rebuild_ne
| Author | SHA1 | Date | |
|---|---|---|---|
|
60bd86ec22 | ||
|
|
69b729a471 | ||
|
|
f09e841200 | ||
|
|
c94f9793b0 | ||
|
|
5cddb62603 | ||
|
|
85e57a7ef2 | ||
|
|
ef18685cef | ||
|
|
6b699f58ad | ||
|
|
a3da95ea19 | ||
|
|
c4f3c09730 | ||
|
|
5943dab690 | ||
|
|
71c866c9b3 | ||
|
|
c87a300c71 | ||
|
|
a939e6503c |
@@ -1,38 +0,0 @@
|
||||
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/*
|
||||
15
.github/dependabot.yml
vendored
Normal file
15
.github/dependabot.yml
vendored
Normal file
@@ -0,0 +1,15 @@
|
||||
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
Normal file
77
.github/workflows/python-package.yaml
vendored
Normal file
@@ -0,0 +1,77 @@
|
||||
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
|
||||
16
CHANGELOG.md
16
CHANGELOG.md
@@ -1,21 +1,9 @@
|
||||
# Changelog
|
||||
|
||||
## [unreleased]
|
||||
|
||||
* Added Python 3.13 to github actions
|
||||
|
||||
## [2.4.0] -- 2024-10-26
|
||||
|
||||
* Merged original dev's work on v2.3.x into my fork.
|
||||
|
||||
## [2.4.0] -- 2024-10-26
|
||||
|
||||
* 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
|
||||
|
||||
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()
|
||||
|
||||
|
||||
@@ -30,8 +30,6 @@ def markdown_factory() -> Markdown:
|
||||
"""
|
||||
md = Markdown(
|
||||
extensions=[
|
||||
"footnotes", # Add footnotes support
|
||||
"pymdownx.tilde", # Add strukethrough support
|
||||
"meta",
|
||||
"fenced_code",
|
||||
"codehilite",
|
||||
|
||||
@@ -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.4.2"
|
||||
__VERSION__ = "2.3.2"
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
build==1.2.2.post1
|
||||
mkdocs==1.6.1
|
||||
mkdocs-material==9.5.39
|
||||
mkdocstrings[python]==0.26.1
|
||||
twine==5.1.1
|
||||
wheel==0.44.0
|
||||
pytest==8.3.3
|
||||
pytest-cov==5.0.0
|
||||
ruff==0.6.9
|
||||
mypy==1.11.2
|
||||
types-markdown==3.7.0.20240822
|
||||
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,5 +1,4 @@
|
||||
markdown==3.7
|
||||
feedgenerator==2.1.0
|
||||
jinja2==3.1.4
|
||||
jinja2==3.1.5
|
||||
pygments==2.18.0
|
||||
pymdown-extensions==10.9
|
||||
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