From 175812e18cf7ad51cde865f8b15171f69e9f4b04 Mon Sep 17 00:00:00 2001 From: Bastian Venthur Date: Fri, 16 Jun 2023 23:06:47 +0200 Subject: [PATCH] prepared version 2.0.0 --- CHANGELOG.md | 2 +- blag/version.py | 2 +- debian/blag-doc.docs | 2 +- debian/blag.install | 1 - debian/changelog | 41 +++++++++++++++++++++++++++++++++++++++++ debian/control | 8 +++++--- debian/rules | 12 ++---------- 7 files changed, 51 insertions(+), 17 deletions(-) delete mode 100644 debian/blag.install diff --git a/CHANGELOG.md b/CHANGELOG.md index eaef0b0..0f918f1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # Changelog -## [unreleased] +## [2.0.0] - 2023-06-16 ### Breaking diff --git a/blag/version.py b/blag/version.py index 7e6a9cc..3896400 100644 --- a/blag/version.py +++ b/blag/version.py @@ -1 +1 @@ -__VERSION__ = "1.5.0" +__VERSION__ = "2.0.0" diff --git a/debian/blag-doc.docs b/debian/blag-doc.docs index 344fcaa..45ddf0a 100644 --- a/debian/blag-doc.docs +++ b/debian/blag-doc.docs @@ -1 +1 @@ -build/html/ +site/ diff --git a/debian/blag.install b/debian/blag.install deleted file mode 100644 index 28d4e43..0000000 --- a/debian/blag.install +++ /dev/null @@ -1 +0,0 @@ -build/man/blag.1 /usr/share/man/man1 diff --git a/debian/changelog b/debian/changelog index fcf6839..8c41d4d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,44 @@ +blag (2.0.0) unstable; urgency=medium + + * new upstream version + + * breaking: + * blag does not use default fallback templates anymore and will return an + error if it is unable to find required templates, e.g. in `templates/`. + Users upgrading from older versions can either run `blag quickstart` + (don't forget to backup your `config.ini` or copy the templates from + blag's resources (the resource path is shown in the error message). + New users are not affected as `blag quickstart` will generate the needed + templates. + * Split former archive page which served as index.html into "index" and + "archive", each with their own template, respectively. Index is the + landing page and shows by default only the latest 10 articles. Archive + shows the full list of articles. + If you used custom templates, + * you should create an "index.html"-template (take blag's default one as + a starting point) + * you may want to include the new "/archive.html" link somewhere in your + navigation + + * Changes: + * blag comes now with a simple yet good looking default theme that + supports syntax highlighting and a light- and dark theme. + * apart from the generated configuration, `blag quickstart` will now also + create the initial directory structure, with the default template, the + static directory with the CSS files and the content directory with some + initial content to get the user started + * Added a make target to update the pygments themes + * updated dependencies: + * markdown 3.4.3 + * pygments 2.15.1 + * pytest 7.3.2 + * types-markdown 3.4.2.9 + * build 0.10.0 + * Switched from sphinx to mkdocs + * fixed pyproject.toml to include tests/conftest.py + + -- Bastian Venthur Fri, 16 Jun 2023 22:34:29 +0200 + blag (1.5.0) unstable; urgency=medium * new upstream version diff --git a/debian/control b/debian/control index 32a11f6..44ae262 100644 --- a/debian/control +++ b/debian/control @@ -5,7 +5,6 @@ Maintainer: Bastian Venthur Rules-Requires-Root: no Build-Depends: debhelper-compat (= 13), - dh-sequence-sphinxdoc, dh-sequence-python3, dh-python, pybuild-plugin-pyproject, @@ -17,7 +16,9 @@ Build-Depends: python3-pygments, python3-pytest, python3-pytest-cov, - python3-sphinx, + mkdocs, + mkdocs-material, + mkdocstrings-python-handlers, #Testsuite: autopkgtest-pkg-python Standards-Version: 4.6.0.1 Homepage: https://github.com/venthur/blag @@ -35,6 +36,7 @@ Description: Blog-aware, static site generator Blag is a blog-aware, static site generator, written in Python. It supports the following features: * Write content in Markdown + * Good looking default theme * Theming support using Jinja2 templates * Generation of Atom feeds for blog content * Fenced code blocks and syntax highlighting using Pygments @@ -45,13 +47,13 @@ Package: blag-doc Section: doc Architecture: all Depends: - ${sphinxdoc:Depends}, ${misc:Depends}, Multi-Arch: foreign Description: Blog-aware, static site generator (documentation) Blag is a blog-aware, static site generator, written in Python. It supports the following features: * Write content in Markdown + * Good looking default theme * Theming support using Jinja2 templates * Generation of Atom feeds for blog content * Fenced code blocks and syntax highlighting using Pygments diff --git a/debian/rules b/debian/rules index d61e888..9368a86 100755 --- a/debian/rules +++ b/debian/rules @@ -9,17 +9,9 @@ export PYBUILD_TEST_ARGS=--no-cov export PYBUILD_NAME=blag %: - dh $@ --with python3,sphinxdoc --buildsystem=pybuild + dh $@ --with python3 --buildsystem=pybuild - -# If you need to rebuild the Sphinx documentation: -# Add sphinxdoc to the dh --with line. -# -# And uncomment the following lines. execute_after_dh_auto_build-indep: export http_proxy=127.0.0.1:9 execute_after_dh_auto_build-indep: export https_proxy=127.0.0.1:9 execute_after_dh_auto_build-indep: - PYTHONPATH=. python3 -m sphinx -N -bhtml \ - docs/ build/html # HTML generator - PYTHONPATH=. python3 -m sphinx -N -bman \ - docs/ build/man # Manpage generator + PYTHONPATH=. mkdocs build