forked from github.com/blag
Compare commits
1 Commits
master
...
4cc23cea5f
| Author | SHA1 | Date | |
|---|---|---|---|
|
4cc23cea5f
|
4
.github/workflows/python-package.yaml
vendored
4
.github/workflows/python-package.yaml
vendored
@@ -1,9 +1,12 @@
|
|||||||
|
name: CI/CD Pipeline
|
||||||
|
|
||||||
on:
|
on:
|
||||||
- push
|
- push
|
||||||
- pull_request
|
- pull_request
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
test:
|
test:
|
||||||
|
name: Test Python ${{ matrix.python-version }} on ${{ matrix.os }}
|
||||||
runs-on: ${{ matrix.os }}
|
runs-on: ${{ matrix.os }}
|
||||||
|
|
||||||
strategy:
|
strategy:
|
||||||
@@ -17,7 +20,6 @@ jobs:
|
|||||||
- "3.10"
|
- "3.10"
|
||||||
- "3.11"
|
- "3.11"
|
||||||
- "3.12"
|
- "3.12"
|
||||||
- "3.13"
|
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
|
|||||||
@@ -3,13 +3,13 @@ version: 2
|
|||||||
build:
|
build:
|
||||||
os: ubuntu-22.04
|
os: ubuntu-22.04
|
||||||
tools:
|
tools:
|
||||||
python: "3.12"
|
python: "3.11"
|
||||||
|
|
||||||
mkdocs:
|
mkdocs:
|
||||||
configuration: mkdocs.yml
|
configuration: mkdocs.yml
|
||||||
|
|
||||||
python:
|
python:
|
||||||
install:
|
install:
|
||||||
|
- requirements: requirements.txt
|
||||||
|
- requirements: requirements-dev.txt
|
||||||
- path: .
|
- path: .
|
||||||
extra_requirements:
|
|
||||||
- dev
|
|
||||||
|
|||||||
21
CHANGELOG.md
21
CHANGELOG.md
@@ -1,24 +1,13 @@
|
|||||||
# Changelog
|
# Changelog
|
||||||
|
|
||||||
|
|
||||||
|
## [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
|
|
||||||
* `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
|
|
||||||
|
|
||||||
* 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
|
* 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
|
## [2.3.1] -- 2024-07-06
|
||||||
|
|
||||||
|
|||||||
6
Makefile
6
Makefile
@@ -16,9 +16,11 @@ endif
|
|||||||
.PHONY: all
|
.PHONY: all
|
||||||
all: lint mypy test test-release
|
all: lint mypy test test-release
|
||||||
|
|
||||||
$(VENV): pyproject.toml
|
$(VENV): requirements.txt requirements-dev.txt pyproject.toml
|
||||||
$(PY) -m venv $(VENV)
|
$(PY) -m venv $(VENV)
|
||||||
$(BIN)/pip install --upgrade -e .['dev']
|
$(BIN)/pip install --upgrade -r requirements.txt
|
||||||
|
$(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='utf-8')
|
feed.write(fh, encoding="utf8")
|
||||||
|
|
||||||
|
|
||||||
def generate_index(
|
def generate_index(
|
||||||
|
|||||||
@@ -42,12 +42,7 @@ def get_last_modified(dirs: list[str]) -> float:
|
|||||||
for dir in dirs:
|
for dir in dirs:
|
||||||
for root, dirs, files in os.walk(dir):
|
for root, dirs, files in os.walk(dir):
|
||||||
for f in files:
|
for f in files:
|
||||||
try:
|
|
||||||
mtime = os.stat(os.path.join(root, f)).st_mtime
|
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:
|
if mtime > last_mtime:
|
||||||
last_mtime = mtime
|
last_mtime = mtime
|
||||||
|
|
||||||
|
|||||||
@@ -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,16 +1,33 @@
|
|||||||
@import "code-light.css" (prefers-color-scheme: light);
|
@import "code-light.css" (prefers-color-scheme: light);
|
||||||
@import "code-dark.css" (prefers-color-scheme: dark);
|
@import "code-dark.css" (prefers-color-scheme: dark);
|
||||||
|
|
||||||
:root {
|
@media (prefers-color-scheme: light) {
|
||||||
color-scheme: light dark;
|
:root {
|
||||||
--background: light-dark(#FFFFFF, #2B363B);
|
--background: #FFFFFF;
|
||||||
--background-dim: light-dark(#f5f7f9, #2F3C42);
|
--background-dim: #f5f7f9;
|
||||||
--foreground: light-dark(#2B303A, #f0f2f3);
|
|
||||||
--foreground-dim: light-dark(#576379, #d5d5d5);
|
--foreground: #2B303A;
|
||||||
--foreground-heavy: light-dark(#191C22, #f2f4f5);
|
--foreground-dim: #576379;
|
||||||
--primary-color: light-dark(#375287, #A1C5FF);
|
--foreground-heavy: #191C22;
|
||||||
|
|
||||||
|
--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 {
|
html {
|
||||||
font-size: 18px;
|
font-size: 18px;
|
||||||
font-family: serif;
|
font-family: serif;
|
||||||
|
|||||||
@@ -1,3 +1,3 @@
|
|||||||
"""Version information for the blag package."""
|
"""Version information for the blag package."""
|
||||||
|
|
||||||
__VERSION__ = "2.3.3"
|
__VERSION__ = "2.4.0"
|
||||||
|
|||||||
20
debian/changelog
vendored
20
debian/changelog
vendored
@@ -1,23 +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
|
|
||||||
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
|
blag (2.3.1) unstable; urgency=medium
|
||||||
|
|
||||||
* added manpage
|
* added manpage
|
||||||
|
|||||||
11
push
Executable file
11
push
Executable file
@@ -0,0 +1,11 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
|
||||||
|
REPO="gitea"
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
python3 -m pip install --upgrade twine
|
||||||
|
|
||||||
|
|
||||||
|
python3 -m twine upload --repository $REPO dist/*
|
||||||
@@ -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,13 +34,13 @@ dev = [
|
|||||||
"mkdocs",
|
"mkdocs",
|
||||||
"mkdocs-material",
|
"mkdocs-material",
|
||||||
"mkdocstrings[python]",
|
"mkdocstrings[python]",
|
||||||
"mypy",
|
"twine",
|
||||||
|
"wheel",
|
||||||
"pytest",
|
"pytest",
|
||||||
"pytest-cov",
|
"pytest-cov",
|
||||||
"ruff",
|
"ruff",
|
||||||
"twine",
|
"mypy",
|
||||||
"types-markdown",
|
"types-markdown",
|
||||||
"wheel",
|
|
||||||
]
|
]
|
||||||
|
|
||||||
[tool.setuptools.dynamic]
|
[tool.setuptools.dynamic]
|
||||||
@@ -65,6 +65,7 @@ addopts = """
|
|||||||
|
|
||||||
[tool.ruff]
|
[tool.ruff]
|
||||||
line-length = 79
|
line-length = 79
|
||||||
|
target-version = "py310"
|
||||||
|
|
||||||
[tool.ruff.lint]
|
[tool.ruff.lint]
|
||||||
select = [
|
select = [
|
||||||
|
|||||||
11
requirements-dev.txt
Normal file
11
requirements-dev.txt
Normal file
@@ -0,0 +1,11 @@
|
|||||||
|
build==1.2.1
|
||||||
|
mkdocs==1.6.0
|
||||||
|
mkdocs-material==9.5.31
|
||||||
|
mkdocstrings[python]==0.25.2
|
||||||
|
twine==5.1.1
|
||||||
|
wheel==0.44.0
|
||||||
|
pytest==8.3.2
|
||||||
|
pytest-cov==5.0.0
|
||||||
|
ruff==0.6.0
|
||||||
|
mypy==1.11.1
|
||||||
|
types-markdown==3.6.0.20240316
|
||||||
5
requirements.txt
Normal file
5
requirements.txt
Normal file
@@ -0,0 +1,5 @@
|
|||||||
|
markdown==3.6
|
||||||
|
feedgenerator==2.1.0
|
||||||
|
jinja2==3.1.4
|
||||||
|
pygments==2.18.0
|
||||||
|
pymdown-extensions==10.9
|
||||||
@@ -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