Formatting

Author: yaph

logya/core.py

@@ -113,5 +113,5 @@ def update_collections(self, doc: dict):
                         'docs': [doc],
                         'title': value,
                         'template': coll['template'],
-                        'url': url
+                        'url': url,
                     }

logya/docparser.py

@@ -16,7 +16,7 @@ def parse(content, content_type=None):
     header_start = lines.index('---') + 1
     header_end = lines[header_start:].index('---') + 1
     header = '\n'.join(lines[header_start:header_end])
-    body = '\n'.join(lines[header_end + 1:]).strip()
+    body = '\n'.join(lines[header_end + 1 :]).strip()
     parsed = load(header, Loader=Loader)  # noqa: S506
 
     # Parse body if not HTML/XML.
@@ -26,8 +26,9 @@ def parse(content, content_type=None):
             extensions=[
                 'markdown.extensions.attr_list',
                 'markdown.extensions.def_list',
-                'markdown.extensions.fenced_code'
-            ])
+                'markdown.extensions.fenced_code',
+            ],
+        )
 
     parsed['body'] = body
     return parsed

logya/main.py

@@ -10,20 +10,29 @@
 def main():
     parent = argparse.ArgumentParser(add_help=False)
     parent.add_argument('--verbose', '-v', action='store_true', help='Print info messages during execution.')
-    parent.add_argument('--dir-site', '-d', default='.', help='Path to site directory, absolute or relative to current working directory.')
+    parent.add_argument(
+        '--dir-site',
+        '-d',
+        default='.',
+        help='Path to site directory, absolute or relative to current working directory.',
+    )
 
     parser = argparse.ArgumentParser(description='Logya a static site generator.')
     parser.add_argument('--version', '-V', action='version', version=__version__)
     subparsers = parser.add_subparsers()
 
     # create a basic site with the given name
-    p_create = subparsers.add_parser('create', parents=[parent], help='Create a starter site in the specified directory.')
+    p_create = subparsers.add_parser(
+        'create', parents=[parent], help='Create a starter site in the specified directory.'
+    )
     p_create.add_argument('name', help='name of the directory to create.')
     p_create.set_defaults(func=create)
     p_create.add_argument('--site', '-s', default='base', help='Name one of the available sites.')
 
     # generate a site in public directory, generate and gen sub commands do the same
-    p_generate = subparsers.add_parser('generate', aliases=('gen',), parents=[parent], help='Generate site in public directory.')
+    p_generate = subparsers.add_parser(
+        'generate', aliases=('gen',), parents=[parent], help='Generate site in public directory.'
+    )
     p_generate.set_defaults(func=generate)
     hlp_keep = 'Keep existing `public` directory, by default it is removed.'
     p_generate.add_argument('--keep', '-k', action='store_true', default=False, help=hlp_keep)

logya/template.py

@@ -1,8 +1,8 @@
+import sys
 from datetime import datetime
 from operator import itemgetter
 from pathlib import Path
 from string import ascii_lowercase
-import sys
 from typing import Any
 
 from jinja2 import Environment, FileSystemLoader
@@ -13,15 +13,13 @@
 env = Environment(
     autoescape=False,  # noqa: S701 # Disable autoescaping to allow raw HTML in templates.
     lstrip_blocks=True,
-    trim_blocks=True
+    trim_blocks=True,
 )
 
 
 def _alpha_index(
-        items: list,
-        non_ascii_key: str = '_',
-        sort_attr: str = 'title',
-        sort_order: str = 'ascending') -> dict:
+    items: list, non_ascii_key: str = '_', sort_attr: str = 'title', sort_order: str = 'ascending'
+) -> dict:
     """Return an alphabetical index for a list of dicts. All strings that do not start with an ASCII letter are stored
     in `non_ascii_key`.
     """
@@ -35,7 +33,7 @@ def _alpha_index(
             key = non_ascii_key
         index[key] = [*index.get(key, []), item]
 
-    reverse = (sort_order != 'ascending')
+    reverse = sort_order != 'ascending'
     keys = sorted(index.keys(), reverse=reverse)
     return {key: sorted(index[key], key=itemgetter(sort_attr)) for key in keys}
 
@@ -80,7 +78,7 @@ def _get_docs(L, url: str, sort_attr: str = 'created', sort_order: str = 'descen
             if doc_url.startswith(url):
                 docs.append(content['doc'])
 
-    reverse = (sort_order == 'descending')
+    reverse = sort_order == 'descending'
     return sorted((d for d in docs if sort_attr in d), key=lambda item: _sort_docs(item, sort_attr), reverse=reverse)
 
 
@@ -126,4 +124,4 @@ def render(variables: dict) -> str:
     try:
         return env.get_template(variables['template']).render(variables)
     except TypeError as err:
-        sys.exit(f'Error rendering: {variables}\n{err}\nExiting.')
+        sys.exit(f'Error rendering: {variables}\n{err}\nExiting...')

logya/util.py

@@ -4,7 +4,7 @@
 from string import punctuation, whitespace
 from typing import NamedTuple
 
-from yaml import dump, load, YAMLError
+from yaml import YAMLError, dump, load
 
 try:
     from yaml import CDumper as Dumper
@@ -17,6 +17,7 @@
 forbidden = (set(punctuation) - set('+-_.,@')) | set(whitespace)
 re_forbidden = re.compile(f'[{re.escape("".join(forbidden))}]+')
 
+
 # For accessing site paths.
 class Paths(NamedTuple):
     root: Path
@@ -36,6 +37,7 @@ def f(*args, **kwargs):
         if key not in mapping:
             mapping[key] = func(*args, **kwargs)
         return mapping[key]
+
     return f
 
 
@@ -51,8 +53,7 @@ def load_yaml(text: str) -> dict:
     try:
         return load(text, Loader=Loader)  # noqa: S506
     except YAMLError as err:
-        sys.exit(f'Error loading YAML:\n{text}\n{err}')
-
+        sys.exit(f'Error loading YAML:\n{text}\n{err}\nExiting...')
 
 
 def paths(dir_site: str) -> Paths:
@@ -62,7 +63,7 @@ def paths(dir_site: str) -> Paths:
         content=root.joinpath('content'),
         templates=root.joinpath('templates'),
         static=root.joinpath('static'),
-        public=root.joinpath('public')
+        public=root.joinpath('public'),
     )
 
 

setup.py

@@ -37,13 +37,9 @@
         'Programming Language :: Python :: 3.9',
         'Topic :: Internet :: WWW/HTTP :: Dynamic Content :: News/Diary',
         'Topic :: Internet :: WWW/HTTP :: Site Management',
-        'Topic :: Text Processing :: Markup :: HTML'
+        'Topic :: Text Processing :: Markup :: HTML',
     ],
-    entry_points={
-        'console_scripts': [
-            'logya = logya.main:main'
-        ]
-    },
+    entry_points={'console_scripts': ['logya = logya.main:main']},
     test_suite='tests',
     tests_require=['pytest', 'tox'],
 )

tests/test_template.py

@@ -7,6 +7,7 @@
 env_globals = logya.template.env.globals
 env_filters = logya.template.env.filters
 
+
 @pytest.fixture
 def L():
     L = logya.core.Logya(dir_site='logya/sites/docs/')