Black format

This commit is contained in:
Alexandre Vicenzi 2020-09-19 22:04:09 +02:00
parent c9a31dce5e
commit ca51e4c544
3 changed files with 84 additions and 73 deletions

View file

@ -1,22 +1,22 @@
from datetime import datetime from datetime import datetime
AUTHOR = 'Alexandre Vicenzi' AUTHOR = "Alexandre Vicenzi"
SITEURL = 'http://localhost:8000' SITEURL = "http://localhost:8000"
SITENAME = 'Flex' SITENAME = "Flex"
SITETITLE = 'Flex' SITETITLE = "Flex"
SITESUBTITLE = 'The minimalist Pelican theme' SITESUBTITLE = "The minimalist Pelican theme"
SITEDESCRIPTION = 'Flex - The minimalist Pelican theme.' SITEDESCRIPTION = "Flex - The minimalist Pelican theme."
# SITELOGO = '' # SITELOGO = ''
# FAVICON = '/images/favicon.ico' # FAVICON = '/images/favicon.ico'
BROWSER_COLOR = '#333333' BROWSER_COLOR = "#333333"
PYGMENTS_STYLE = 'monokai' PYGMENTS_STYLE = "monokai"
ROBOTS = 'index, follow' ROBOTS = "index, follow"
THEME = '../' THEME = "../"
PATH = 'content' PATH = "content"
OUTPUT_PATH = 'blog/' OUTPUT_PATH = "blog/"
TIMEZONE = 'America/New_York' TIMEZONE = "America/New_York"
# PLUGIN_PATHS = ['pelican-plugins'] # PLUGIN_PATHS = ['pelican-plugins']
@ -24,17 +24,17 @@ TIMEZONE = 'America/New_York'
# JINJA_ENVIRONMENT = {'extensions': ['jinja2.ext.i18n']} # JINJA_ENVIRONMENT = {'extensions': ['jinja2.ext.i18n']}
I18N_TEMPLATES_LANG = 'en' I18N_TEMPLATES_LANG = "en"
DEFAULT_LANG = 'en' DEFAULT_LANG = "en"
OG_LOCALE = 'en_US' OG_LOCALE = "en_US"
LOCALE = 'en_US' LOCALE = "en_US"
DATE_FORMATS = { DATE_FORMATS = {
'en': '%B %d, %Y', "en": "%B %d, %Y",
} }
FEED_ALL_ATOM = 'feeds/all.atom.xml' FEED_ALL_ATOM = "feeds/all.atom.xml"
CATEGORY_FEED_ATOM = 'feeds/{slug}.atom.xml' CATEGORY_FEED_ATOM = "feeds/{slug}.atom.xml"
TRANSLATION_FEED_ATOM = None TRANSLATION_FEED_ATOM = None
AUTHOR_FEED_ATOM = None AUTHOR_FEED_ATOM = None
AUTHOR_FEED_RSS = None AUTHOR_FEED_RSS = None
@ -44,31 +44,33 @@ MAIN_MENU = True
HOME_HIDE_TAGS = True HOME_HIDE_TAGS = True
SOCIAL = ( SOCIAL = (
('github', 'https://github.com/alexandrevicenzi/Flex'), ("github", "https://github.com/alexandrevicenzi/Flex"),
('rss', '/blog/feeds/all.atom.xml'), ("rss", "/blog/feeds/all.atom.xml"),
) )
MENUITEMS = (('Archives', '/archives.html'), MENUITEMS = (
('Categories', '/categories.html'), ("Archives", "/archives.html"),
('Tags', '/tags.html'),) ("Categories", "/categories.html"),
("Tags", "/tags.html"),
)
CC_LICENSE = { CC_LICENSE = {
'name': 'Creative Commons Attribution-ShareAlike', "name": "Creative Commons Attribution-ShareAlike",
'version': '4.0', "version": "4.0",
'slug': 'by-sa' "slug": "by-sa",
} }
COPYRIGHT_YEAR = datetime.now().year COPYRIGHT_YEAR = datetime.now().year
DEFAULT_PAGINATION = 10 DEFAULT_PAGINATION = 10
DISQUS_SITENAME = "flex-pelican" DISQUS_SITENAME = "flex-pelican"
ADD_THIS_ID = 'ra-55adbb025d4f7e55' ADD_THIS_ID = "ra-55adbb025d4f7e55"
STATIC_PATHS = ['images', 'extra/ads.txt', 'extra/CNAME'] STATIC_PATHS = ["images", "extra/ads.txt", "extra/CNAME"]
EXTRA_PATH_METADATA = { EXTRA_PATH_METADATA = {
'extra/ads.txt': {'path': 'ads.txt'}, "extra/ads.txt": {"path": "ads.txt"},
'extra/CNAME': {'path': 'CNAME'}, "extra/CNAME": {"path": "CNAME"},
} }
THEME_COLOR_AUTO_DETECT_BROWSER_PREFERENCE = True THEME_COLOR_AUTO_DETECT_BROWSER_PREFERENCE = True

View file

@ -9,7 +9,7 @@ except ImportError:
sys.path.append(os.path.join(os.curdir, "docs")) sys.path.append(os.path.join(os.curdir, "docs"))
from pelicanconf import * from pelicanconf import *
SITEURL = 'https://flex.alxd.me/' SITEURL = "https://flex.alxd.me/"
RELATIVE_URLS = False RELATIVE_URLS = False
@ -18,14 +18,14 @@ USE_LESS = False
GOOGLE_ANALYTICS = "UA-55543164-6" GOOGLE_ANALYTICS = "UA-55543164-6"
GOOGLE_ADSENSE = { GOOGLE_ADSENSE = {
'ca_id': 'ca-pub-6625957038449899', "ca_id": "ca-pub-6625957038449899",
'page_level_ads': True, "page_level_ads": True,
'ads': { "ads": {
'aside': '8752710348', "aside": "8752710348",
'main_menu': '', "main_menu": "",
'index_top': '', "index_top": "",
'index_bottom': '1124188687', "index_bottom": "1124188687",
'article_top': '', "article_top": "",
'article_bottom': '4843941849', "article_bottom": "4843941849",
} },
} }

View file

@ -10,45 +10,50 @@ from invoke.util import cd
from pelican.server import ComplexHTTPRequestHandler, RootedHTTPServer from pelican.server import ComplexHTTPRequestHandler, RootedHTTPServer
from pelican.settings import DEFAULT_CONFIG, get_settings_from_file from pelican.settings import DEFAULT_CONFIG, get_settings_from_file
SETTINGS_FILE_BASE = 'pelicanconf.py' SETTINGS_FILE_BASE = "pelicanconf.py"
SETTINGS = {} SETTINGS = {}
SETTINGS.update(DEFAULT_CONFIG) SETTINGS.update(DEFAULT_CONFIG)
LOCAL_SETTINGS = get_settings_from_file(SETTINGS_FILE_BASE) LOCAL_SETTINGS = get_settings_from_file(SETTINGS_FILE_BASE)
SETTINGS.update(LOCAL_SETTINGS) SETTINGS.update(LOCAL_SETTINGS)
CONFIG = { CONFIG = {
'settings_base': SETTINGS_FILE_BASE, "settings_base": SETTINGS_FILE_BASE,
'settings_publish': 'publishconf.py', "settings_publish": "publishconf.py",
# Output path. Can be absolute or relative to tasks.py. Default: 'output' # Output path. Can be absolute or relative to tasks.py. Default: 'output'
'deploy_path': SETTINGS['OUTPUT_PATH'], "deploy_path": SETTINGS["OUTPUT_PATH"],
# Github Pages configuration # Github Pages configuration
'github_pages_branch': 'gh-pages', "github_pages_branch": "gh-pages",
'commit_message': "'Publish site on {}'".format(datetime.date.today().isoformat()), "commit_message": "'Publish site on {}'".format(datetime.date.today().isoformat()),
# Port for `serve` # Port for `serve`
'port': 8000, "port": 8000,
} }
@task @task
def clean(c): def clean(c):
"""Remove generated files""" """Remove generated files"""
if os.path.isdir(CONFIG['deploy_path']): if os.path.isdir(CONFIG["deploy_path"]):
shutil.rmtree(CONFIG['deploy_path']) shutil.rmtree(CONFIG["deploy_path"])
os.makedirs(CONFIG['deploy_path']) os.makedirs(CONFIG["deploy_path"])
@task @task
def build(c): def build(c):
"""Build local version of site""" """Build local version of site"""
c.run('pelican -s {settings_base}'.format(**CONFIG)) c.run("pelican -s {settings_base}".format(**CONFIG))
@task @task
def rebuild(c): def rebuild(c):
"""`build` with the delete switch""" """`build` with the delete switch"""
c.run('pelican -d -s {settings_base}'.format(**CONFIG)) c.run("pelican -d -s {settings_base}".format(**CONFIG))
@task @task
def regenerate(c): def regenerate(c):
"""Automatically regenerate site upon file modification""" """Automatically regenerate site upon file modification"""
c.run('pelican -r -s {settings_base}'.format(**CONFIG)) c.run("pelican -r -s {settings_base}".format(**CONFIG))
@task @task
def serve(c): def serve(c):
@ -58,55 +63,59 @@ def serve(c):
allow_reuse_address = True allow_reuse_address = True
server = AddressReuseTCPServer( server = AddressReuseTCPServer(
CONFIG['deploy_path'], CONFIG["deploy_path"], ("", CONFIG["port"]), ComplexHTTPRequestHandler
('', CONFIG['port']), )
ComplexHTTPRequestHandler)
sys.stderr.write('Serving on port {port} ...\n'.format(**CONFIG)) sys.stderr.write("Serving on port {port} ...\n".format(**CONFIG))
server.serve_forever() server.serve_forever()
@task @task
def reserve(c): def reserve(c):
"""`build`, then `serve`""" """`build`, then `serve`"""
build(c) build(c)
serve(c) serve(c)
@task @task
def preview(c): def preview(c):
"""Build production version of site""" """Build production version of site"""
c.run('pelican -s {settings_publish}'.format(**CONFIG)) c.run("pelican -s {settings_publish}".format(**CONFIG))
@task @task
def livereload(c): def livereload(c):
"""Automatically reload browser tab upon file modification.""" """Automatically reload browser tab upon file modification."""
from livereload import Server from livereload import Server
build(c) build(c)
server = Server() server = Server()
# Watch the base settings file # Watch the base settings file
server.watch(CONFIG['settings_base'], lambda: build(c)) server.watch(CONFIG["settings_base"], lambda: build(c))
# Watch content source files # Watch content source files
content_file_extensions = ['.md', '.rst'] content_file_extensions = [".md", ".rst"]
for extension in content_file_extensions: for extension in content_file_extensions:
content_blob = '{0}/**/*{1}'.format(SETTINGS['PATH'], extension) content_blob = "{0}/**/*{1}".format(SETTINGS["PATH"], extension)
server.watch(content_blob, lambda: build(c)) server.watch(content_blob, lambda: build(c))
# Watch the theme's templates and static assets # Watch the theme's templates and static assets
theme_path = SETTINGS['THEME'] theme_path = SETTINGS["THEME"]
server.watch('{}/templates/*.html'.format(theme_path), lambda: build(c)) server.watch("{}/templates/*.html".format(theme_path), lambda: build(c))
static_file_extensions = ['.css', '.js'] static_file_extensions = [".css", ".js"]
for extension in static_file_extensions: for extension in static_file_extensions:
static_file = '{0}/static/**/*{1}'.format(theme_path, extension) static_file = "{0}/static/**/*{1}".format(theme_path, extension)
server.watch(static_file, lambda: build(c)) server.watch(static_file, lambda: build(c))
# Serve output path on configured port # Serve output path on configured port
server.serve(port=CONFIG['port'], root=CONFIG['deploy_path']) server.serve(port=CONFIG["port"], root=CONFIG["deploy_path"])
@task @task
def publish(c): def publish(c):
"""Publish to production via rsync""" """Publish to production via rsync"""
c.run('pelican -s {settings_publish}'.format(**CONFIG)) c.run("pelican -s {settings_publish}".format(**CONFIG))
c.run( c.run(
'rsync --delete --exclude ".DS_Store" -pthrvz -c ' 'rsync --delete --exclude ".DS_Store" -pthrvz -c '
'-e "ssh -p {ssh_port}" ' '-e "ssh -p {ssh_port}" '
'{} {ssh_user}@{ssh_host}:{ssh_path}'.format( "{} {ssh_user}@{ssh_host}:{ssh_path}".format(
CONFIG['deploy_path'].rstrip('/') + '/', CONFIG["deploy_path"].rstrip("/") + "/", **CONFIG
**CONFIG)) )
)