From 6b699f58ad73ff1d032bc47d9d76f70fd71396b7 Mon Sep 17 00:00:00 2001 From: Bastian Venthur Date: Mon, 18 Nov 2024 09:22:21 +0100 Subject: [PATCH 01/16] simplified color scheme selection --- blag/static/style.css | 33 ++++++++------------------------- 1 file changed, 8 insertions(+), 25 deletions(-) diff --git a/blag/static/style.css b/blag/static/style.css index f00afd6..8e5c332 100644 --- a/blag/static/style.css +++ b/blag/static/style.css @@ -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; From ef18685cef0b354137e039b3e68d220e654f55c6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 23 Dec 2024 14:19:20 +0000 Subject: [PATCH 02/16] Bump the all group across 1 directory with 10 updates Bumps the all group with 10 updates in the / directory: | Package | From | To | | --- | --- | --- | | [mkdocs-material](https://github.com/squidfunk/mkdocs-material) | `9.5.39` | `9.5.49` | | [mkdocstrings[python]](https://github.com/mkdocstrings/mkdocstrings) | `0.26.1` | `0.27.0` | | [twine](https://github.com/pypa/twine) | `5.1.1` | `6.0.1` | | [wheel](https://github.com/pypa/wheel) | `0.44.0` | `0.45.1` | | [pytest](https://github.com/pytest-dev/pytest) | `8.3.3` | `8.3.4` | | [pytest-cov](https://github.com/pytest-dev/pytest-cov) | `5.0.0` | `6.0.0` | | [ruff](https://github.com/astral-sh/ruff) | `0.6.9` | `0.8.4` | | [mypy](https://github.com/python/mypy) | `1.11.2` | `1.14.0` | | [types-markdown](https://github.com/python/typeshed) | `3.7.0.20240822` | `3.7.0.20241204` | | [jinja2](https://github.com/pallets/jinja) | `3.1.4` | `3.1.5` | Updates `mkdocs-material` from 9.5.39 to 9.5.49 - [Release notes](https://github.com/squidfunk/mkdocs-material/releases) - [Changelog](https://github.com/squidfunk/mkdocs-material/blob/master/CHANGELOG) - [Commits](https://github.com/squidfunk/mkdocs-material/compare/9.5.39...9.5.49) Updates `mkdocstrings[python]` from 0.26.1 to 0.27.0 - [Release notes](https://github.com/mkdocstrings/mkdocstrings/releases) - [Changelog](https://github.com/mkdocstrings/mkdocstrings/blob/main/CHANGELOG.md) - [Commits](https://github.com/mkdocstrings/mkdocstrings/compare/0.26.1...0.27.0) Updates `twine` from 5.1.1 to 6.0.1 - [Release notes](https://github.com/pypa/twine/releases) - [Changelog](https://github.com/pypa/twine/blob/main/docs/changelog.rst) - [Commits](https://github.com/pypa/twine/compare/v5.1.1...6.0.1) Updates `wheel` from 0.44.0 to 0.45.1 - [Release notes](https://github.com/pypa/wheel/releases) - [Changelog](https://github.com/pypa/wheel/blob/main/docs/news.rst) - [Commits](https://github.com/pypa/wheel/compare/0.44.0...0.45.1) Updates `pytest` from 8.3.3 to 8.3.4 - [Release notes](https://github.com/pytest-dev/pytest/releases) - [Changelog](https://github.com/pytest-dev/pytest/blob/main/CHANGELOG.rst) - [Commits](https://github.com/pytest-dev/pytest/compare/8.3.3...8.3.4) Updates `pytest-cov` from 5.0.0 to 6.0.0 - [Changelog](https://github.com/pytest-dev/pytest-cov/blob/master/CHANGELOG.rst) - [Commits](https://github.com/pytest-dev/pytest-cov/compare/v5.0.0...v6.0.0) Updates `ruff` from 0.6.9 to 0.8.4 - [Release notes](https://github.com/astral-sh/ruff/releases) - [Changelog](https://github.com/astral-sh/ruff/blob/main/CHANGELOG.md) - [Commits](https://github.com/astral-sh/ruff/compare/0.6.9...0.8.4) Updates `mypy` from 1.11.2 to 1.14.0 - [Changelog](https://github.com/python/mypy/blob/master/CHANGELOG.md) - [Commits](https://github.com/python/mypy/compare/v1.11.2...v1.14.0) Updates `types-markdown` from 3.7.0.20240822 to 3.7.0.20241204 - [Commits](https://github.com/python/typeshed/commits) Updates `jinja2` from 3.1.4 to 3.1.5 - [Release notes](https://github.com/pallets/jinja/releases) - [Changelog](https://github.com/pallets/jinja/blob/main/CHANGES.rst) - [Commits](https://github.com/pallets/jinja/compare/3.1.4...3.1.5) --- updated-dependencies: - dependency-name: mkdocs-material dependency-type: direct:development update-type: version-update:semver-patch dependency-group: all - dependency-name: mkdocstrings[python] dependency-type: direct:development update-type: version-update:semver-minor dependency-group: all - dependency-name: twine dependency-type: direct:development update-type: version-update:semver-major dependency-group: all - dependency-name: wheel dependency-type: direct:development update-type: version-update:semver-minor dependency-group: all - dependency-name: pytest dependency-type: direct:development update-type: version-update:semver-patch dependency-group: all - dependency-name: pytest-cov dependency-type: direct:development update-type: version-update:semver-major dependency-group: all - dependency-name: ruff dependency-type: direct:development update-type: version-update:semver-minor dependency-group: all - dependency-name: mypy dependency-type: direct:development update-type: version-update:semver-minor dependency-group: all - dependency-name: types-markdown dependency-type: direct:development update-type: version-update:semver-patch dependency-group: all - dependency-name: jinja2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: all ... Signed-off-by: dependabot[bot] --- requirements-dev.txt | 18 +++++++++--------- requirements.txt | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index d441bd4..3bf2a90 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -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 diff --git a/requirements.txt b/requirements.txt index 9a8eb4d..9a67d85 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ markdown==3.7 feedgenerator==2.1.0 -jinja2==3.1.4 +jinja2==3.1.5 pygments==2.18.0 From 85e57a7ef2ae5889650c74d432278554e414c424 Mon Sep 17 00:00:00 2001 From: Bastian Venthur Date: Fri, 3 Jan 2025 10:46:22 +0100 Subject: [PATCH 03/16] added py313 to github actions test suite --- .github/workflows/python-package.yaml | 1 + CHANGELOG.md | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/.github/workflows/python-package.yaml b/.github/workflows/python-package.yaml index a605a6d..aa0eb5c 100644 --- a/.github/workflows/python-package.yaml +++ b/.github/workflows/python-package.yaml @@ -20,6 +20,7 @@ jobs: - "3.10" - "3.11" - "3.12" + - "3.13" steps: - uses: actions/checkout@v4 diff --git a/CHANGELOG.md b/CHANGELOG.md index 9a21ca3..0bd0a3e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # 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 From abf7dc048594406ad0f93ca1a0d605d959875de4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 10 Mar 2025 15:34:18 +0000 Subject: [PATCH 04/16] Bump the all group across 1 directory with 8 updates Bumps the all group with 8 updates in the / directory: | Package | From | To | | --- | --- | --- | | [mkdocs-material](https://github.com/squidfunk/mkdocs-material) | `9.5.49` | `9.6.7` | | [mkdocstrings[python]](https://github.com/mkdocstrings/mkdocstrings) | `0.27.0` | `0.29.0` | | [twine](https://github.com/pypa/twine) | `6.0.1` | `6.1.0` | | [pytest](https://github.com/pytest-dev/pytest) | `8.3.4` | `8.3.5` | | [ruff](https://github.com/astral-sh/ruff) | `0.8.4` | `0.9.10` | | [mypy](https://github.com/python/mypy) | `1.14.0` | `1.15.0` | | [jinja2](https://github.com/pallets/jinja) | `3.1.5` | `3.1.6` | | [pygments](https://github.com/pygments/pygments) | `2.18.0` | `2.19.1` | Updates `mkdocs-material` from 9.5.49 to 9.6.7 - [Release notes](https://github.com/squidfunk/mkdocs-material/releases) - [Changelog](https://github.com/squidfunk/mkdocs-material/blob/master/CHANGELOG) - [Commits](https://github.com/squidfunk/mkdocs-material/compare/9.5.49...9.6.7) Updates `mkdocstrings[python]` from 0.27.0 to 0.29.0 - [Release notes](https://github.com/mkdocstrings/mkdocstrings/releases) - [Changelog](https://github.com/mkdocstrings/mkdocstrings/blob/main/CHANGELOG.md) - [Commits](https://github.com/mkdocstrings/mkdocstrings/compare/0.27.0...0.29.0) Updates `twine` from 6.0.1 to 6.1.0 - [Release notes](https://github.com/pypa/twine/releases) - [Changelog](https://github.com/pypa/twine/blob/main/docs/changelog.rst) - [Commits](https://github.com/pypa/twine/compare/6.0.1...6.1.0) Updates `pytest` from 8.3.4 to 8.3.5 - [Release notes](https://github.com/pytest-dev/pytest/releases) - [Changelog](https://github.com/pytest-dev/pytest/blob/main/CHANGELOG.rst) - [Commits](https://github.com/pytest-dev/pytest/compare/8.3.4...8.3.5) Updates `ruff` from 0.8.4 to 0.9.10 - [Release notes](https://github.com/astral-sh/ruff/releases) - [Changelog](https://github.com/astral-sh/ruff/blob/main/CHANGELOG.md) - [Commits](https://github.com/astral-sh/ruff/compare/0.8.4...0.9.10) Updates `mypy` from 1.14.0 to 1.15.0 - [Changelog](https://github.com/python/mypy/blob/master/CHANGELOG.md) - [Commits](https://github.com/python/mypy/compare/v1.14.0...v1.15.0) Updates `jinja2` from 3.1.5 to 3.1.6 - [Release notes](https://github.com/pallets/jinja/releases) - [Changelog](https://github.com/pallets/jinja/blob/main/CHANGES.rst) - [Commits](https://github.com/pallets/jinja/compare/3.1.5...3.1.6) Updates `pygments` from 2.18.0 to 2.19.1 - [Release notes](https://github.com/pygments/pygments/releases) - [Changelog](https://github.com/pygments/pygments/blob/master/CHANGES) - [Commits](https://github.com/pygments/pygments/compare/2.18.0...2.19.1) --- updated-dependencies: - dependency-name: mkdocs-material dependency-type: direct:development update-type: version-update:semver-minor dependency-group: all - dependency-name: mkdocstrings[python] dependency-type: direct:development update-type: version-update:semver-minor dependency-group: all - dependency-name: twine dependency-type: direct:development update-type: version-update:semver-minor dependency-group: all - dependency-name: pytest dependency-type: direct:development update-type: version-update:semver-patch dependency-group: all - dependency-name: ruff dependency-type: direct:development update-type: version-update:semver-minor dependency-group: all - dependency-name: mypy dependency-type: direct:development update-type: version-update:semver-minor dependency-group: all - dependency-name: jinja2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: all - dependency-name: pygments dependency-type: direct:production update-type: version-update:semver-minor dependency-group: all ... Signed-off-by: dependabot[bot] --- requirements-dev.txt | 12 ++++++------ requirements.txt | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index 3bf2a90..70fc57f 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -1,11 +1,11 @@ build==1.2.2.post1 mkdocs==1.6.1 -mkdocs-material==9.5.49 -mkdocstrings[python]==0.27.0 -twine==6.0.1 +mkdocs-material==9.6.7 +mkdocstrings[python]==0.29.0 +twine==6.1.0 wheel==0.45.1 -pytest==8.3.4 +pytest==8.3.5 pytest-cov==6.0.0 -ruff==0.8.4 -mypy==1.14.0 +ruff==0.9.10 +mypy==1.15.0 types-markdown==3.7.0.20241204 diff --git a/requirements.txt b/requirements.txt index 9a67d85..568497e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ markdown==3.7 feedgenerator==2.1.0 -jinja2==3.1.5 -pygments==2.18.0 +jinja2==3.1.6 +pygments==2.19.1 From 5c7213eac0759063fc527ea9b6661107d5ce69c0 Mon Sep 17 00:00:00 2001 From: Bastian Venthur Date: Tue, 1 Apr 2025 09:59:51 +0200 Subject: [PATCH 05/16] Update license -> license-files to satisfy newer setuptools --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index c51e644..85e94b6 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -10,7 +10,7 @@ authors = [ description = "blog-aware, static site generator" keywords = ["markdown", "blag", "blog", "static site generator", "cli"] readme = "README.md" -license = { file="LICENSE" } +license-files = ["LICENSE"] requires-python = ">=3.10" dynamic = ["version"] dependencies = [ From 00e02f13dc0b0d2d78851716d3328ae7ce25c3d9 Mon Sep 17 00:00:00 2001 From: Bastian Venthur Date: Tue, 1 Apr 2025 10:07:07 +0200 Subject: [PATCH 06/16] Added update-requirements target Manage requirements*.txt files by pip-tools --- Makefile | 5 +++ pyproject.toml | 9 ++--- requirements-dev.txt | 82 ++++++++++++++++++++++++++++++++++++++++---- requirements.txt | 10 +++++- 4 files changed, 94 insertions(+), 12 deletions(-) diff --git a/Makefile b/Makefile index 5b8208e..229d356 100644 --- a/Makefile +++ b/Makefile @@ -53,6 +53,11 @@ update-pygmentize: $(VENV) $(BIN)/pygmentize -f html -S default > blag/static/code-light.css $(BIN)/pygmentize -f html -S monokai > blag/static/code-dark.css +.PHONY: update-requirements +update-requirements: $(VENV) + $(BIN)/pip-compile --upgrade --no-annotate --output-file requirements.txt + $(BIN)/pip-compile --upgrade --no-annotate --extra dev --output-file requirements-dev.txt + .PHONY: docs docs: $(VENV) $(BIN)/mkdocs build diff --git a/pyproject.toml b/pyproject.toml index c51e644..e07cf3a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -14,9 +14,9 @@ license = { file="LICENSE" } requires-python = ">=3.10" dynamic = ["version"] dependencies = [ - "markdown", "feedgenerator", "jinja2", + "markdown", "pygments", ] @@ -34,13 +34,14 @@ dev = [ "mkdocs", "mkdocs-material", "mkdocstrings[python]", - "twine", - "wheel", + "mypy", + "pip-tools", "pytest", "pytest-cov", "ruff", - "mypy", + "twine", "types-markdown", + "wheel", ] [tool.setuptools.dynamic] diff --git a/requirements-dev.txt b/requirements-dev.txt index 70fc57f..70115fb 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -1,11 +1,79 @@ +# +# 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 +# +babel==2.17.0 +backrefs==5.8 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[toml]==7.8.0 +cryptography==44.0.2 +docutils==0.21.2 +feedgenerator==2.1.0 +ghp-import==2.1.0 +griffe==1.7.1 +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-material==9.6.7 -mkdocstrings[python]==0.29.0 -twine==6.1.0 -wheel==0.45.1 +mkdocs-autorefs==1.4.1 +mkdocs-get-deps==0.2.0 +mkdocs-material==9.6.11 +mkdocs-material-extensions==1.3.1 +mkdocstrings[python]==0.29.1 +mkdocstrings-python==1.16.8 +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.0.0 -ruff==0.9.10 -mypy==1.15.0 -types-markdown==3.7.0.20241204 +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.2 +secretstorage==3.3.3 +six==1.17.0 +twine==6.1.0 +types-markdown==3.7.0.20250322 +typing-extensions==4.13.0 +urllib3==2.3.0 +watchdog==6.0.0 +wheel==0.45.1 + +# The following packages are considered to be unsafe in a requirements file: +# pip +# setuptools diff --git a/requirements.txt b/requirements.txt index 568497e..a1f70d7 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,12 @@ -markdown==3.7 +# +# This file is autogenerated by pip-compile with Python 3.13 +# by the following command: +# +# pip-compile --no-annotate --output-file=requirements.txt +# feedgenerator==2.1.0 jinja2==3.1.6 +markdown==3.7 +markupsafe==3.0.2 pygments==2.19.1 +pytz==2025.2 From 031e3f92cd3df24c4600502fb226484e53d71097 Mon Sep 17 00:00:00 2001 From: Bastian Venthur Date: Tue, 8 Apr 2025 09:17:24 +0200 Subject: [PATCH 07/16] update changelog --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0bd0a3e..84eb38c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,9 @@ ## [unreleased] * 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 From 05af2042546d7626b1573dab3e0dbfc7f08fdcf7 Mon Sep 17 00:00:00 2001 From: Bastian Venthur Date: Tue, 8 Apr 2025 09:32:13 +0200 Subject: [PATCH 08/16] add --skip-extras --- Makefile | 4 ++-- requirements-dev.txt | 16 ++++++++-------- requirements.txt | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Makefile b/Makefile index 229d356..22378e5 100644 --- a/Makefile +++ b/Makefile @@ -55,8 +55,8 @@ update-pygmentize: $(VENV) .PHONY: update-requirements update-requirements: $(VENV) - $(BIN)/pip-compile --upgrade --no-annotate --output-file requirements.txt - $(BIN)/pip-compile --upgrade --no-annotate --extra dev --output-file requirements-dev.txt + $(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 docs: $(VENV) diff --git a/requirements-dev.txt b/requirements-dev.txt index 70115fb..ac0676d 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -2,7 +2,7 @@ # 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 +# pip-compile --extra=dev --no-annotate --output-file=requirements-dev.txt --strip-extras # babel==2.17.0 backrefs==5.8 @@ -12,12 +12,12 @@ cffi==1.17.1 charset-normalizer==3.4.1 click==8.1.8 colorama==0.4.6 -coverage[toml]==7.8.0 +coverage==7.8.0 cryptography==44.0.2 docutils==0.21.2 feedgenerator==2.1.0 ghp-import==2.1.0 -griffe==1.7.1 +griffe==1.7.2 id==1.5.0 idna==3.10 iniconfig==2.1.0 @@ -37,8 +37,8 @@ mkdocs-autorefs==1.4.1 mkdocs-get-deps==0.2.0 mkdocs-material==9.6.11 mkdocs-material-extensions==1.3.1 -mkdocstrings[python]==0.29.1 -mkdocstrings-python==1.16.8 +mkdocstrings==0.29.1 +mkdocstrings-python==1.16.10 more-itertools==10.6.0 mypy==1.15.0 mypy-extensions==1.0.0 @@ -54,7 +54,7 @@ pygments==2.19.1 pymdown-extensions==10.14.3 pyproject-hooks==1.2.0 pytest==8.3.5 -pytest-cov==6.0.0 +pytest-cov==6.1.1 python-dateutil==2.9.0.post0 pytz==2025.2 pyyaml==6.0.2 @@ -64,12 +64,12 @@ requests==2.32.3 requests-toolbelt==1.0.0 rfc3986==2.0.0 rich==14.0.0 -ruff==0.11.2 +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.0 +typing-extensions==4.13.1 urllib3==2.3.0 watchdog==6.0.0 wheel==0.45.1 diff --git a/requirements.txt b/requirements.txt index a1f70d7..1236fdb 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,7 +2,7 @@ # This file is autogenerated by pip-compile with Python 3.13 # by the following command: # -# pip-compile --no-annotate --output-file=requirements.txt +# pip-compile --no-annotate --output-file=requirements.txt --strip-extras # feedgenerator==2.1.0 jinja2==3.1.6 From b0139dad8d2e37d0910cf4566709b2c153c6cda9 Mon Sep 17 00:00:00 2001 From: Bastian Venthur Date: Thu, 24 Apr 2025 14:03:47 +0200 Subject: [PATCH 09/16] Fixed atom feed encoding to utf-8 --- CHANGELOG.md | 1 + blag/blag.py | 2 +- tests/test_blag.py | 9 +++++++++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 84eb38c..3ec3dce 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ## [unreleased] +* 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 diff --git a/blag/blag.py b/blag/blag.py index ed6db15..99b70e2 100644 --- a/blag/blag.py +++ b/blag/blag.py @@ -396,7 +396,7 @@ def generate_feed( ) with open(f"{output_dir}/atom.xml", "w") as fh: - feed.write(fh, encoding="utf8") + feed.write(fh, encoding='utf-8') def generate_index( diff --git a/tests/test_blag.py b/tests/test_blag.py index c7d1ca8..9311b39 100644 --- a/tests/test_blag.py +++ b/tests/test_blag.py @@ -99,6 +99,15 @@ def test_generate_feed_with_description(cleandir: str) -> None: assert '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: """Test parse_args with build.""" # test default args From 87a6ff09d5392a0afaebcfb26fb6debcf2bd95dd Mon Sep 17 00:00:00 2001 From: Bastian Venthur Date: Sun, 27 Apr 2025 11:49:08 +0200 Subject: [PATCH 10/16] bumped changelogs --- CHANGELOG.md | 2 +- blag/version.py | 2 +- debian/changelog | 10 ++++++++++ 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3ec3dce..48c31fd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # Changelog -## [unreleased] +## [2.3.3] -- 2025-04-27 * Fixed Atom feed encoding to 'utf-8' * Added Python 3.13 to github actions diff --git a/blag/version.py b/blag/version.py index deff8d1..2cf16d9 100644 --- a/blag/version.py +++ b/blag/version.py @@ -1,3 +1,3 @@ """Version information for the blag package.""" -__VERSION__ = "2.3.2" +__VERSION__ = "2.3.3" diff --git a/debian/changelog b/debian/changelog index 453e93e..98e3816 100644 --- a/debian/changelog +++ b/debian/changelog @@ -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 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 From 904f231754537996626757b8d1ac7b1aa9d6a6c8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 10 Jun 2025 11:52:25 +0000 Subject: [PATCH 11/16] Bump requests from 2.32.3 to 2.32.4 in the pip group Bumps the pip group with 1 update: [requests](https://github.com/psf/requests). Updates `requests` from 2.32.3 to 2.32.4 - [Release notes](https://github.com/psf/requests/releases) - [Changelog](https://github.com/psf/requests/blob/main/HISTORY.md) - [Commits](https://github.com/psf/requests/compare/v2.32.3...v2.32.4) --- updated-dependencies: - dependency-name: requests dependency-version: 2.32.4 dependency-type: direct:development dependency-group: pip ... Signed-off-by: dependabot[bot] --- requirements-dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index ac0676d..c4c3127 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -60,7 +60,7 @@ pytz==2025.2 pyyaml==6.0.2 pyyaml-env-tag==0.1 readme-renderer==44.0 -requests==2.32.3 +requests==2.32.4 requests-toolbelt==1.0.0 rfc3986==2.0.0 rich==14.0.0 From ba4bf8481c54deb1d01eb17fcf0401592dc99da6 Mon Sep 17 00:00:00 2001 From: Bastian Venthur Date: Fri, 9 May 2025 08:26:48 +0200 Subject: [PATCH 12/16] remove requirements.txt and requirements-dev.txt --- Makefile | 9 +---- pyproject.toml | 1 - requirements-dev.txt | 79 -------------------------------------------- requirements.txt | 12 ------- 4 files changed, 1 insertion(+), 100 deletions(-) delete mode 100644 requirements-dev.txt delete mode 100644 requirements.txt diff --git a/Makefile b/Makefile index 22378e5..1e4c586 100644 --- a/Makefile +++ b/Makefile @@ -16,10 +16,8 @@ endif .PHONY: all all: lint mypy test test-release -$(VENV): requirements.txt requirements-dev.txt pyproject.toml +$(VENV): pyproject.toml $(PY) -m venv $(VENV) - $(BIN)/pip install --upgrade -r requirements.txt - $(BIN)/pip install --upgrade -r requirements-dev.txt $(BIN)/pip install -e .['dev'] touch $(VENV) @@ -53,11 +51,6 @@ update-pygmentize: $(VENV) $(BIN)/pygmentize -f html -S default > blag/static/code-light.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 docs: $(VENV) $(BIN)/mkdocs build diff --git a/pyproject.toml b/pyproject.toml index 756c11a..0a2aa14 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -35,7 +35,6 @@ dev = [ "mkdocs-material", "mkdocstrings[python]", "mypy", - "pip-tools", "pytest", "pytest-cov", "ruff", diff --git a/requirements-dev.txt b/requirements-dev.txt deleted file mode 100644 index c4c3127..0000000 --- a/requirements-dev.txt +++ /dev/null @@ -1,79 +0,0 @@ -# -# 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 -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-autorefs==1.4.1 -mkdocs-get-deps==0.2.0 -mkdocs-material==9.6.11 -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.4 -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 - -# The following packages are considered to be unsafe in a requirements file: -# pip -# setuptools diff --git a/requirements.txt b/requirements.txt deleted file mode 100644 index 1236fdb..0000000 --- a/requirements.txt +++ /dev/null @@ -1,12 +0,0 @@ -# -# 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 -markupsafe==3.0.2 -pygments==2.19.1 -pytz==2025.2 From ce0f9f6fa7243be3505979f6b9a74696a107fd1a Mon Sep 17 00:00:00 2001 From: Bastian Venthur Date: Wed, 28 May 2025 15:46:31 +0200 Subject: [PATCH 13/16] fixed makefile and readthedocs --- .readthedocs.yaml | 8 ++++---- Makefile | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.readthedocs.yaml b/.readthedocs.yaml index 150d739..6448c43 100644 --- a/.readthedocs.yaml +++ b/.readthedocs.yaml @@ -3,13 +3,13 @@ version: 2 build: os: ubuntu-22.04 tools: - python: "3.11" + python: "3.12" mkdocs: configuration: mkdocs.yml python: install: - - requirements: requirements.txt - - requirements: requirements-dev.txt - - path: . + - path: . + extra_requirements: + - dev diff --git a/Makefile b/Makefile index 1e4c586..3fd3539 100644 --- a/Makefile +++ b/Makefile @@ -18,7 +18,7 @@ all: lint mypy test test-release $(VENV): pyproject.toml $(PY) -m venv $(VENV) - $(BIN)/pip install -e .['dev'] + $(BIN)/pip install --upgrade -e .['dev'] touch $(VENV) .PHONY: test From 9b11c67253972d18bc13c703bc8906f169154b9c Mon Sep 17 00:00:00 2001 From: Bastian Venthur Date: Fri, 18 Jul 2025 09:19:13 +0200 Subject: [PATCH 14/16] tiny improvement on github action --- .github/workflows/python-package.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/python-package.yaml b/.github/workflows/python-package.yaml index aa0eb5c..931e514 100644 --- a/.github/workflows/python-package.yaml +++ b/.github/workflows/python-package.yaml @@ -1,12 +1,9 @@ -name: CI/CD Pipeline - on: - push - pull_request jobs: test: - name: Test Python ${{ matrix.python-version }} on ${{ matrix.os }} runs-on: ${{ matrix.os }} strategy: From 720a92d72ddab7c9c6fd4629a0022565d2907f86 Mon Sep 17 00:00:00 2001 From: Bastian Venthur Date: Fri, 18 Jul 2025 09:30:38 +0200 Subject: [PATCH 15/16] updated changelog --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 48c31fd..dc714b4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## [unreleased] -- + +* Removed requirements.txt and requirements-dev.txt + ## [2.3.3] -- 2025-04-27 * Fixed Atom feed encoding to 'utf-8' From 1fa08afc6d51062fb0d463d1d035011726882948 Mon Sep 17 00:00:00 2001 From: Freyja Odinthrir Date: Wed, 10 Sep 2025 16:41:10 -0700 Subject: [PATCH 16/16] Bump versionfile, update changelog --- CHANGELOG.md | 5 +++++ blag/version.py | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0f92d41..f20a732 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,11 @@ # Changelog + +## [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) diff --git a/blag/version.py b/blag/version.py index 4e6cedd..4060e5e 100644 --- a/blag/version.py +++ b/blag/version.py @@ -1,3 +1,3 @@ """Version information for the blag package.""" -__VERSION__ = "2.4.1" +__VERSION__ = "2.4.2"