More category fixes

README.md

@@ -47,6 +47,13 @@ case this plugin in present, use:
 Likewise, `category.shortname`, `category.parent` and `category.ancestors` can
 also be used on the category template.
 
+Additionally, this plugin adds `category.subcategories`: a `list` of categories
+that have `category` as a parent.
+
+    {% for subcat in category.subcategories %}
+        <a href="{{ SITEURL }}/{{subcat.url}}">{{subcat.shortname|capitalize}}</a>
+    {% endfor %}
+
 ### Slug
 The slug of a category is generated recursively by slugifying the shortname of
 the category and its ancestors, and preserving slashes:
@@ -73,4 +80,4 @@ categories always follow their parent:
 
     aba
     aba/dat
-    abaala
+    abaala

RELEASE.md

@@ -0,0 +1,4 @@
+Release type: minor
+
+Added subcategories to categories to be able to cycle through which subcategories are present for a category.
+Updated plugin to better work with modern pelican standards (by updating tasks.py and ensuring proper code formatting)

pelican/plugins/more_categories/more_categories.py

@@ -3,7 +3,7 @@
 Title: More Categories
 Description: adds support for multiple categories per article and nested
 categories
-Requirements: Pelican 3.8 or higher
+Requirements: Pelican 4.0.0 or higher
 """
 
 from collections import defaultdict
@@ -43,7 +43,6 @@ def slug(self):
             else:
                 subs = self.settings.get('SLUG_REGEX_SUBSTITUTIONS', [])
             self._slug = slugify(self.shortname, regex_subs=subs)
-            print(self._slug)
             if self.parent:
                 self._slug = self.parent.slug + '/' + self._slug
         return self._slug
@@ -79,6 +78,24 @@ def create_categories(generator):
     )
     generator._update_context(['categories'])
 
+    # Add subcategories and children
+    descendents = defaultdict(list)
+    children = defaultdict(list)
+    for category, articles in generator.categories:
+        for anc in category.ancestors[1:]:
+            descendents[anc].append(category)
+            if anc == category.parent:
+                children[anc].append(category)
+    for category, articles in generator.categories:
+        if category.slug in descendents:
+            category.descendents = descendents[category]
+        else:
+            category.descendents = []
+        if category.slug in children:
+            category.children = children[category]
+        else:
+            category.children = []
+
 
 def register():
     signals.article_generator_context.connect(get_categories)

pyproject.toml

@@ -46,7 +46,7 @@ invoke = "^1.3"
 isort = "^4.3"
 livereload = "^2.6"
 markdown = "^3.1.1"
-pytest = "^5.0"
+pytest = ">5.0,!=5.4.0,!=5.4.1"
 pytest-cov = "^2.7"
 pytest-pythonpath = "^0.7.3"
 pytest-sugar = "^0.9.2"

tasks.py

@@ -1,12 +1,25 @@
+import os
 from pathlib import Path
+from shutil import which
 
 from invoke import task
 
 PKG_NAME = 'more_categories'
 PKG_PATH = Path(f'pelican/plugins/{PKG_NAME}')
-FLAKE8 = 'flake8'
-ISORT = 'isort'
-PYTEST = 'pytest'
+
+ACTIVE_VENV = os.environ.get("VIRTUAL_ENV", None)
+VENV_HOME = Path(os.environ.get("WORKON_HOME", "~/.local/share/virtualenvs"))
+VENV_PATH = Path(ACTIVE_VENV) if ACTIVE_VENV else (VENV_HOME / PKG_NAME)
+VENV = str(VENV_PATH.expanduser())
+
+
+TOOLS = ['poetry', 'pre-commit']
+FLAKE8 = which('flake8') if which('flake8') else (VENV / Path('bin') / 'flake8')
+ISORT = which('isort') if which('isort') else (VENV / Path('bin') / 'isort')
+PYTEST = which('pytest') if which('pytest') else (VENV / Path('bin') / 'pytest')
+PIP = which('pip') if which('pip') else (VENV / Path('bin') / 'pip')
+POETRY = which('poetry') if which('poetry') else (VENV / Path('bin') / 'poetry')
+PRECOMMIT = which('pre-commit') if which('pre-commit') else (VENV / Path('bin') / 'pre-commit')
 
 
 @task
@@ -32,3 +45,25 @@ def flake8(c):
 def lint(c):
     isort(c, check=True)
     flake8(c)
+
+
+@task
+def tools(c):
+    """Install tools in the virtual environment if not already on PATH"""
+    for tool in TOOLS:
+        if not which(tool):
+            c.run(f'{PIP} install {tool}')
+
+
+@task
+def precommit(c):
+    """Install pre-commit hooks to .git/hooks/pre-commit"""
+    c.run(f'{PRECOMMIT} install')
+
+
+@task
+def setup(c):
+    c.run(f'{PIP} install -U pip')
+    tools(c)
+    c.run(f'{POETRY} install')
+    precommit(c)