From 1220329ce4a5bd0d4833c867273297c98653bc55 Mon Sep 17 00:00:00 2001 From: Florian Haas Date: Thu, 14 Oct 2021 21:50:32 +0200 Subject: [PATCH 1/2] Add a simple test facility with tox and GitHub actions In order to ensure that feature additions don't break existing Flex theme deployments, build the docs site on any branch push and PR. To do so, * Add a simple tox.ini that runs "pelican -s docs/pelicanconf.py" in virtualenvs configured for Python versions 3.6 - 3.9. * Add an additional GitHub Actions workflow that invokes these testenvs with the matching Python version, and runs on any branch push and on any pull request. --- .github/workflows/pelican-test.yaml | 28 ++++++++++++++++++++++++++++ tox.ini | 16 ++++++++++++++++ 2 files changed, 44 insertions(+) create mode 100644 .github/workflows/pelican-test.yaml create mode 100644 tox.ini diff --git a/.github/workflows/pelican-test.yaml b/.github/workflows/pelican-test.yaml new file mode 100644 index 0000000..4264ff5 --- /dev/null +++ b/.github/workflows/pelican-test.yaml @@ -0,0 +1,28 @@ +name: Pelican test +on: + - push + - pull_request +jobs: + build: + runs-on: ubuntu-latest + strategy: + matrix: + python-version: + - 3.6 + - 3.7 + - 3.8 + - 3.9 + steps: + - name: Checkout + uses: actions/checkout@v2 + with: + submodules: true + - name: Set up Python ${{ matrix.python-version }} + uses: actions/setup-python@v2 + with: + python-version: ${{ matrix.python-version }} + - name: Install dependencies + run: | + pip install tox tox-gh-actions + - name: Test with tox + run: tox diff --git a/tox.ini b/tox.ini new file mode 100644 index 0000000..142865b --- /dev/null +++ b/tox.ini @@ -0,0 +1,16 @@ +[tox] +envlist = py{36,37,38,39} +skipsdist = True + +[gh-actions] +python = + 3.6: py36 + 3.7: py37 + 3.8: py38 + 3.9: py39 + +[testenv] +deps = + -r docs/requirements.txt +commands = + pelican -s docs/pelicanconf.py From 20725c8dc0971582d6aa7e6371f150f0e23897c9 Mon Sep 17 00:00:00 2001 From: Florian Haas Date: Wed, 13 Oct 2021 21:02:27 +0200 Subject: [PATCH 2/2] Support Series plugin The Pelican Series plugin (https://github.com/pelican-plugins/series) is a convenient way for authors to link articles together as multiple installments of a series. Add support for the Series plugin to this theme: render articles belonging to a series with a footer pointing to the preceding and following articles in the series, using the same styling as "related posts" links. This implementation is heavily inspired by the Series plugin in the Pelican bootstrap3 theme (MIT licensed): https://github.com/getpelican/pelican-themes/blob/master/pelican-bootstrap3/templates/includes/series.html Fixes #289. --- README.md | 2 ++ templates/article.html | 23 +++++++++++++++++++++++ 2 files changed, 25 insertions(+) diff --git a/README.md b/README.md index 5e740f4..7b85617 100644 --- a/README.md +++ b/README.md @@ -17,6 +17,7 @@ The minimalist [Pelican](http://blog.getpelican.com/) theme. - Open Graph - Rich Snippets (JSON-LD) - Related Posts (via [plugin](https://github.com/getpelican/pelican-plugins/tree/master/related_posts) or AddThis) +- Series (via [plugin](https://github.com/pelican-plugins/series)) - Minute read (via [plugin](https://github.com/getpelican/pelican-plugins/tree/master/post_stats)) - [Multiple Code Highlight Styles](https://github.com/alexandrevicenzi/Flex/wiki/Code-Highlight) - [Translation Support](https://github.com/alexandrevicenzi/Flex/wiki/Translations) @@ -41,6 +42,7 @@ The minimalist [Pelican](http://blog.getpelican.com/) theme. - [I18N Sub-sites](https://github.com/getpelican/pelican-plugins/tree/master/i18n_subsites) - [Minute read](https://github.com/getpelican/pelican-plugins/tree/master/post_stats) - [Related Posts](https://github.com/getpelican/pelican-plugins/tree/master/related_posts) +- [Series](https://github.com/pelican-plugins/series) - [Representative image](https://github.com/getpelican/pelican-plugins/tree/master/representative_image) - [Neighbors](https://github.com/getpelican/pelican-plugins/tree/master/neighbors) - [Tipue Search](https://github.com/getpelican/pelican-plugins/blob/master/tipue_search/) diff --git a/templates/article.html b/templates/article.html index 44d3fe1..e7ccd8e 100644 --- a/templates/article.html +++ b/templates/article.html @@ -83,6 +83,29 @@ {% endif %} + {% if article.series %} + + {% endif %} + {% if GOOGLE_ADSENSE and GOOGLE_ADSENSE.ads.article_bottom %}