fix(pipenv): temporary disable --skip-lock option: pypa/pipenv#4141

https://travis-ci.com/github/Kristinita/KristinitaPelican/jobs/440616814#L272-L305 https://ci.appveyor.com/project/Kristinita/kristinitapelican/builds/36332074/job/p7amggsx8flrw7p7#L168 style(jinja2): whitespace unification — https://ttl255.com/jinja2-tutorial-part-3-whitespace-control/
Kristinita · Nov 17, 2020 · 9ea27a2 · 9ea27a2
1 parent 86da6f8
commit 9ea27a2
Show file tree

Hide file tree

Showing 17 changed files with 49 additions and 45 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -170,12 +170,16 @@ before_install:
 # https://pipenv.pypa.io/en/latest/advanced/#pipenv.environments.PIPENV_IGNORE_VIRTUALENVS
 - export PIPENV_IGNORE_VIRTUALENVS=1
 
+# [FIXME] Traceback if skip-lock:
+# https://github.com/pypa/pipenv/issues/4141
+# https://travis-ci.com/github/Kristinita/KristinitaPelican/jobs/440616814#L272-L305
+# https://ci.appveyor.com/project/Kristinita/kristinitapelican/builds/36332074/job/p7amggsx8flrw7p7#L168
 # [INFO] Disable lock feature in the Pipenv:
 # https://pipenv.pypa.io/en/latest/cli/#envvar-PIPENV_SKIP_LOCK
 # https://github.com/pypa/pipenv/issues/2200
 # 1. It the extra feature
 # 2. And too slow
-- export PIPENV_SKIP_LOCK=1
+# - export PIPENV_SKIP_LOCK=1
 
 # [INFO] Remove .NET Core SDK telemetry:
 # https://docs.microsoft.com/en-us/dotnet/core/tools/telemetry#disclosure

diff --git a/README.md b/README.md
@@ -6,4 +6,4 @@
 <!-- Cult of Martians — free help for Open Source projects: http://cultofmartians.com -->
 <!-- [WARNING] GitHub Flavored Markdown doesn't support links as “//gitcdn.xyz/repo/Kristinita”; I need “https://gitcdn.xyz/repo/Kristinita” -->
 
-[![Project Status: Active – The project has reached a stable, usable state and is being actively developed.](http://www.repostatus.org/badges/latest/active.svg)](http://www.repostatus.org/#active) ![Maintenance](https://img.shields.io/maintenance/yes/2020.svg?style=plastic)[![Site up or down](https://img.shields.io/website-up-down-green-red/https/kristinita.netlify.com.svg?style=plastic)](https://isup.me/) [![Build Status](https://travis-ci.com/Kristinita/KristinitaPelican.svg?branch=master)](https://travis-ci.org/Kristinita/KristinitaPelican) [![Build status](https://ci.appveyor.com/api/projects/status/63q37y3j06r53u1o/branch/master?svg=true)](https://ci.appveyor.com/project/Kristinita/kristinitapelican/branch/master) [![Built with Grunt](https://gruntjs.com/cdn/builtwith.png)](http://gruntjs.com/) [![Built with Pelican](https://gitcdn.link/repo/Kristinita/KristinitaPelican/master/content/images/logo/PelicanLogo.svg)](http://docs.getpelican.com) [![Open Source Love](https://badges.frapsoft.com/os/v1/open-source.png?v=103)](https://github.com/ellerbrock/open-source-badges/) [![Say Thanks!](https://img.shields.io/badge/Say%20Thanks-!-1EAEDB.svg)](https://saythanks.io/to/Kristinita) [![Netlify Status](https://api.netlify.com/api/v1/badges/27090fd4-c2fd-48be-ae43-cbe5bad15684/deploy-status)](https://app.netlify.com/sites/kristinita/deploys)
+[![Project Status: Active – The project has reached a stable, usable state and is being actively developed.](http://www.repostatus.org/badges/latest/active.svg)](http://www.repostatus.org/#active) ![Maintenance](https://img.shields.io/maintenance/yes/2020.svg?style=plastic)[![Site up or down](https://img.shields.io/website-up-down-green-red/https/kristinita.netlify.com.svg?style=plastic)](https://isup.me/) [![Build Status](https://travis-ci.com/Kristinita/KristinitaPelican.svg?branch=master)](https://travis-ci.com/Kristinita/KristinitaPelican) [![Build status](https://ci.appveyor.com/api/projects/status/63q37y3j06r53u1o/branch/master?svg=true)](https://ci.appveyor.com/project/Kristinita/kristinitapelican/branch/master) [![Built with Grunt](https://gruntjs.com/cdn/builtwith.png)](http://gruntjs.com/) [![Built with Pelican](https://gitcdn.link/repo/Kristinita/KristinitaPelican/master/content/images/logo/PelicanLogo.svg)](http://docs.getpelican.com) [![Open Source Love](https://badges.frapsoft.com/os/v1/open-source.png?v=103)](https://github.com/ellerbrock/open-source-badges/) [![Say Thanks!](https://img.shields.io/badge/Say%20Thanks-!-1EAEDB.svg)](https://saythanks.io/to/Kristinita) [![Netlify Status](https://api.netlify.com/api/v1/badges/27090fd4-c2fd-48be-ae43-cbe5bad15684/deploy-status)](https://app.netlify.com/sites/kristinita/deploys)
diff --git a/appveyor.yml b/appveyor.yml
@@ -41,7 +41,7 @@ init:
 # [LINK] “.travis.yml”:
 - SETX PIPENV_IGNORE_VIRTUALENVS 1
 - SETX PIPENV_VENV_IN_PROJECT 1
-- SETX PIPENV_SKIP_LOCK 1
+# - SETX PIPENV_SKIP_LOCK 1
 
 # [NOTE] Needs AppVeyor console set, see:
 # https://stackoverflow.com/a/48093971/5951529

diff --git a/themes/sashapelican/templates/article.html b/themes/sashapelican/templates/article.html
@@ -21,14 +21,14 @@
 https://github.com/satyamyadav/blog/blob/892083f531be87a274a5c13a90246db319b0201a/v0.3.0/blog/theme/templates/category.html
 https://webref.ru/html/link/rel
 -->
-{% block base_atom_feed -%}
+{% block base_atom_feed %}
 	<link href="{{ FEED_DOMAIN }}/{{ FEED_ALL_ATOM }}" rel="alternate" type="application/atom+xml">
 	<!-- [BUG] For Pelican 4.0+ we need to replace CATEGORY_FEED_ATOM|format(category.slug) to CATEGORY_FEED_ATOM|format(slug=category.slug):
 	https://github.com/getpelican/pelican/blob/master/docs/changelog.rst#401-2018-11-30 -->
 	{# Use dot, no pipe:
 	https://github.com/getpelican/pelican/issues/2442#issuecomment-449426117 #}
 	<link href="{{ FEED_DOMAIN }}/{{ CATEGORY_FEED_ATOM.format(slug=category.slug) }}" rel="alternate" type="application/atom+xml">
-{%- endblock %}
+{% endblock %}
 
 
 <!--=========================
@@ -39,14 +39,14 @@
 <!-- Neighbors: add pagination
 https://github.com/getpelican/pelican-plugins/tree/master/neighbors
 See example in https://github.com/whatifrussian/website/blob/9e29831dcf61c85e711a392709aaf711212ba7c9/themes/whatif/templates/includes/article_content.html -->
-{% block base_neighbors -%}
+{% block base_neighbors %}
 <div class="clearfix">
-	{%- if kira_object.lang == 'ru' -%}
+	{% if kira_object.lang == 'ru' %}
 		{% include 'includes/neighbors-ru.html' %}
 	{% else %}
 		{% include 'includes/neighbors-en.html' %}
 	{% endif %}
 </div>
-{%- endblock %}
+{% endblock %}
 
 
diff --git a/themes/sashapelican/templates/includes/code-blocks.html b/themes/sashapelican/templates/includes/code-blocks.html
@@ -1,7 +1,7 @@
 {#
 [INFO] Scripts and styles, if code blocks exists on the page
 #}
-{%- if "<pre>" in kira_object.content -%}
+{% if "<pre>" in kira_object.content %}
 
 	{# [DECLINED]
 	Tooltipster + JQuery = 40 kb; it’s too big for non-critical dependency:
@@ -47,4 +47,4 @@
 		deferscript('{{SITEURL}}/{{ THEME_STATIC_DIR }}/js/Clipboard-js/Clipboard{{MIN}}.js', 'clipboard-js-local', 700);
 		deferstyle('{{SITEURL}}/{{ THEME_STATIC_DIR }}/css/components/code-blocks.css', 'code-block-css', 700);
 	</script>
-{%- endif -%}
+{% endif %}
diff --git a/themes/sashapelican/templates/includes/content.html b/themes/sashapelican/templates/includes/content.html
@@ -7,9 +7,9 @@
 https://github.com/getpelican/pelican-plugins/tree/master/photos
 [NOTE] Declined, because now I don’t use this plugin at the time:
 
-{% block galleryblock -%}
+{% block galleryblock %}
 	{% if kira_object.photo_image %}
 		<img src="{{ SITEURL }}/{{ kira_object.photo_image[1] }}" />
 	{% endif %}
-{%- endblock %}
+{% endblock %}
 #}
diff --git a/themes/sashapelican/templates/includes/css-critical.html b/themes/sashapelican/templates/includes/css-critical.html
@@ -39,6 +39,6 @@
 <link rel="stylesheet" href="{{SITEURL}}/{{ THEME_STATIC_DIR }}/css/sections/{{ kira_object.pagecolors }}{{MIN}}.css">
 
 {# [INFO] Custom CSS #}
-{%- if kira_object.customcss -%}
+{% if kira_object.customcss %}
 	<link rel="stylesheet" href="{{SITEURL}}/css/personal/{{kira_object.customcss1}}{{MIN}}.css">
-{%- endif -%}
+{% endif %}
diff --git a/themes/sashapelican/templates/includes/footer.html b/themes/sashapelican/templates/includes/footer.html
@@ -25,7 +25,7 @@
 [INFO] Paths must be relative to “base.html”, not “footer.html”:
 “{% include 'includes/footer-en.html' %}”, not “{% include 'footer-en.html' %}”
 #}
-{%- if kira_object.lang == 'ru' -%}
+{% if kira_object.lang == 'ru' %}
 	{% include 'includes/footer-ru.html' %}
 {% else %}
 	{% include 'includes/footer-en.html' %}

diff --git a/themes/sashapelican/templates/includes/header.html b/themes/sashapelican/templates/includes/header.html
@@ -36,7 +36,7 @@ <h1 class="SashaTopHeader">
 <div>
 
 	{# [INFO] Epigraph #}
-	{%- if kira_object.epigraph -%}
+	{% if kira_object.epigraph %}
 	<div class="SashaEpigraph">
 		<em>{{ kira_object.epigraphtext }}</em>
 	</div>
@@ -46,7 +46,7 @@ <h1 class="SashaTopHeader">
 
 	[LEARN][JINJA] “if kira_object.titleimage” = “if kira_object.titleimage == 'true'”
 	#}
-	{%- if kira_object.titleimage -%}
+	{% if kira_object.titleimage %}
 
 		{# [SOON] Safari 14 supports webp;
 		https://caniuse.com/?search=webp

diff --git a/themes/sashapelican/templates/includes/js-critical.html b/themes/sashapelican/templates/includes/js-critical.html
@@ -207,6 +207,6 @@
 
 [REQUIRED] “Customjs: true” and “Customjs1: <path to script>” in article metadata
 
-{%- if kira_object.customjs -%}
+{% if kira_object.customjs %}
 	<script src="{{SITEURL}}/js/personal/{{kira_object.customjs1}}{{MIN}}.js" defer></script>
-{%- endif -%} #}
+{% endif %} #}
diff --git a/themes/sashapelican/templates/includes/js-low-priority.html b/themes/sashapelican/templates/includes/js-low-priority.html
@@ -42,15 +42,15 @@
 	deferscript('https://static.addtoany.com/menu/page.js', 'addtoany', 7000);
 </script>
 
-{%- if kira_object.lang == 'ru' -%}
+{% if kira_object.lang == 'ru' %}
 	<script>
 		deferscript('{{SITEURL}}/{{ THEME_STATIC_DIR }}/js/typo-reporter/typo-reporter-ru{{MIN}}.js', 'typo-reporter-local-ru', 8000);
 	</script>
 {% else %}
 	<script>
 		deferscript('{{SITEURL}}/{{ THEME_STATIC_DIR }}/js/typo-reporter/typo-reporter-en{{MIN}}.js', 'typo-reporter-local-en', 8000);
 	</script>
-{%- endif -%}
+{% endif %}
 
 
 {#
@@ -115,12 +115,12 @@
 
 [INFO] Add support for “details” and “summary” tags for old browsers:
 http://ru.stackoverflow.com/a/498984/199934
-{% block base_detailspolyfill -%}
-	{%- if kira_object.detailspolyfill == 'true' -%}
+{% block base_detailspolyfill %}
+	{% if kira_object.detailspolyfill == 'true' %}
 		<script src="{{SITEURL}}/js/Details-Polyfill/details1{{MIN}}.js" defer></script>
 		<script src="{{SITEURL}}/js/Details-Polyfill/details2{{MIN}}.js" defer></script>
-	{%- endif -%}
-{%- endblock %} #}
+	{% endif %}
+{% endblock %} #}
 
 
 {# [INFO] Mailerlite — subscribe to categories/tags by RSS:

diff --git a/themes/sashapelican/templates/includes/js-specific.html b/themes/sashapelican/templates/includes/js-specific.html
@@ -40,26 +40,26 @@
 [FIXME] Replace to Mermaid on other tool, that generate charts in build process,
 not during page loading
 #}
-{%- if "<li class=\"visualize\"" in kira_object.content -%}
+{% if "<li class=\"visualize\"" in kira_object.content %}
 	<script>
 		deferscript('{{SITEURL}}/{{ THEME_STATIC_DIR }}/js/Visualize/visualize{{MIN}}.js', 'visualize-local', 400);
 		deferscript('{{SITEURL}}/{{ THEME_STATIC_DIR }}/js/Visualize/visualize-bar-chart{{MIN}}.js', 'visualize-bar-chart', 700);
 		deferscript('{{SITEURL}}/{{ THEME_STATIC_DIR }}/js/Visualize/visualize-pie-chart{{MIN}}.js', 'visualize-pie-chart', 700);
 	</script>
-{%- endif -%}
+{% endif %}
 
 
 {# [INFO] RunKit — embed Node.js on any website:
 https://runkit.com/docs/embed
 
 [FIXME] Update RunKit to latest versions.
 #}
-{%- if "<div id=\"SashaRunkit\"></div>" in kira_object.content -%}
+{% if "<div id=\"SashaRunkit\"></div>" in kira_object.content %}
 	<script>
 		deferscript('https://embed.runkit.com', 'runkit', 400);
 		deferscript('{{SITEURL}}/{{ THEME_STATIC_DIR }}/js/RunKit/runkit{{MIN}}.js', 'runkit-local', 700);
 	</script>
-{%- endif -%}
+{% endif %}
 
 
 {#
@@ -72,12 +72,12 @@
 https://stackoverflow.com/a/42087938/5951529
 https://stackoverflow.com/a/54350773/5951529
 
-{%- if kira_object.content is match('^\\[=\\d+% .*\\]$') -%}
+{% if kira_object.content is match('^\\[=\\d+% .*\\]$') %}
 	<link rel="stylesheet" href="{{SITEURL}}/{{THEME_STATIC_DIR}}/css/script-colors/ProgressBar/progressbar{{MIN}}.css">
-{%- endif -%}
+{% endif %}
 #}
-{%- if "<div class=\"progress-bar\"" in kira_object.content -%}
+{% if "<div class=\"progress-bar\"" in kira_object.content %}
 	<script>
 		deferstyle('{{SITEURL}}/{{THEME_STATIC_DIR}}/css/script-colors/ProgressBar/progressbar{{MIN}}.css', 'progressbar', 400);
 	</script>
-{%- endif -%}
+{% endif %}
diff --git a/themes/sashapelican/templates/includes/lang-attribute.html b/themes/sashapelican/templates/includes/lang-attribute.html
@@ -19,9 +19,9 @@
 [FIXME][ISSUE] Validator:
 https://github.com/validator/validator
 
-{%- if kira_object.lang -%}
+{% if kira_object.lang %}
 	en
-{%- else -%}
+{% else %}
 	ru
-{%- endif -%}
+{% endif %}
 #}
diff --git a/themes/sashapelican/templates/includes/meta.html b/themes/sashapelican/templates/includes/meta.html
@@ -66,7 +66,7 @@
 https://www.woorank.com/en/blog/robots-txt-a-beginners-guide
 2. “meta” tag solution is more automated
 #}
-{%- if kira_object.status == 'draft' or kira_object.noindex -%}
+{% if kira_object.status == 'draft' or kira_object.noindex %}
 	{# [INFO] No index page, but index third-party links #}
 	<meta name="robots" content="noindex, follow">
 {% endif %}
diff --git a/themes/sashapelican/templates/includes/tables.html b/themes/sashapelican/templates/includes/tables.html
@@ -17,10 +17,10 @@
 because sometimes “responsive-tables” can’t boot after cash
 and I get error in the console.
 #}
-{%- if "<table>" in kira_object.content -%}
+{% if "<table>" in kira_object.content %}
 	<script>
 		deferstyle('https://cdn.jsdelivr.net/npm/jquery-responsive-tables/css/responsive-tables.min.css', 'responsive-tables-css', 400);
 		deferscript('https://cdn.jsdelivr.net/npm/jquery-responsive-tables/js/jquery.responsive-tables.min.js', 'responsive-tables', 700);
 		deferscript('{{SITEURL}}/{{ THEME_STATIC_DIR }}/js/jquery-responsive-tables/jquery-responsive-tables{{MIN}}.js', 'responsive-tables-local', 1000);
 	</script>
-{%- endif -%}
+{% endif %}
diff --git a/themes/sashapelican/templates/sasha-black.html b/themes/sashapelican/templates/sasha-black.html
@@ -83,13 +83,13 @@
 		[LEARN][JINJA] If minus sign, blank lines will removed:
 		http://jinja.pocoo.org/docs/latest/templates/#whitespace-control
 		#}
-		{% macro kira_site_type(type) -%}
+		{% macro kira_site_type(type) %}
 		    <span class="SashaCategory">{{type}}:</span>
-		{%- endmacro %}
+		{% endmacro %}
 		{{ kira_site_type('Онлайн-сканеры') }}
-		{% macro kira_checker(url, color, sitename) -%}
+		{% macro kira_checker(url, color, sitename) %}
 			<a onclick="KiraFunction(document.all.sitename.value, '{{url}}');" class="SashaButtonCategory {{color}}">&nbsp;{{sitename}}&nbsp;</a>
-		{%- endmacro %}
+		{% endmacro %}
 		{% set kira_online_scaners = [
 		    ('http://quttera.com/sitescan/', 'SashaButtonLightSkyBlue', 'Quttera'),
 		    ('http://sitecheck.sucuri.net/results/', 'SashaButtonLimeGreen', 'Sucuri'),

diff --git a/tidy.conf b/tidy.conf
@@ -13,8 +13,8 @@
 # http://api.html-tidy.org/tidy/tidylib_api_next/tidy_config.html
 # [NOTE] No official configuration filename, I use common:
 # https://github.com/search?utf8=%E2%9C%93&q=filename%3Atidy.conf&type=Code
-# [BUG] Solely ASCII symbols must be in HTML Tidy configuration file:
-# https://github.com/htacg/tidy-html5/issues/737
+# [WARNING][BUG] Solely ASCII symbols must be in HTML Tidy configuration file:
+# https://github.com/htacg/tidy-html5/issues/737#issuecomment-728718009
 
 
 # [INFO] Not convert tabs to spaces and not add additional spaces: