From 51622ba22b8ca93cfb93d0c8cc81490e8dd12fb0 Mon Sep 17 00:00:00 2001 From: Nabil Freij Date: Tue, 11 Apr 2023 21:14:03 -0700 Subject: [PATCH 01/46] release notes --- docs/release/ablog-v0.11-released.rst | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/docs/release/ablog-v0.11-released.rst b/docs/release/ablog-v0.11-released.rst index 0d8615fe..7bc20818 100644 --- a/docs/release/ablog-v0.11-released.rst +++ b/docs/release/ablog-v0.11-released.rst @@ -43,3 +43,10 @@ Pull Requests merged in: `append posts to atom feed to keep post order from new to old `__ from `lexming `__. `avoid spurious warning about posts with front-matter and post directive `__ from `lexming `__. + +ABlog v0.11.3 released +---------------------- + +Pull Requests merged in: + +`use fully qualified URLs for images in atom feed # `__ from `lexming `__. From be1fe2e62277f06da28662734307fd3c1d5b2f4f Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 17 Apr 2023 20:37:41 -0700 Subject: [PATCH 02/46] [pre-commit.ci] pre-commit autoupdate (#221) Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> --- .pre-commit-config.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index cae0eea0..1936caf6 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -2,7 +2,7 @@ ci: autofix_prs: false repos: - repo: https://github.com/PyCQA/autoflake - rev: v2.0.2 + rev: v2.1.0 hooks: - id: autoflake args: ['--in-place', '--remove-all-unused-imports', '--remove-unused-variable'] @@ -40,7 +40,7 @@ repos: - id: prettier types_or: [css, scss, javascript] - repo: https://github.com/Riverside-Healthcare/djLint - rev: v1.19.17 + rev: v1.23.0 hooks: - id: djlint-jinja types_or: ["html"] From 9ff3664889e6453cf83ed515bccced1d036a5412 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 24 Apr 2023 21:22:50 -0700 Subject: [PATCH 03/46] [pre-commit.ci] pre-commit autoupdate (#222) Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> --- .pre-commit-config.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 1936caf6..c0ef25dc 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -2,7 +2,7 @@ ci: autofix_prs: false repos: - repo: https://github.com/PyCQA/autoflake - rev: v2.1.0 + rev: v2.1.1 hooks: - id: autoflake args: ['--in-place', '--remove-all-unused-imports', '--remove-unused-variable'] @@ -25,7 +25,7 @@ repos: - id: check-yaml - id: debug-statements - repo: https://github.com/charliermarsh/ruff-pre-commit - rev: 'v0.0.261' + rev: 'v0.0.262' hooks: - id: ruff args: ['--fix'] @@ -35,12 +35,12 @@ repos: - id: stylelint additional_dependencies: ['stylelint@14.9.1', 'stylelint-config-standard@26.0.0'] - repo: https://github.com/pre-commit/mirrors-prettier - rev: v3.0.0-alpha.6 + rev: v3.0.0-alpha.9-for-vscode hooks: - id: prettier types_or: [css, scss, javascript] - repo: https://github.com/Riverside-Healthcare/djLint - rev: v1.23.0 + rev: v1.24.0 hooks: - id: djlint-jinja types_or: ["html"] From a15ad5d82d01900d677ffcace3f69c9f3389196a Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 1 May 2023 20:58:38 -0700 Subject: [PATCH 04/46] [pre-commit.ci] pre-commit autoupdate (#223) Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> --- .pre-commit-config.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index c0ef25dc..a716b3c3 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -25,7 +25,7 @@ repos: - id: check-yaml - id: debug-statements - repo: https://github.com/charliermarsh/ruff-pre-commit - rev: 'v0.0.262' + rev: 'v0.0.263' hooks: - id: ruff args: ['--fix'] @@ -40,7 +40,7 @@ repos: - id: prettier types_or: [css, scss, javascript] - repo: https://github.com/Riverside-Healthcare/djLint - rev: v1.24.0 + rev: v1.25.0 hooks: - id: djlint-jinja types_or: ["html"] From 8bb328589e5280357c231376fbaea6e52aa234df Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Tue, 9 May 2023 10:07:08 +0100 Subject: [PATCH 05/46] [pre-commit.ci] pre-commit autoupdate (#225) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit updates: - [github.com/charliermarsh/ruff-pre-commit: v0.0.263 → v0.0.265](https://github.com/charliermarsh/ruff-pre-commit/compare/v0.0.263...v0.0.265) - [github.com/Riverside-Healthcare/djLint: v1.25.0 → v1.26.0](https://github.com/Riverside-Healthcare/djLint/compare/v1.25.0...v1.26.0) Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> --- .pre-commit-config.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index a716b3c3..4e51c35c 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -25,7 +25,7 @@ repos: - id: check-yaml - id: debug-statements - repo: https://github.com/charliermarsh/ruff-pre-commit - rev: 'v0.0.263' + rev: 'v0.0.265' hooks: - id: ruff args: ['--fix'] @@ -40,7 +40,7 @@ repos: - id: prettier types_or: [css, scss, javascript] - repo: https://github.com/Riverside-Healthcare/djLint - rev: v1.25.0 + rev: v1.26.0 hooks: - id: djlint-jinja types_or: ["html"] From d4f39cd8f95f742f9ce3cdff630b93a1185b01da Mon Sep 17 00:00:00 2001 From: David Stansby Date: Wed, 10 May 2023 16:11:48 +0100 Subject: [PATCH 06/46] Use paragraph instead of container for blog post exerpts (#226) --- src/ablog/blog.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ablog/blog.py b/src/ablog/blog.py index d18c1f57..78906466 100644 --- a/src/ablog/blog.py +++ b/src/ablog/blog.py @@ -408,7 +408,7 @@ def to_html(self, pagename, fulltext=False, drop_h1=True, img_url=False): else: doctree.append(deepcopy) else: - excerpt_container = nodes.container() + excerpt_container = nodes.paragraph() excerpt_container.attributes["classes"].append("ablog-post-excerpt") for node in self.excerpt: excerpt_container.append(node.deepcopy()) From 148e25424d6f6b0e43986a7e903ed4c6ba04327e Mon Sep 17 00:00:00 2001 From: Nabil Freij Date: Wed, 10 May 2023 16:17:56 +0100 Subject: [PATCH 07/46] Relase notes --- .pre-commit-config.yaml | 2 +- docs/release/ablog-v0.11-released.rst | 17 ++++++++++++----- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 4e51c35c..e462878f 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -40,7 +40,7 @@ repos: - id: prettier types_or: [css, scss, javascript] - repo: https://github.com/Riverside-Healthcare/djLint - rev: v1.26.0 + rev: v1.27.0 hooks: - id: djlint-jinja types_or: ["html"] diff --git a/docs/release/ablog-v0.11-released.rst b/docs/release/ablog-v0.11-released.rst index 7bc20818..0c94e4e3 100644 --- a/docs/release/ablog-v0.11-released.rst +++ b/docs/release/ablog-v0.11-released.rst @@ -27,26 +27,33 @@ Pull Requests merged in: `Template rework `__. -`Add external links for posts `__ from `Chris Holdgraf `__. +`Add external links for posts #`__ from `Chris Holdgraf `__. ABlog v0.11.1 released ---------------------- Pull Requests merged in: -`Update version handling to remove use of pkg_resources `__ +`Update version handling to remove use of pkg_resources #`__ ABlog v0.11.2 released ---------------------- Pull Requests merged in: -`append posts to atom feed to keep post order from new to old `__ from `lexming `__. -`avoid spurious warning about posts with front-matter and post directive `__ from `lexming `__. +`append posts to atom feed to keep post order from new to old #`__ from `lexming `__. +`avoid spurious warning about posts with front-matter and post directive #`__ from `lexming `__. ABlog v0.11.3 released ---------------------- Pull Requests merged in: -`use fully qualified URLs for images in atom feed # `__ from `lexming `__. +`use fully qualified URLs for images in atom feed #`__ from `lexming `__. + +ABlog v0.11.4 released +---------------------- + +Pull Requests merged in: + +`Use paragraph instead of container for blog post exerpts #`__ from `lexming `__. From 62fd5c9264f072bd4d193a9c8dd8ce90ec93fa40 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Tue, 16 May 2023 08:36:52 +0100 Subject: [PATCH 08/46] [pre-commit.ci] pre-commit autoupdate (#227) Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> --- .pre-commit-config.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index e462878f..04ab7d37 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -25,7 +25,7 @@ repos: - id: check-yaml - id: debug-statements - repo: https://github.com/charliermarsh/ruff-pre-commit - rev: 'v0.0.265' + rev: 'v0.0.267' hooks: - id: ruff args: ['--fix'] @@ -40,7 +40,7 @@ repos: - id: prettier types_or: [css, scss, javascript] - repo: https://github.com/Riverside-Healthcare/djLint - rev: v1.27.0 + rev: v1.27.2 hooks: - id: djlint-jinja types_or: ["html"] From ef57947022c998f5a7fab48bb67eac309ba245d6 Mon Sep 17 00:00:00 2001 From: Nabil Freij Date: Tue, 16 May 2023 10:51:14 +0100 Subject: [PATCH 09/46] Patch broken docbuild (#228) --- docs/release/ablog-v0.11-released.rst | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/docs/release/ablog-v0.11-released.rst b/docs/release/ablog-v0.11-released.rst index 0c94e4e3..7e31edc9 100644 --- a/docs/release/ablog-v0.11-released.rst +++ b/docs/release/ablog-v0.11-released.rst @@ -9,51 +9,51 @@ ABlog v0.11 released ABlog v0.11 is released with the main focus being to update and tweak the HTML templates allow themes to override the default templates. In addition, all ablog elements in the templates wrapped in ``ablog__*`` divs to allow custom CSS rules. -We also adopt `NEP29 ` and drop support for older versions of Python and package versions that are 24 months old or older at time of release. +We also adopt `NEP29 `__ and drop support for older versions of Python and package versions that are 24 months old or older at time of release. Added support for external links to be posts. There are several breaking changes: -- 1. The template files are now in the `templates/ablog` folder. +- 1. The template files are now in the ``templates/ablog`` folder. Older templates are still in the old location but will raise a warning. These will be removed in a future version, please do not use them anymore. You will need to update any paths to them to add "ablog/" to the path. - 2. ``ablog`` has support for not injecting its own templates into the Sphinx build. - This is supported by add `skip_injecting_base_ablog_templates = True` to your configuration file. + This is supported by add ``skip_injecting_base_ablog_templates = True`` to your configuration file. - 3. Minimum version of Python is >=3.9 and Sphinx is >=5.0. Pull Requests merged in: `Template rework `__. -`Add external links for posts #`__ from `Chris Holdgraf `__. +`Add external links for posts `__ from `Chris Holdgraf `__. ABlog v0.11.1 released ---------------------- Pull Requests merged in: -`Update version handling to remove use of pkg_resources #`__ +`Update version handling to remove use of pkg_resources `__ ABlog v0.11.2 released ---------------------- Pull Requests merged in: -`append posts to atom feed to keep post order from new to old #`__ from `lexming `__. -`avoid spurious warning about posts with front-matter and post directive #`__ from `lexming `__. +`append posts to atom feed to keep post order from new to old `__ from `lexming `__. +`avoid spurious warning about posts with front-matter and post directive `__ from `lexming `__. ABlog v0.11.3 released ---------------------- Pull Requests merged in: -`use fully qualified URLs for images in atom feed #`__ from `lexming `__. +`use fully qualified URLs for images in atom feed `__ from `lexming `__. ABlog v0.11.4 released ---------------------- Pull Requests merged in: -`Use paragraph instead of container for blog post exerpts #`__ from `lexming `__. +`Use paragraph instead of container for blog post excerpts `__ from `dstansby `__. From 956e650ad7b725f57916085d19d39c4fc5c8a531 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Tue, 23 May 2023 10:21:04 +0200 Subject: [PATCH 10/46] [pre-commit.ci] pre-commit autoupdate (#230) Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> --- .pre-commit-config.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 04ab7d37..bdf62f70 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -25,7 +25,7 @@ repos: - id: check-yaml - id: debug-statements - repo: https://github.com/charliermarsh/ruff-pre-commit - rev: 'v0.0.267' + rev: 'v0.0.269' hooks: - id: ruff args: ['--fix'] @@ -40,7 +40,7 @@ repos: - id: prettier types_or: [css, scss, javascript] - repo: https://github.com/Riverside-Healthcare/djLint - rev: v1.27.2 + rev: v1.29.0 hooks: - id: djlint-jinja types_or: ["html"] From 3302dc5bdb3c74a0569fa2c22d31df6a5c2f3d51 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Tue, 30 May 2023 07:05:53 +0100 Subject: [PATCH 11/46] [pre-commit.ci] pre-commit autoupdate (#231) Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index bdf62f70..c649dff6 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -25,7 +25,7 @@ repos: - id: check-yaml - id: debug-statements - repo: https://github.com/charliermarsh/ruff-pre-commit - rev: 'v0.0.269' + rev: 'v0.0.270' hooks: - id: ruff args: ['--fix'] From eda4034c3b3cc67c882b291b0c486a69500efb95 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Tue, 6 Jun 2023 06:16:01 -0700 Subject: [PATCH 12/46] [pre-commit.ci] pre-commit autoupdate (#232) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit updates: - [github.com/Riverside-Healthcare/djLint: v1.29.0 → v1.30.2](https://github.com/Riverside-Healthcare/djLint/compare/v1.29.0...v1.30.2) Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index c649dff6..2f238dd1 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -40,7 +40,7 @@ repos: - id: prettier types_or: [css, scss, javascript] - repo: https://github.com/Riverside-Healthcare/djLint - rev: v1.29.0 + rev: v1.30.2 hooks: - id: djlint-jinja types_or: ["html"] From fc727c2115c4b8782f28febd7abcdb162ced2813 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Tue, 13 Jun 2023 09:08:16 -0700 Subject: [PATCH 13/46] [pre-commit.ci] pre-commit autoupdate (#233) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * [pre-commit.ci] pre-commit autoupdate updates: - [github.com/charliermarsh/ruff-pre-commit: v0.0.270 → v0.0.272](https://github.com/charliermarsh/ruff-pre-commit/compare/v0.0.270...v0.0.272) - [github.com/Riverside-Healthcare/djLint: v1.30.2 → v1.31.0](https://github.com/Riverside-Healthcare/djLint/compare/v1.30.2...v1.31.0) * FIx lint --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Co-authored-by: Nabil Freij --- .pre-commit-config.yaml | 4 ++-- src/ablog/templates/ablog/postcard.html | 2 +- src/ablog/templates/ablog/postcard2.html | 2 +- src/ablog/templates/postcard.html | 2 +- src/ablog/templates/postcard2.html | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 2f238dd1..21164fb3 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -25,7 +25,7 @@ repos: - id: check-yaml - id: debug-statements - repo: https://github.com/charliermarsh/ruff-pre-commit - rev: 'v0.0.270' + rev: 'v0.0.272' hooks: - id: ruff args: ['--fix'] @@ -40,7 +40,7 @@ repos: - id: prettier types_or: [css, scss, javascript] - repo: https://github.com/Riverside-Healthcare/djLint - rev: v1.30.2 + rev: v1.31.0 hooks: - id: djlint-jinja types_or: ["html"] diff --git a/src/ablog/templates/ablog/postcard.html b/src/ablog/templates/ablog/postcard.html index 76192886..479ea0dc 100644 --- a/src/ablog/templates/ablog/postcard.html +++ b/src/ablog/templates/ablog/postcard.html @@ -13,7 +13,7 @@

{% endif %} {% if post.date %} - {{ post.date.strftime(ablog.post_date_format)}} + {{ post.date.strftime(ablog.post_date_format) }} {% else %} Draft {% endif %} diff --git a/src/ablog/templates/ablog/postcard2.html b/src/ablog/templates/ablog/postcard2.html index 162f6456..f42d0c89 100644 --- a/src/ablog/templates/ablog/postcard2.html +++ b/src/ablog/templates/ablog/postcard2.html @@ -17,7 +17,7 @@ {% if fa %} {% else %} - {{ gettext('Author')}}: + {{ gettext('Author') }}: {% endif %} {% for coll in post.author %} diff --git a/src/ablog/templates/postcard.html b/src/ablog/templates/postcard.html index ccfa498b..229cc291 100644 --- a/src/ablog/templates/postcard.html +++ b/src/ablog/templates/postcard.html @@ -14,7 +14,7 @@

{% endif %} {% if post.date %} - {{ post.date.strftime(ablog.post_date_format)}} + {{ post.date.strftime(ablog.post_date_format) }} {% else %} Draft {% endif %} diff --git a/src/ablog/templates/postcard2.html b/src/ablog/templates/postcard2.html index 44762c41..c921822b 100644 --- a/src/ablog/templates/postcard2.html +++ b/src/ablog/templates/postcard2.html @@ -18,7 +18,7 @@ {% if fa %} {% else %} - {{ gettext('Author')}}: + {{ gettext('Author') }}: {% endif %} {% for coll in post.author %} From 6e8b1b9b383b8db10275373b75ae899c360dc6f8 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Tue, 27 Jun 2023 10:05:33 -0700 Subject: [PATCH 14/46] [pre-commit.ci] pre-commit autoupdate (#234) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit updates: - [github.com/PyCQA/autoflake: v2.1.1 → v2.2.0](https://github.com/PyCQA/autoflake/compare/v2.1.1...v2.2.0) - [github.com/charliermarsh/ruff-pre-commit: v0.0.272 → v0.0.275](https://github.com/charliermarsh/ruff-pre-commit/compare/v0.0.272...v0.0.275) - [github.com/Riverside-Healthcare/djLint: v1.31.0 → v1.31.1](https://github.com/Riverside-Healthcare/djLint/compare/v1.31.0...v1.31.1) Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> --- .pre-commit-config.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 21164fb3..053b6368 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -2,7 +2,7 @@ ci: autofix_prs: false repos: - repo: https://github.com/PyCQA/autoflake - rev: v2.1.1 + rev: v2.2.0 hooks: - id: autoflake args: ['--in-place', '--remove-all-unused-imports', '--remove-unused-variable'] @@ -25,7 +25,7 @@ repos: - id: check-yaml - id: debug-statements - repo: https://github.com/charliermarsh/ruff-pre-commit - rev: 'v0.0.272' + rev: 'v0.0.275' hooks: - id: ruff args: ['--fix'] @@ -40,7 +40,7 @@ repos: - id: prettier types_or: [css, scss, javascript] - repo: https://github.com/Riverside-Healthcare/djLint - rev: v1.31.0 + rev: v1.31.1 hooks: - id: djlint-jinja types_or: ["html"] From e39b65a6ea53df2c9a067f78022c86be6f4f91e4 Mon Sep 17 00:00:00 2001 From: Felix Hummel Date: Wed, 28 Jun 2023 17:51:13 +0200 Subject: [PATCH 15/46] docs: post_date_format_short (#235) Document the config option `post_date_format_short` that is used in recent posts. --- docs/manual/ablog-configuration-options.rst | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/docs/manual/ablog-configuration-options.rst b/docs/manual/ablog-configuration-options.rst index ec997bc2..f24e50e6 100644 --- a/docs/manual/ablog-configuration-options.rst +++ b/docs/manual/ablog-configuration-options.rst @@ -91,6 +91,10 @@ Post related Date display format (default is ``'%b %d, %Y'``) for published posts that goes as input to :meth:`datetime.date.strftime`. +.. confval:: post_date_format_short + + Date display format in recent posts (default is ``'%d %B'``) for published posts that goes as input to :meth:`datetime.date.strftime`. + .. confval:: post_auto_excerpt Number of paragraphs (default is ``1``) that will be displayed as an excerpt from the post. From e30ff2ccedd52e7119c77fa67a5110b910f7167c Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Tue, 4 Jul 2023 08:48:26 -0700 Subject: [PATCH 16/46] [pre-commit.ci] pre-commit autoupdate (#236) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit updates: - https://github.com/charliermarsh/ruff-pre-commit → https://github.com/astral-sh/ruff-pre-commit - [github.com/astral-sh/ruff-pre-commit: v0.0.275 → v0.0.276](https://github.com/astral-sh/ruff-pre-commit/compare/v0.0.275...v0.0.276) Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> --- .pre-commit-config.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 053b6368..53446303 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -24,8 +24,8 @@ repos: - id: end-of-file-fixer - id: check-yaml - id: debug-statements -- repo: https://github.com/charliermarsh/ruff-pre-commit - rev: 'v0.0.275' +- repo: https://github.com/astral-sh/ruff-pre-commit + rev: 'v0.0.276' hooks: - id: ruff args: ['--fix'] From 1b4282256ed0a771272c3a10744df0d2bf9f0ea1 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 10 Jul 2023 23:10:48 -0700 Subject: [PATCH 17/46] [pre-commit.ci] pre-commit autoupdate (#237) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit updates: - [github.com/psf/black: 23.3.0 → 23.7.0](https://github.com/psf/black/compare/23.3.0...23.7.0) - [github.com/astral-sh/ruff-pre-commit: v0.0.276 → v0.0.277](https://github.com/astral-sh/ruff-pre-commit/compare/v0.0.276...v0.0.277) - [github.com/pre-commit/mirrors-prettier: v3.0.0-alpha.9-for-vscode → v3.0.0](https://github.com/pre-commit/mirrors-prettier/compare/v3.0.0-alpha.9-for-vscode...v3.0.0) Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> --- .pre-commit-config.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 53446303..933aea12 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -11,7 +11,7 @@ repos: hooks: - id: isort - repo: https://github.com/psf/black - rev: 23.3.0 + rev: 23.7.0 hooks: - id: black - repo: https://github.com/pre-commit/pre-commit-hooks @@ -25,7 +25,7 @@ repos: - id: check-yaml - id: debug-statements - repo: https://github.com/astral-sh/ruff-pre-commit - rev: 'v0.0.276' + rev: 'v0.0.277' hooks: - id: ruff args: ['--fix'] @@ -35,7 +35,7 @@ repos: - id: stylelint additional_dependencies: ['stylelint@14.9.1', 'stylelint-config-standard@26.0.0'] - repo: https://github.com/pre-commit/mirrors-prettier - rev: v3.0.0-alpha.9-for-vscode + rev: v3.0.0 hooks: - id: prettier types_or: [css, scss, javascript] From e0edbca3a2cb8f0cd8369edea1711fb28ce5c404 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 17 Jul 2023 23:07:02 -0700 Subject: [PATCH 18/46] [pre-commit.ci] pre-commit autoupdate (#238) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit updates: - [github.com/astral-sh/ruff-pre-commit: v0.0.277 → v0.0.278](https://github.com/astral-sh/ruff-pre-commit/compare/v0.0.277...v0.0.278) Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 933aea12..3d2dd7c2 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -25,7 +25,7 @@ repos: - id: check-yaml - id: debug-statements - repo: https://github.com/astral-sh/ruff-pre-commit - rev: 'v0.0.277' + rev: 'v0.0.278' hooks: - id: ruff args: ['--fix'] From d25fa93456a75db88152a33e7c470ec4455b0aba Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 24 Jul 2023 21:50:57 -0700 Subject: [PATCH 19/46] [pre-commit.ci] pre-commit autoupdate (#239) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit updates: - [github.com/astral-sh/ruff-pre-commit: v0.0.278 → v0.0.280](https://github.com/astral-sh/ruff-pre-commit/compare/v0.0.278...v0.0.280) - [github.com/Riverside-Healthcare/djLint: v1.31.1 → v1.32.1](https://github.com/Riverside-Healthcare/djLint/compare/v1.31.1...v1.32.1) Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> --- .pre-commit-config.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 3d2dd7c2..67a464d0 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -25,7 +25,7 @@ repos: - id: check-yaml - id: debug-statements - repo: https://github.com/astral-sh/ruff-pre-commit - rev: 'v0.0.278' + rev: 'v0.0.280' hooks: - id: ruff args: ['--fix'] @@ -40,7 +40,7 @@ repos: - id: prettier types_or: [css, scss, javascript] - repo: https://github.com/Riverside-Healthcare/djLint - rev: v1.31.1 + rev: v1.32.1 hooks: - id: djlint-jinja types_or: ["html"] From fd6b864c5ab329e8dca53bb08385cdf2b95f9570 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Tue, 1 Aug 2023 07:53:00 -0700 Subject: [PATCH 20/46] [pre-commit.ci] pre-commit autoupdate (#242) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit updates: - [github.com/astral-sh/ruff-pre-commit: v0.0.280 → v0.0.281](https://github.com/astral-sh/ruff-pre-commit/compare/v0.0.280...v0.0.281) Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 67a464d0..4f65defa 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -25,7 +25,7 @@ repos: - id: check-yaml - id: debug-statements - repo: https://github.com/astral-sh/ruff-pre-commit - rev: 'v0.0.280' + rev: 'v0.0.281' hooks: - id: ruff args: ['--fix'] From be060a4a17d2072e8adc1110c9a22d10880b4886 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 7 Aug 2023 23:52:37 -0700 Subject: [PATCH 21/46] [pre-commit.ci] pre-commit autoupdate (#243) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit updates: - [github.com/astral-sh/ruff-pre-commit: v0.0.281 → v0.0.282](https://github.com/astral-sh/ruff-pre-commit/compare/v0.0.281...v0.0.282) - [github.com/pre-commit/mirrors-prettier: v3.0.0 → v3.0.1](https://github.com/pre-commit/mirrors-prettier/compare/v3.0.0...v3.0.1) Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> --- .pre-commit-config.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 4f65defa..70e38ddc 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -25,7 +25,7 @@ repos: - id: check-yaml - id: debug-statements - repo: https://github.com/astral-sh/ruff-pre-commit - rev: 'v0.0.281' + rev: 'v0.0.282' hooks: - id: ruff args: ['--fix'] @@ -35,7 +35,7 @@ repos: - id: stylelint additional_dependencies: ['stylelint@14.9.1', 'stylelint-config-standard@26.0.0'] - repo: https://github.com/pre-commit/mirrors-prettier - rev: v3.0.0 + rev: v3.0.1 hooks: - id: prettier types_or: [css, scss, javascript] From 856c05f8089083032f72de24809c51b93475be40 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Tue, 15 Aug 2023 09:23:13 -0500 Subject: [PATCH 22/46] [pre-commit.ci] pre-commit autoupdate (#244) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit updates: - [github.com/astral-sh/ruff-pre-commit: v0.0.282 → v0.0.284](https://github.com/astral-sh/ruff-pre-commit/compare/v0.0.282...v0.0.284) Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 70e38ddc..79aa1b8a 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -25,7 +25,7 @@ repos: - id: check-yaml - id: debug-statements - repo: https://github.com/astral-sh/ruff-pre-commit - rev: 'v0.0.282' + rev: 'v0.0.284' hooks: - id: ruff args: ['--fix'] From 04050726ea292d51ac036583158d4b2ffa0a2133 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Tue, 22 Aug 2023 06:24:31 -0700 Subject: [PATCH 23/46] [pre-commit.ci] pre-commit autoupdate (#248) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit updates: - [github.com/astral-sh/ruff-pre-commit: v0.0.284 → v0.0.285](https://github.com/astral-sh/ruff-pre-commit/compare/v0.0.284...v0.0.285) - [github.com/pre-commit/mirrors-prettier: v3.0.1 → v3.0.2](https://github.com/pre-commit/mirrors-prettier/compare/v3.0.1...v3.0.2) Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> --- .pre-commit-config.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 79aa1b8a..6d009921 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -25,7 +25,7 @@ repos: - id: check-yaml - id: debug-statements - repo: https://github.com/astral-sh/ruff-pre-commit - rev: 'v0.0.284' + rev: 'v0.0.285' hooks: - id: ruff args: ['--fix'] @@ -35,7 +35,7 @@ repos: - id: stylelint additional_dependencies: ['stylelint@14.9.1', 'stylelint-config-standard@26.0.0'] - repo: https://github.com/pre-commit/mirrors-prettier - rev: v3.0.1 + rev: v3.0.2 hooks: - id: prettier types_or: [css, scss, javascript] From b7a7f2373375263477add7471e2a5f1452b7e9b8 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 28 Aug 2023 23:15:31 -0700 Subject: [PATCH 24/46] [pre-commit.ci] pre-commit autoupdate (#249) Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 6d009921..7f335aa3 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -25,7 +25,7 @@ repos: - id: check-yaml - id: debug-statements - repo: https://github.com/astral-sh/ruff-pre-commit - rev: 'v0.0.285' + rev: 'v0.0.286' hooks: - id: ruff args: ['--fix'] From 9cbd54ae66557a9289a197fa777762b3b12c7d03 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Tue, 5 Sep 2023 08:15:14 -0700 Subject: [PATCH 25/46] [pre-commit.ci] pre-commit autoupdate (#250) Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> --- .pre-commit-config.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 7f335aa3..d8e9fb64 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -2,7 +2,7 @@ ci: autofix_prs: false repos: - repo: https://github.com/PyCQA/autoflake - rev: v2.2.0 + rev: v2.2.1 hooks: - id: autoflake args: ['--in-place', '--remove-all-unused-imports', '--remove-unused-variable'] @@ -25,7 +25,7 @@ repos: - id: check-yaml - id: debug-statements - repo: https://github.com/astral-sh/ruff-pre-commit - rev: 'v0.0.286' + rev: 'v0.0.287' hooks: - id: ruff args: ['--fix'] @@ -35,7 +35,7 @@ repos: - id: stylelint additional_dependencies: ['stylelint@14.9.1', 'stylelint-config-standard@26.0.0'] - repo: https://github.com/pre-commit/mirrors-prettier - rev: v3.0.2 + rev: v3.0.3 hooks: - id: prettier types_or: [css, scss, javascript] From ea924ca8d89fa8416c6811e117c50e25721c7464 Mon Sep 17 00:00:00 2001 From: Stuart Mumford Date: Thu, 7 Sep 2023 17:33:18 +0100 Subject: [PATCH 26/46] Fix incorrect /div when using discuss (#251) --- src/ablog/templates/ablog/postcard2.html | 4 ++-- src/ablog/templates/postcard2.html | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/ablog/templates/ablog/postcard2.html b/src/ablog/templates/ablog/postcard2.html index f42d0c89..c2fbbd97 100644 --- a/src/ablog/templates/ablog/postcard2.html +++ b/src/ablog/templates/ablog/postcard2.html @@ -1,5 +1,5 @@ -{% if post.published and post.date != post.update %}
+{% if post.published and post.date != post.update %}
  • {% if fa %} @@ -161,5 +161,5 @@ {% endif %}
    • -
    {% endif %} + diff --git a/src/ablog/templates/postcard2.html b/src/ablog/templates/postcard2.html index c921822b..fb3dd63d 100644 --- a/src/ablog/templates/postcard2.html +++ b/src/ablog/templates/postcard2.html @@ -1,6 +1,6 @@ {{ warning("postcard2.html is an old template path, that is no longer used by ablog. Please use ablog/postcard2.html instead.") }} -{% if post.published and post.date != post.update %}
    +{% if post.published and post.date != post.update %}
  • {% if fa %} @@ -162,5 +162,5 @@ {% endif %}
    • -
    {% endif %} + From 595a0c03c901b5e56d7f2ff86b40784f1978262e Mon Sep 17 00:00:00 2001 From: Nabil Freij Date: Thu, 7 Sep 2023 09:50:05 -0700 Subject: [PATCH 27/46] Update ablog-v0.11-released.rst --- docs/release/ablog-v0.11-released.rst | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/docs/release/ablog-v0.11-released.rst b/docs/release/ablog-v0.11-released.rst index 7e31edc9..056de6c7 100644 --- a/docs/release/ablog-v0.11-released.rst +++ b/docs/release/ablog-v0.11-released.rst @@ -57,3 +57,10 @@ ABlog v0.11.4 released Pull Requests merged in: `Use paragraph instead of container for blog post excerpts `__ from `dstansby `__. + +ABlog v0.11.5 released +---------------------- + +Pull Requests merged in: + +`Fix incorrect /div when using discuss `__ from `Cadair `__. From 6623450160c42e7c442124b0f9e2cae2860d7caf Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Wed, 13 Sep 2023 10:36:24 +0200 Subject: [PATCH 28/46] [pre-commit.ci] pre-commit autoupdate (#252) Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> --- .pre-commit-config.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index d8e9fb64..a045cf0f 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -11,7 +11,7 @@ repos: hooks: - id: isort - repo: https://github.com/psf/black - rev: 23.7.0 + rev: 23.9.1 hooks: - id: black - repo: https://github.com/pre-commit/pre-commit-hooks @@ -25,7 +25,7 @@ repos: - id: check-yaml - id: debug-statements - repo: https://github.com/astral-sh/ruff-pre-commit - rev: 'v0.0.287' + rev: 'v0.0.288' hooks: - id: ruff args: ['--fix'] From c3da42ddce833f975cbe4fb7dea681acb1b535a1 Mon Sep 17 00:00:00 2001 From: Stefano David <38253286+stefanodavid@users.noreply.github.com> Date: Mon, 18 Sep 2023 15:22:50 +0200 Subject: [PATCH 29/46] Adds IT locale (#253) --- src/ablog/locales/it/LC_MESSAGES/sphinx.mo | Bin 0 -> 1524 bytes src/ablog/locales/it/LC_MESSAGES/sphinx.po | 130 +++++++++++++++++++++ 2 files changed, 130 insertions(+) create mode 100644 src/ablog/locales/it/LC_MESSAGES/sphinx.mo create mode 100644 src/ablog/locales/it/LC_MESSAGES/sphinx.po diff --git a/src/ablog/locales/it/LC_MESSAGES/sphinx.mo b/src/ablog/locales/it/LC_MESSAGES/sphinx.mo new file mode 100644 index 0000000000000000000000000000000000000000..2c2495df54e3426b83a63d94e70925f046c0beda GIT binary patch literal 1524 zcmZvaO^g&p6vqohlt#W$Q8|<(CJ^YRdnP2iy)Nu5vzXOgnd}aPo7QyK_7>^snp9O! z7>*_$;KqR)2SdV5j~=|}fr|$d6HVk|OgwPm;zh5<|C_EIFrhN9fA78e`q!KH$I(6a z8OD3Cld!*GAHaUvg%8H(yBT{06yQEkdTQ`>#1n8Y_yzbHcn1u?dw%|bpMT`zuR%KJ zTOa@6;~&92$p7NwCw~4$O zXCUbqdQLpQ1P>#B52W=Eef*8*_aG#*pFMvC>AWZ4LGUT)|FWrm%DoGtLHmwRy{1Ow z9)pn%l##s+qe17^3(c5qpdkaSY{}C9~Z)dy%=LC#uPw!!!vLxd@ zZJnKZqsBAYwi-*MYPYS8hh>+AlZ7@4Gv1xBt`S?zguj;c6aUm&QU>%Eh461&^a7j@ogQ%W*P)wiwJ0646eA4LQ=rh3mFZ zdAM8`Htg$^udH`g*Oofn?#9aIX3)DDZa@~D7ItxC%3E=(9mexva)BpF+HReVTX7t$ z3G2eX5tS{4(TKN&%YL!r-)N};L+o^1)W@{e0WDK z8X!UgmdZW;>IHAJ&N6AO8f(_82ZK_fM>X|g$IIY3u4{bFbFt&A|E^e5|Jp*EEmBCBT+sVF)74`t<7xc~qF literal 0 HcmV?d00001 diff --git a/src/ablog/locales/it/LC_MESSAGES/sphinx.po b/src/ablog/locales/it/LC_MESSAGES/sphinx.po new file mode 100644 index 00000000..8c977602 --- /dev/null +++ b/src/ablog/locales/it/LC_MESSAGES/sphinx.po @@ -0,0 +1,130 @@ +# Translations template for ablog. +# Copyright (C) 2022 ORGANIZATION +# This file is distributed under the same license as the ablog project. +# FIRST AUTHOR , 2022. +# +msgid "" +msgstr "" +"Project-Id-Version: ablog 0.10.30.dev19+gb9b1a31\n" +"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" +"POT-Creation-Date: 2022-11-14 16:46-0800\n" +"PO-Revision-Date: 2023-09-15 11:32+0200\n" +"Last-Translator: Stefano David \n" +"Language-Team: \n" +"Language: it\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"Generated-By: Babel 2.11.0\n" +"X-Generator: Poedit 3.3.2\n" + +#: ablog/post.py:272 +msgid "Updated on " +msgstr "Aggiornato il " + +#: ablog/post.py:564 ablog/templates/ablog/authors.html:3 +#: ablog/templates/authors.html:4 +msgid "Authors" +msgstr "Autori" + +#: ablog/post.py:564 ablog/post.py:631 +msgid "Posts by" +msgstr "Articoli di" + +#: ablog/post.py:565 ablog/templates/ablog/locations.html:4 +#: ablog/templates/locations.html:5 +msgid "Locations" +msgstr "Località" + +#: ablog/post.py:565 ablog/post.py:632 +msgid "Posts from" +msgstr "Articolo da" + +#: ablog/post.py:566 ablog/templates/ablog/languages.html:4 +#: ablog/templates/languages.html:5 +msgid "Languages" +msgstr "Lingue" + +#: ablog/post.py:566 ablog/post.py:567 ablog/post.py:633 ablog/post.py:634 +msgid "Posts in" +msgstr "Articoli in" + +#: ablog/post.py:567 ablog/templates/ablog/categories.html:4 +#: ablog/templates/categories.html:5 +msgid "Categories" +msgstr "Categorie" + +#: ablog/post.py:568 +msgid "All posts" +msgstr "Tutti gli articoli" + +#: ablog/post.py:568 ablog/post.py:635 +msgid "Posted in" +msgstr "Pubblicato in" + +#: ablog/post.py:569 ablog/templates/ablog/postcard2.html:117 +#: ablog/templates/ablog/tagcloud.html:3 ablog/templates/postcard2.html:118 +#: ablog/templates/tagcloud.html:4 +msgid "Tags" +msgstr "Tag" + +#: ablog/post.py:569 ablog/post.py:636 +msgid "Posts tagged" +msgstr "Articoli con tag" + +#: ablog/post.py:594 +msgid "All Posts" +msgstr "Tutti gli articoli" + +#: ablog/post.py:595 +msgid "All" +msgstr "Tutti" + +#: ablog/post.py:603 +msgid "Drafts" +msgstr "Bozze" + +#: ablog/templates/ablog/archives.html:4 ablog/templates/archives.html:5 +msgid "Archives" +msgstr "Archivi" + +#: ablog/templates/ablog/collection.html:56 ablog/templates/collection.html:57 +msgid "Read more ..." +msgstr "Leggi di più..." + +#: ablog/templates/ablog/postcard2.html:8 ablog/templates/postcard2.html:9 +msgid "Update" +msgstr "Aggiornamento" + +#: ablog/templates/ablog/postcard2.html:20 ablog/templates/postcard2.html:21 +msgid "Author" +msgstr "Autore" + +#: ablog/templates/ablog/postcard2.html:44 ablog/templates/postcard2.html:45 +msgid "Location" +msgstr "Località" + +#: ablog/templates/ablog/postcard2.html:68 ablog/templates/postcard2.html:69 +msgid "Language" +msgstr "Lingua" + +#: ablog/templates/ablog/postcard2.html:92 ablog/templates/postcard2.html:93 +msgid "Category" +msgstr "Categoria" + +#: ablog/templates/ablog/postcard2.html:123 ablog/templates/postcard2.html:124 +msgid "Tag" +msgstr "Tag" + +#: ablog/templates/ablog/postnavy.html:8 ablog/templates/postnavy.html:9 +msgid "Previous" +msgstr "Precedente" + +#: ablog/templates/ablog/postnavy.html:22 ablog/templates/postnavy.html:23 +msgid "Next" +msgstr "Successivo" + +#: ablog/templates/ablog/recentposts.html:4 ablog/templates/recentposts.html:5 +msgid "Recent Posts" +msgstr "Articoli recenti" From c86f0d9201cb73e280a15a0406a725e7df8e8b99 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Wed, 20 Sep 2023 07:05:52 +0900 Subject: [PATCH 30/46] [pre-commit.ci] pre-commit autoupdate (#254) Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> --- .pre-commit-config.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index a045cf0f..31e6b988 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -25,7 +25,7 @@ repos: - id: check-yaml - id: debug-statements - repo: https://github.com/astral-sh/ruff-pre-commit - rev: 'v0.0.288' + rev: 'v0.0.290' hooks: - id: ruff args: ['--fix'] @@ -40,7 +40,7 @@ repos: - id: prettier types_or: [css, scss, javascript] - repo: https://github.com/Riverside-Healthcare/djLint - rev: v1.32.1 + rev: v1.33.0 hooks: - id: djlint-jinja types_or: ["html"] From c650ba68f633cc24e25fee51f25332aab9783e25 Mon Sep 17 00:00:00 2001 From: Hendrik Makait Date: Fri, 6 Oct 2023 21:33:44 +0200 Subject: [PATCH 31/46] Enables configuring a `canonical_link` for individual posts (#258) * Allow canonical links per post * pre-commit * Add docs * Typo --- docs/manual/posting-and-listing.rst | 4 ++++ roots/test-canonical/canonical.rst | 9 +++++++++ roots/test-canonical/conf.py | 20 ++++++++++++++++++++ roots/test-canonical/index.rst | 2 ++ roots/test-canonical/post.rst | 11 +++++++++++ roots/test-canonical/postlist.rst | 4 ++++ src/ablog/__init__.py | 2 ++ src/ablog/blog.py | 1 + src/ablog/post.py | 3 +++ src/ablog/tests/test_canonical.py | 25 +++++++++++++++++++++++++ 10 files changed, 81 insertions(+) create mode 100644 roots/test-canonical/canonical.rst create mode 100644 roots/test-canonical/conf.py create mode 100644 roots/test-canonical/index.rst create mode 100644 roots/test-canonical/post.rst create mode 100644 roots/test-canonical/postlist.rst create mode 100644 src/ablog/tests/test_canonical.py diff --git a/docs/manual/posting-and-listing.rst b/docs/manual/posting-and-listing.rst index afe5cce4..1ae9a0f9 100644 --- a/docs/manual/posting-and-listing.rst +++ b/docs/manual/posting-and-listing.rst @@ -67,6 +67,10 @@ Any page in a Sphinx_ project can be converted to a post using the following dir You can change this behavior and also add an image to the excerpt. To find out how, see :ref:`post-excerpts-and-images`. + **Canonical links** + + If you re-publish content already existing on another URL (e.g., if you re-publish content from an employer's blog your personal one), use the ``canonical_link`` parameter to create a [canonical link relation](https://datatracker.ietf.org/doc/html/rfc6596) to the original version. + **External links** If you'd like a post to point to an external website (e.g., if you host your posts on a blogging platform like Medium but wish to maintain a list of posts on your ``Ablog`` site), use the ``external_link`` parameter and this will be used instead. diff --git a/roots/test-canonical/canonical.rst b/roots/test-canonical/canonical.rst new file mode 100644 index 00000000..c5e706bc --- /dev/null +++ b/roots/test-canonical/canonical.rst @@ -0,0 +1,9 @@ +.. post:: 2021-12-01 + :tags: Canonical + :canonical_link: https://canonical.example.org/foo.html + +Canonical post +============= + +This post will get generated, but its [canonical link](https://datatracker.ietf.org/doc/html/rfc6596) +in the header will point to ``canonical_link``. diff --git a/roots/test-canonical/conf.py b/roots/test-canonical/conf.py new file mode 100644 index 00000000..781e7747 --- /dev/null +++ b/roots/test-canonical/conf.py @@ -0,0 +1,20 @@ +extensions = ["ablog"] + +# Enable Atom feed generation +blog_baseurl = "https://blog.example.com/" +# Include full post in feeds +blog_feed_fulltext = True +# Add a social media Atom feed +blog_feed_templates = { + # Use defaults, no templates + "atom": {}, + # Create content text suitable posting to micro-bogging + "social": { + # Format tags as hashtags and append to the content + "content": "{{ title }}{% for tag in post.tags %}" + " #{{ tag.name|trim()|replace(' ', '') }}" + "{% endfor %}", + }, +} +# Sphinx creates canonical links pointing to this base URL by default +html_baseurl = blog_baseurl diff --git a/roots/test-canonical/index.rst b/roots/test-canonical/index.rst new file mode 100644 index 00000000..4a0bb51b --- /dev/null +++ b/roots/test-canonical/index.rst @@ -0,0 +1,2 @@ +test-external +============= diff --git a/roots/test-canonical/post.rst b/roots/test-canonical/post.rst new file mode 100644 index 00000000..46ac2929 --- /dev/null +++ b/roots/test-canonical/post.rst @@ -0,0 +1,11 @@ +.. post:: 2022-12-01 + :tags: Foo Tag, BarTag + +Foo Post Title +============== + + Foo post description `with link`_. + +Foo post content. + +.. _`with link`: https://example.com diff --git a/roots/test-canonical/postlist.rst b/roots/test-canonical/postlist.rst new file mode 100644 index 00000000..d944b649 --- /dev/null +++ b/roots/test-canonical/postlist.rst @@ -0,0 +1,4 @@ +postlist +======== + +.. postlist:: diff --git a/src/ablog/__init__.py b/src/ablog/__init__.py index 03ca9650..15dbf36f 100755 --- a/src/ablog/__init__.py +++ b/src/ablog/__init__.py @@ -70,6 +70,8 @@ def html_page_context(app, pagename, templatename, context, doctree): if builder_support(app): context["ablog"] = blog = Blog(app) context["anchor"] = anchor + if pagename in blog and blog[pagename].canonical_link: + context["pageurl"] = blog[pagename].canonical_link # following is already available for archive pages if blog.blog_baseurl and "feed_path" not in context: context["feed_path"] = blog.blog_path diff --git a/src/ablog/blog.py b/src/ablog/blog.py index 78906466..afadd70b 100644 --- a/src/ablog/blog.py +++ b/src/ablog/blog.py @@ -353,6 +353,7 @@ def __init__(self, blog, docname, info): self.nocomments = info["nocomments"] self.published = date and date < TOMORROW self.draft = not self.published + self.canonical_link = info["canonical_link"] self.external_link = info["external_link"] self._title = info["title"] self.excerpt = info["excerpt"] diff --git a/src/ablog/post.py b/src/ablog/post.py index 7c077e6d..a010a2aa 100644 --- a/src/ablog/post.py +++ b/src/ablog/post.py @@ -80,6 +80,7 @@ class PostDirective(Directive): "excerpt": int, "exclude": directives.flag, "nocomments": directives.flag, + "canonical_link": str, "external_link": str, } @@ -235,6 +236,7 @@ def _update_post_node(node, options, arguments): node["excerpt"] = options.get("excerpt", None) node["exclude"] = "exclude" in options node["nocomments"] = "nocomments" in options + node["canonical_link"] = options.get("canonical_link", []) node["external_link"] = options.get("external_link", []) return node @@ -407,6 +409,7 @@ def process_posts(app, doctree): "nocomments": node["nocomments"], "image": node["image"], "exclude": node["exclude"], + "canonical_link": node["canonical_link"], "external_link": node["external_link"], "doctree": section_copy, } diff --git a/src/ablog/tests/test_canonical.py b/src/ablog/tests/test_canonical.py new file mode 100644 index 00000000..12346452 --- /dev/null +++ b/src/ablog/tests/test_canonical.py @@ -0,0 +1,25 @@ +import pytest + + +def read_text(path): + """ + Support function to give backward compatibility with older sphinx (v2). + """ + if hasattr(path, "read_text"): + return path.read_text() + return path.text() + + +@pytest.mark.sphinx("html", testroot="canonical") # using roots/test-canonical +def test_canonical(app, status, warning): + app.build() + + assert app.statuscode == 0 + assert (app.outdir / "post.html").exists() + assert (app.outdir / "canonical.html").exists() + + html = read_text(app.outdir / "post.html") + assert '' in html + + html = read_text(app.outdir / "canonical.html") + assert '' in html From a54cdaa90f7a35a13b153a420366f858b4a2a89b Mon Sep 17 00:00:00 2001 From: Nabil Freij Date: Fri, 6 Oct 2023 12:55:00 -0700 Subject: [PATCH 32/46] Add release notes --- docs/release/ablog-v0.11-released.rst | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/docs/release/ablog-v0.11-released.rst b/docs/release/ablog-v0.11-released.rst index 056de6c7..3631c839 100644 --- a/docs/release/ablog-v0.11-released.rst +++ b/docs/release/ablog-v0.11-released.rst @@ -64,3 +64,12 @@ ABlog v0.11.5 released Pull Requests merged in: `Fix incorrect /div when using discuss `__ from `Cadair `__. + +ABlog v0.11.6 released +---------------------- + +Pull Requests merged in: + +`Adds IT locale `__ from `Cadair `__. + +`Enables configuring a canonical_link for individual posts `__ from `Cadair `__. From cc8b9511232a0bfb1fe050afd7e8a7753705b98f Mon Sep 17 00:00:00 2001 From: Nabil Freij Date: Fri, 6 Oct 2023 12:55:31 -0700 Subject: [PATCH 33/46] Wrong names --- docs/release/ablog-v0.11-released.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/release/ablog-v0.11-released.rst b/docs/release/ablog-v0.11-released.rst index 3631c839..e96757c3 100644 --- a/docs/release/ablog-v0.11-released.rst +++ b/docs/release/ablog-v0.11-released.rst @@ -70,6 +70,6 @@ ABlog v0.11.6 released Pull Requests merged in: -`Adds IT locale `__ from `Cadair `__. +`Adds IT locale `__ from `Stefano David `__. -`Enables configuring a canonical_link for individual posts `__ from `Cadair `__. +`Enables configuring a canonical_link for individual posts `__ from `Hendrik Makait `__. From 7b95550f86d8142928fa6c5341ba569459ef4ec2 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Fri, 6 Oct 2023 13:12:28 -0700 Subject: [PATCH 34/46] [pre-commit.ci] pre-commit autoupdate (#255) Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Co-authored-by: Nabil Freij --- .pre-commit-config.yaml | 4 ++-- src/ablog/templates/ablog/catalog.html | 2 +- src/ablog/templates/ablog/collection.html | 5 +++-- src/ablog/templates/ablog/redirect.html | 4 ++-- src/ablog/templates/catalog.html | 2 +- src/ablog/templates/collection.html | 5 +++-- src/ablog/templates/page.html | 4 ++-- src/ablog/templates/redirect.html | 4 ++-- 8 files changed, 16 insertions(+), 14 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 31e6b988..51f94124 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -25,7 +25,7 @@ repos: - id: check-yaml - id: debug-statements - repo: https://github.com/astral-sh/ruff-pre-commit - rev: 'v0.0.290' + rev: 'v0.0.292' hooks: - id: ruff args: ['--fix'] @@ -40,7 +40,7 @@ repos: - id: prettier types_or: [css, scss, javascript] - repo: https://github.com/Riverside-Healthcare/djLint - rev: v1.33.0 + rev: v1.34.0 hooks: - id: djlint-jinja types_or: ["html"] diff --git a/src/ablog/templates/ablog/catalog.html b/src/ablog/templates/ablog/catalog.html index c55a56b5..e7e6d371 100644 --- a/src/ablog/templates/ablog/catalog.html +++ b/src/ablog/templates/ablog/catalog.html @@ -32,4 +32,4 @@

    {% endif %} {% endfor %} -{% endblock %} +{% endblock body %} diff --git a/src/ablog/templates/ablog/collection.html b/src/ablog/templates/ablog/collection.html index 666b92af..ec86f4b7 100644 --- a/src/ablog/templates/ablog/collection.html +++ b/src/ablog/templates/ablog/collection.html @@ -1,4 +1,5 @@ -{%- extends "page.html" %} {% block body %} +{%- extends "page.html" %} +{% block body %} {% macro postlink(post) -%} {% if post.external_link -%} {{- post.external_link -}} @@ -66,4 +67,4 @@

    {% endfor %} {% endif %} -{% endblock %} +{% endblock body %} diff --git a/src/ablog/templates/ablog/redirect.html b/src/ablog/templates/ablog/redirect.html index baa3af6a..79f7468e 100644 --- a/src/ablog/templates/ablog/redirect.html +++ b/src/ablog/templates/ablog/redirect.html @@ -2,7 +2,7 @@ {%- block extrahead %} {{ super() }} -{% endblock %} +{% endblock extrahead %} {% block body %} You are being redirected to {{ post.title }} in {{ ablog.post_redirect_refresh }} seconds; -{% endblock %} +{% endblock body %} diff --git a/src/ablog/templates/catalog.html b/src/ablog/templates/catalog.html index 0d2e488c..fd1a8304 100644 --- a/src/ablog/templates/catalog.html +++ b/src/ablog/templates/catalog.html @@ -33,4 +33,4 @@

    {% endif %} {% endfor %} -{% endblock %} +{% endblock body %} diff --git a/src/ablog/templates/collection.html b/src/ablog/templates/collection.html index 6cd2a207..8389caea 100644 --- a/src/ablog/templates/collection.html +++ b/src/ablog/templates/collection.html @@ -1,5 +1,6 @@ {{ warning("collection.html is an old template path, that is no longer used by ablog. Please use ablog/collection.html instead.") }} -{%- extends "page.html" %} {% block body %} +{%- extends "page.html" %} +{% block body %} {% macro postlink(post) -%} {% if post.external_link -%} {{- post.external_link -}} @@ -68,4 +69,4 @@

    {% endfor %} {% endif %} -{% endblock %} +{% endblock body %} diff --git a/src/ablog/templates/page.html b/src/ablog/templates/page.html index 875f6a86..f360992c 100644 --- a/src/ablog/templates/page.html +++ b/src/ablog/templates/page.html @@ -19,7 +19,7 @@ type="text/css" /> {% endif %} -{% endblock %} +{% endblock extrahead %} {% block body %} {{ body }}
    @@ -57,4 +57,4 @@

    Comments

    {% endif %} -{% endblock %} +{% endblock body %} diff --git a/src/ablog/templates/redirect.html b/src/ablog/templates/redirect.html index 21109bb1..83ab0032 100644 --- a/src/ablog/templates/redirect.html +++ b/src/ablog/templates/redirect.html @@ -3,7 +3,7 @@ {%- block extrahead %} {{ super() }} -{% endblock %} +{% endblock extrahead %} {% block body %} You are being redirected to {{ post.title }} in {{ ablog.post_redirect_refresh }} seconds; -{% endblock %} +{% endblock body %} From 8916138bb84b1370f7b701a8a2b72b02dc89ae8d Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 9 Oct 2023 14:00:56 -0700 Subject: [PATCH 35/46] [pre-commit.ci] pre-commit autoupdate (#259) Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 51f94124..c903a96e 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -15,7 +15,7 @@ repos: hooks: - id: black - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v4.4.0 + rev: v4.5.0 hooks: - id: check-ast - id: check-case-conflict From 8a6bfd1d47bb09339ec35d3fa4b2a0baf2f71193 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 16 Oct 2023 16:41:00 -0400 Subject: [PATCH 36/46] [pre-commit.ci] pre-commit autoupdate (#260) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit updates: - [github.com/astral-sh/ruff-pre-commit: v0.0.292 → v0.1.0](https://github.com/astral-sh/ruff-pre-commit/compare/v0.0.292...v0.1.0) Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index c903a96e..98fecbe1 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -25,7 +25,7 @@ repos: - id: check-yaml - id: debug-statements - repo: https://github.com/astral-sh/ruff-pre-commit - rev: 'v0.0.292' + rev: 'v0.1.0' hooks: - id: ruff args: ['--fix'] From eae50f9f278166e278ae84d97932ac9ab1121471 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 23 Oct 2023 14:03:51 -0700 Subject: [PATCH 37/46] [pre-commit.ci] pre-commit autoupdate (#261) Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> --- .pre-commit-config.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 98fecbe1..591fa581 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -11,7 +11,7 @@ repos: hooks: - id: isort - repo: https://github.com/psf/black - rev: 23.9.1 + rev: 23.10.1 hooks: - id: black - repo: https://github.com/pre-commit/pre-commit-hooks @@ -25,7 +25,7 @@ repos: - id: check-yaml - id: debug-statements - repo: https://github.com/astral-sh/ruff-pre-commit - rev: 'v0.1.0' + rev: 'v0.1.1' hooks: - id: ruff args: ['--fix'] From f01236397b12a9546463249819707d29ae416416 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 30 Oct 2023 13:33:04 -0700 Subject: [PATCH 38/46] [pre-commit.ci] pre-commit autoupdate (#262) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit updates: - [github.com/astral-sh/ruff-pre-commit: v0.1.1 → v0.1.3](https://github.com/astral-sh/ruff-pre-commit/compare/v0.1.1...v0.1.3) Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 591fa581..4cc0666f 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -25,7 +25,7 @@ repos: - id: check-yaml - id: debug-statements - repo: https://github.com/astral-sh/ruff-pre-commit - rev: 'v0.1.1' + rev: 'v0.1.3' hooks: - id: ruff args: ['--fix'] From f01ae3536c07c81f45e27a3f795043715999b857 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 6 Nov 2023 13:14:25 -0800 Subject: [PATCH 39/46] [pre-commit.ci] pre-commit autoupdate (#263) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * [pre-commit.ci] pre-commit autoupdate updates: - [github.com/astral-sh/ruff-pre-commit: v0.1.3 → v0.1.4](https://github.com/astral-sh/ruff-pre-commit/compare/v0.1.3...v0.1.4) * Update .pre-commit-config.yaml --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Co-authored-by: Nabil Freij --- .pre-commit-config.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 4cc0666f..4fe96b40 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,5 +1,6 @@ ci: autofix_prs: false + autoupdate_schedule: "quarterly" repos: - repo: https://github.com/PyCQA/autoflake rev: v2.2.1 @@ -25,7 +26,7 @@ repos: - id: check-yaml - id: debug-statements - repo: https://github.com/astral-sh/ruff-pre-commit - rev: 'v0.1.3' + rev: 'v0.1.4' hooks: - id: ruff args: ['--fix'] From 56499335d0435510c95033cc26f962da37532d70 Mon Sep 17 00:00:00 2001 From: MIZiper Date: Tue, 28 Nov 2023 03:16:01 +0800 Subject: [PATCH 40/46] change fa-pencil-square-o to fa-edit (#265) fa-pencil-square-o is not presented after fa v5 --- src/ablog/templates/ablog/postcard2.html | 2 +- src/ablog/templates/postcard2.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ablog/templates/ablog/postcard2.html b/src/ablog/templates/ablog/postcard2.html index c2fbbd97..9c35461d 100644 --- a/src/ablog/templates/ablog/postcard2.html +++ b/src/ablog/templates/ablog/postcard2.html @@ -3,7 +3,7 @@
  • {% if fa %} - + {% else %} {{ gettext('Update') }}: {% endif %} diff --git a/src/ablog/templates/postcard2.html b/src/ablog/templates/postcard2.html index fb3dd63d..e43f9180 100644 --- a/src/ablog/templates/postcard2.html +++ b/src/ablog/templates/postcard2.html @@ -4,7 +4,7 @@
  • {% if fa %} - + {% else %} {{ gettext('Update') }}: {% endif %} From 6b867ad7355c6020f5c962b7e9f98efb7051964b Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 1 Jan 2024 13:34:47 -0800 Subject: [PATCH 41/46] [pre-commit.ci] pre-commit autoupdate (#266) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit updates: - [github.com/PyCQA/isort: 5.12.0 → 5.13.2](https://github.com/PyCQA/isort/compare/5.12.0...5.13.2) - [github.com/psf/black: 23.10.1 → 23.12.1](https://github.com/psf/black/compare/23.10.1...23.12.1) - [github.com/astral-sh/ruff-pre-commit: v0.1.4 → v0.1.9](https://github.com/astral-sh/ruff-pre-commit/compare/v0.1.4...v0.1.9) - [github.com/pre-commit/mirrors-prettier: v3.0.3 → v4.0.0-alpha.8](https://github.com/pre-commit/mirrors-prettier/compare/v3.0.3...v4.0.0-alpha.8) - [github.com/Riverside-Healthcare/djLint: v1.34.0 → v1.34.1](https://github.com/Riverside-Healthcare/djLint/compare/v1.34.0...v1.34.1) Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> --- .pre-commit-config.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 4fe96b40..039cb34f 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -8,11 +8,11 @@ repos: - id: autoflake args: ['--in-place', '--remove-all-unused-imports', '--remove-unused-variable'] - repo: https://github.com/PyCQA/isort - rev: 5.12.0 + rev: 5.13.2 hooks: - id: isort - repo: https://github.com/psf/black - rev: 23.10.1 + rev: 23.12.1 hooks: - id: black - repo: https://github.com/pre-commit/pre-commit-hooks @@ -26,7 +26,7 @@ repos: - id: check-yaml - id: debug-statements - repo: https://github.com/astral-sh/ruff-pre-commit - rev: 'v0.1.4' + rev: 'v0.1.9' hooks: - id: ruff args: ['--fix'] @@ -36,12 +36,12 @@ repos: - id: stylelint additional_dependencies: ['stylelint@14.9.1', 'stylelint-config-standard@26.0.0'] - repo: https://github.com/pre-commit/mirrors-prettier - rev: v3.0.3 + rev: v4.0.0-alpha.8 hooks: - id: prettier types_or: [css, scss, javascript] - repo: https://github.com/Riverside-Healthcare/djLint - rev: v1.34.0 + rev: v1.34.1 hooks: - id: djlint-jinja types_or: ["html"] From 5d387fbbf34ebebf3efc1b35acabad96c0d8dcfc Mon Sep 17 00:00:00 2001 From: Shengyu Zhang Date: Sat, 6 Jan 2024 14:28:37 +0800 Subject: [PATCH 42/46] Add stylesheet for tagcloud (#268) --- src/ablog/__init__.py | 4 +++ src/ablog/stylesheets/ablog/tagcloud.css | 36 ++++++++++++++++++++++++ src/ablog/templates/ablog/tagcloud.html | 1 + src/ablog/templates/tagcloud.html | 1 + 4 files changed, 42 insertions(+) create mode 100644 src/ablog/stylesheets/ablog/tagcloud.css diff --git a/src/ablog/__init__.py b/src/ablog/__init__.py index 15dbf36f..fb508748 100755 --- a/src/ablog/__init__.py +++ b/src/ablog/__init__.py @@ -91,6 +91,10 @@ def config_inited(app, config): ) app.config.matched_blog_posts = matched_patterns + # Add ablog stylesheets to static_path. + static_path = os.path.abspath(os.path.join(os.path.dirname(__file__), "stylesheets")) + app.config.html_static_path.append(static_path) + def builder_inited(app): if not isinstance(app.builder, StandaloneHTMLBuilder) or app.config.skip_injecting_base_ablog_templates: diff --git a/src/ablog/stylesheets/ablog/tagcloud.css b/src/ablog/stylesheets/ablog/tagcloud.css new file mode 100644 index 00000000..7a6d07eb --- /dev/null +++ b/src/ablog/stylesheets/ablog/tagcloud.css @@ -0,0 +1,36 @@ +ul.ablog-cloud { + list-style: none; + overflow: auto; +} + +ul.ablog-cloud li { + float: left; + height: 20pt; + line-height: 18pt; + margin-right: 5px; +} + +ul.ablog-cloud a { + text-decoration: none; + vertical-align: middle; +} + +li.ablog-cloud-1 { + font-size: 80%; +} + +li.ablog-cloud-2 { + font-size: 95%; +} + +li.ablog-cloud-3 { + font-size: 110%; +} + +li.ablog-cloud-4 { + font-size: 125%; +} + +li.ablog-cloud-5 { + font-size: 140%; +} diff --git a/src/ablog/templates/ablog/tagcloud.html b/src/ablog/templates/ablog/tagcloud.html index e3ca32f5..3a9eb07c 100644 --- a/src/ablog/templates/ablog/tagcloud.html +++ b/src/ablog/templates/ablog/tagcloud.html @@ -1,5 +1,6 @@ {% if ablog.tags %}
    +

    {{ gettext('Tags') }}

      {% for coll in ablog.tags %} diff --git a/src/ablog/templates/tagcloud.html b/src/ablog/templates/tagcloud.html index 67592664..c6b3d87f 100644 --- a/src/ablog/templates/tagcloud.html +++ b/src/ablog/templates/tagcloud.html @@ -1,6 +1,7 @@ {{ warning("tagcloud.html is an old template path, that is no longer used by ablog. Please use ablog/tagcloud.html instead.") }} {% if ablog.tags %}
      +

      {{ gettext('Tags') }}

        {% for coll in ablog.tags %} From 4aadaba9df015dd362852a89f96c7e072f81eb17 Mon Sep 17 00:00:00 2001 From: Shengyu Zhang Date: Sun, 7 Jan 2024 06:52:06 +0800 Subject: [PATCH 43/46] Create demo/ before running ablog start (#269) --- .gitignore | 1 + Makefile | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 5b6c905b..0bcd7e3b 100644 --- a/.gitignore +++ b/.gitignore @@ -227,3 +227,4 @@ test/ pydata-sphinx-theme/ _build _version.py +demo/ diff --git a/Makefile b/Makefile index 522b9ba5..fc86bab1 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ .PHONY: demo rebuild tests demo: - rm -rf demo + rm -rf demo && mkdir demo printf "demo\nABlog\nABlog Team\nhttps://ablog.readthedocs.io/" | ablog start rebuild: From eb19fc96ceeb4bd6e82f120feb5dd15cdea91714 Mon Sep 17 00:00:00 2001 From: Nabil Freij Date: Sat, 6 Jan 2024 15:24:01 -0800 Subject: [PATCH 44/46] Changelog for 0.11.7 (#273) --- docs/release/ablog-v0.11-released.rst | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/docs/release/ablog-v0.11-released.rst b/docs/release/ablog-v0.11-released.rst index e96757c3..7858f09c 100644 --- a/docs/release/ablog-v0.11-released.rst +++ b/docs/release/ablog-v0.11-released.rst @@ -73,3 +73,15 @@ Pull Requests merged in: `Adds IT locale `__ from `Stefano David `__. `Enables configuring a canonical_link for individual posts `__ from `Hendrik Makait `__. + +ABlog v0.11.7 released +---------------------- + +Pull Requests merged in: + +`Add stylesheet for tagcloud `__ from `Shengyu Zhang `__. + +`Create demo/ before running ablog start `__ from `Shengyu Zhang `__. + + +`Add span to more items in templates `__ from `Nabil Freij `__. From b9b0911857f1c636cfb66c6b3eda80ea24872eb3 Mon Sep 17 00:00:00 2001 From: Nabil Freij Date: Sat, 6 Jan 2024 15:29:38 -0800 Subject: [PATCH 45/46] Add span to more items (#270) --- src/ablog/templates/ablog/catalog.html | 7 ++++--- src/ablog/templates/ablog/collection.html | 13 +++++++------ src/ablog/templates/ablog/postcard.html | 6 +++--- src/ablog/templates/catalog.html | 8 ++++---- src/ablog/templates/collection.html | 13 +++++++------ src/ablog/templates/postcard.html | 6 +++--- 6 files changed, 28 insertions(+), 25 deletions(-) diff --git a/src/ablog/templates/ablog/catalog.html b/src/ablog/templates/ablog/catalog.html index e7e6d371..7aa0c703 100644 --- a/src/ablog/templates/ablog/catalog.html +++ b/src/ablog/templates/ablog/catalog.html @@ -11,16 +11,17 @@ {% if collection %}

        - {{ header }} + {{ header }} {{ collection }} +

        {% for post in collection %}

        {% if post.published %} - {{ post.date.strftime(ablog.post_date_format) }} + {{ post.date.strftime(ablog.post_date_format) }} {% else %} - Draft + Draft {% endif %} - {% endif %} - {{ header }} + {{ header }} {% if collection.href %} {{ collection }} {% else %} {{ collection }} {% endif %} +

    • {% if ablog.blog_archive_titles %} {% for post in collection %}

    {% if post.published %} - {{ post.date.strftime(ablog.post_date_format) }} + {{ post.date.strftime(ablog.post_date_format) }} {% else %} - Draft + Draft {% endif %} - {{ post.title }} @@ -46,15 +47,15 @@

    {% if fa %} {% endif %} - {{ post.date.strftime(ablog.post_date_format) }} + {{ post.date.strftime(ablog.post_date_format) }} {% else %} {% if fa %} {% endif %} {% if post.date %} - {{ post.date.strftime(ablog.post_date_format) }} + {{ post.date.strftime(ablog.post_date_format) }} {% else %} - Draft + Draft {% endif %} {% endif %} diff --git a/src/ablog/templates/ablog/postcard.html b/src/ablog/templates/ablog/postcard.html index 479ea0dc..56d5650e 100644 --- a/src/ablog/templates/ablog/postcard.html +++ b/src/ablog/templates/ablog/postcard.html @@ -7,15 +7,15 @@

    {% if fa %} {% endif %} - {{ post.date.strftime(ablog.post_date_format) }} + {{ post.date.strftime(ablog.post_date_format) }} {% else %} {% if fa %} {% endif %} {% if post.date %} - {{ post.date.strftime(ablog.post_date_format) }} + {{ post.date.strftime(ablog.post_date_format) }} {% else %} - Draft + Draft {% endif %} {% endif %}

    diff --git a/src/ablog/templates/catalog.html b/src/ablog/templates/catalog.html index fd1a8304..dfb5ba16 100644 --- a/src/ablog/templates/catalog.html +++ b/src/ablog/templates/catalog.html @@ -12,16 +12,16 @@ {% if collection %}

    - {{ header }} - {{ collection }} + {{ header }} + {{ collection }}

    {% for post in collection %}

    {% if post.published %} - {{ post.date.strftime(ablog.post_date_format) }} + {{ post.date.strftime(ablog.post_date_format) }} {% else %} - Draft + Draft {% endif %} - {% endif %} - {{ header }} + {{ header }} {% if collection.href %} {{ collection }} {% else %} {{ collection }} {% endif %} +

    {% if ablog.blog_archive_titles %} {% for post in collection %}

    {% if post.published %} - {{ post.date.strftime(ablog.post_date_format) }} + {{ post.date.strftime(ablog.post_date_format) }} {% else %} - Draft + Draft {% endif %} - {{ post.title }} @@ -48,15 +49,15 @@

    {% if fa %} {% endif %} - {{ post.date.strftime(ablog.post_date_format) }} + {{ post.date.strftime(ablog.post_date_format) }} {% else %} {% if fa %} {% endif %} {% if post.date %} - {{ post.date.strftime(ablog.post_date_format) }} + {{ post.date.strftime(ablog.post_date_format) }} {% else %} - Draft + Draft {% endif %} {% endif %} diff --git a/src/ablog/templates/postcard.html b/src/ablog/templates/postcard.html index 229cc291..137ae98e 100644 --- a/src/ablog/templates/postcard.html +++ b/src/ablog/templates/postcard.html @@ -8,15 +8,15 @@

    {% if fa %} {% endif %} - {{ post.date.strftime(ablog.post_date_format) }} + {{ post.date.strftime(ablog.post_date_format) }} {% else %} {% if fa %} {% endif %} {% if post.date %} - {{ post.date.strftime(ablog.post_date_format) }} + {{ post.date.strftime(ablog.post_date_format) }} {% else %} - Draft + Draft {% endif %} {% endif %}

    From de37cf013846ceccae0e9e478f4ed6e1bd2dd0d3 Mon Sep 17 00:00:00 2001 From: Nabil Freij Date: Sat, 6 Jan 2024 15:50:19 -0800 Subject: [PATCH 46/46] Update to actions (#272) * Update to actions * Fix all warnings found by new CI --- .github/workflows/ci.yml | 91 ++++++++++++++++++++++++++++++++++++++++ azure-pipelines.yml | 89 --------------------------------------- conftest.py | 5 ++- docs/conf.py | 12 +----- setup.cfg | 2 + tox.ini | 7 ++-- 6 files changed, 101 insertions(+), 105 deletions(-) create mode 100644 .github/workflows/ci.yml delete mode 100644 azure-pipelines.yml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml new file mode 100644 index 00000000..e36af018 --- /dev/null +++ b/.github/workflows/ci.yml @@ -0,0 +1,91 @@ +name: CI + +on: + push: + branches: + - 'main' + - '*.*' + - '!*backport*' + tags: + - 'v*' + - '!*dev*' + - '!*pre*' + - '!*post*' + pull_request: + workflow_dispatch: + schedule: + # ┌───────── minute (0 - 59) + # │ ┌───────── hour (0 - 23) + # │ │ ┌───────── day of the month (1 - 31) + # │ │ │ ┌───────── month (1 - 12 or JAN-DEC) + # │ │ │ │ ┌───────── day of the week (0 - 6 or SUN-SAT) + - cron: '0 7 * * *' # Every day at 07:00 UTC + +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true + +jobs: + core: + uses: OpenAstronomy/github-actions-workflows/.github/workflows/tox.yml@main + with: + submodules: false + coverage: codecov + libraries: | + apt: + - pandoc + - graphviz + envs: | + - linux: py312-sphinx7 + secrets: + CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} + + test: + needs: [core] + uses: OpenAstronomy/github-actions-workflows/.github/workflows/tox.yml@main + with: + submodules: false + coverage: codecov + libraries: | + brew: + - pandoc + - graphviz + choco: + - pandoc + - graphviz + apt: + - pandoc + - graphviz + envs: | + - linux: py311-sphinx6 + - macos: py310-sphinx5 + - windows: py39-sphinx5 + secrets: + CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} + + docs: + needs: [test] + uses: OpenAstronomy/github-actions-workflows/.github/workflows/tox.yml@main + with: + default_python: '3.9' + submodules: false + pytest: false + envs: | + - linux: py312-docs + + extras: + needs: [test] + uses: OpenAstronomy/github-actions-workflows/.github/workflows/tox.yml@main + with: + default_python: '3.9' + submodules: false + coverage: codecov + libraries: | + apt: + - pandoc + - graphviz + envs: | + - linux: py312-sphinxdev + - linux: py312-conda + secrets: + CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} diff --git a/azure-pipelines.yml b/azure-pipelines.yml deleted file mode 100644 index 6508b2cb..00000000 --- a/azure-pipelines.yml +++ /dev/null @@ -1,89 +0,0 @@ -name: $(BuildDefinitionName)_$(Date:yyyyMMdd)$(Rev:.rr) - -schedules: - - cron: "0 0 * * *" - displayName: Daily midnight build - branches: - include: - - main - always: true - -resources: - repositories: - - repository: OpenAstronomy - type: github - endpoint: sunpy - name: OpenAstronomy/azure-pipelines-templates - ref: master - -trigger: - branches: - include: - - '*' - exclude: - - '*backport*' - tags: - include: - - 'v*' - exclude: - - '*dev*' - - '*pre*' - - '*post*' - -pr: - autoCancel: true - -stages: - - stage: FirstPhaseTests - displayName: Core Tests - jobs: - - template: run-tox-env.yml@OpenAstronomy - parameters: - submodules: false - coverage: codecov - libraries: - apt: - - pandoc - - graphviz - envs: - - linux: py311-sphinx6 - - - stage: SecondPhaseTests - displayName: Stage 2 Tests - dependsOn: FirstPhaseTests - jobs: - - template: run-tox-env.yml@OpenAstronomy - parameters: - submodules: false - coverage: codecov - libraries: - brew: - - pandoc - - graphviz - choco: - - pandoc - - graphviz - apt: - - pandoc - - graphviz - envs: - - linux: py310-sphinx5 - - macos: py39-sphinx5 - - windows: py39-sphinx5 - - - stage: ThirdPhaseTests - displayName: Stage 3 Tests - dependsOn: SecondPhaseTests - jobs: - - template: run-tox-env.yml@OpenAstronomy - parameters: - submodules: false - coverage: codecov - libraries: - apt: - - pandoc - - graphviz - envs: - - linux: py310-sphinxdev - - linux: py310-docs - - linux: py310-conda diff --git a/conftest.py b/conftest.py index 7d87f262..8a58b65c 100644 --- a/conftest.py +++ b/conftest.py @@ -1,7 +1,8 @@ +from pathlib import Path + import docutils import pytest import sphinx -from sphinx.testing.path import path # Load app, status and warning fixtures. pytest_plugins = ["sphinx.testing.fixtures"] @@ -18,7 +19,7 @@ def pytest_report_header(config): @pytest.fixture(scope="session") def rootdir(): - return path(__file__).parent.abspath() / "roots" + return Path(__file__).parent.absolute() / "roots" @pytest.fixture(scope="function", autouse=True) diff --git a/docs/conf.py b/docs/conf.py index 4c837c07..6756d03d 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -1,7 +1,7 @@ import re from pathlib import Path -from pkg_resources import get_distribution +from packaging.version import parse as _parse from sphinx import addnodes import ablog @@ -22,11 +22,7 @@ "myst_parser", ] -versionmod = get_distribution("ablog") -version = ".".join(versionmod.version.split(".")[:3]) -release = versionmod.version.split("+")[0] -is_development = ".dev" in release - +version = str(_parse(ablog.__version__)) project = "ABlog" copyright = "2014-2022, ABlog Team" master_doc = "index" @@ -35,13 +31,11 @@ ".md": "markdown", } exclude_patterns = ["_build", "docs/manual/.ipynb_checkpoints"] - html_title = "ABlog" html_use_index = True html_domain_indices = False html_show_sourcelink = True html_favicon = "_static/ablog.ico" - blog_title = "ABlog" blog_baseurl = "https://ablog.readthedocs.io/" blog_locations = { @@ -74,7 +68,6 @@ disqus_shortname = "https-ablog-readthedocs-io" disqus_pages = True fontawesome_link_cdn = "https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.1.1/css/all.min.css" - html_style = "alabaster.css" html_theme = "alabaster" html_sidebars = { @@ -98,7 +91,6 @@ "description": "ABlog for blogging with Sphinx", "logo": "ablog.png", } - intersphinx_mapping = { "python": ("https://docs.python.org/", None), "sphinx": ("https://www.sphinx-doc.org/en/master/", None), diff --git a/setup.cfg b/setup.cfg index e9e42006..d8f208b5 100644 --- a/setup.cfg +++ b/setup.cfg @@ -58,6 +58,8 @@ filterwarnings = always::pytest.PytestConfigWarning # Sphinx and other packages raise these ignore:'imghdr' is deprecated and slated for removal in Python 3.13:DeprecationWarning + # python-datetuil + ignore:datetime.datetime.utcfromtimestamp:DeprecationWarning [pycodestyle] max_line_length = 120 diff --git a/tox.ini b/tox.ini index 144f5aa9..8c4c5326 100644 --- a/tox.ini +++ b/tox.ini @@ -1,7 +1,6 @@ [tox] envlist = - py{39,310,311}{-sphinx5,-sphinx6,-sphinx7,-sphinxdev,-docs,-linkcheck} -isolated_build = true + py{39,310,311,312}{-sphinx5,-sphinx6,-sphinx7,-sphinx8,-sphinxdev,-docs,-linkcheck} [testenv] allowlist_externals = @@ -17,8 +16,8 @@ commands = sphinx5: pip install -U "sphinx>=5.0,<6.0" sphinx6: pip install -U "sphinx>=6.0,<7.0" sphinx7: pip install -U "sphinx>=7.0,<8.0" - # TODO: Figure this out on azure - # sphinxdev: pip install -U "git+https://repo.or.cz/docutils.git#egg=docutils&subdirectory=docutils" + sphinx8: pip install -U "sphinx>=8.0,<9.0" + sphinxdev: pip install -U "git+https://repo.or.cz/docutils.git#egg=docutils&subdirectory=docutils" sphinxdev: pip install -U "git+https://github.com/sphinx-doc/sphinx" pip freeze --all --no-input pytest -vvv -r a --pyargs ablog