diff --git a/README.md b/README.md index 7b7194c..9110a7f 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ [![PyPI](https://img.shields.io/pypi/v/jinjafx-server.svg)](https://pypi.python.org/pypi/jinjafx-server/) -![Python](https://img.shields.io/badge/python-≥ 3.8-brightgreen) +![Python](https://img.shields.io/badge/python-≥ 3.9-brightgreen) [](https://jinjafx.io)  

JinjaFx Server - Jinja2 Templating Tool

diff --git a/contrib/update_cdnjs_links.py b/contrib/update_cdnjs_links.py index e517b25..b973b19 100755 --- a/contrib/update_cdnjs_links.py +++ b/contrib/update_cdnjs_links.py @@ -8,7 +8,7 @@ 'firacode': '6.2.0', 'split.js': '1.6.5', 'js-yaml': '4.1.0', - 'dayjs': '1.11.10', + 'dayjs': '1.11.11', 'pako': '2.1.0', 'jszip': '3.10.1', 'github-markdown-css': '5.5.1' diff --git a/jinjafx_server.py b/jinjafx_server.py index c2a3333..5693dac 100755 --- a/jinjafx_server.py +++ b/jinjafx_server.py @@ -16,8 +16,8 @@ # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. import sys -if sys.version_info < (3, 8): - sys.exit('Requires Python >= 3.8') +if sys.version_info < (3, 9): + sys.exit('Requires Python >= 3.9') from http.cookies import SimpleCookie from http.server import HTTPServer, BaseHTTPRequestHandler @@ -28,7 +28,7 @@ import re, argparse, hashlib, traceback, glob, hmac, uuid, struct, binascii, gzip, requests, ctypes, subprocess import cmarkgfm, emoji -__version__ = '24.3.0' +__version__ = '24.5.0' llock = threading.RLock() rlock = threading.RLock() @@ -548,7 +548,7 @@ def html_escape(text): options = (cmarkgfm.cmark.Options.CMARK_OPT_GITHUB_PRE_LANG | cmarkgfm.cmark.Options.CMARK_OPT_SMART | cmarkgfm.cmark.Options.CMARK_OPT_UNSAFE) output = cmarkgfm.github_flavored_markdown_to_html(html_escape(output), options).replace('&amp;', '&').replace('&', '&') head = '\n\n\n' - head += '\n' + head += '\n' head += '\n\n' output = emoji.emojize(output, language='alias').encode('ascii', 'xmlcharrefreplace').decode('utf-8') output = head + '\n
\n' + output + '
\n\n\n' diff --git a/podman/Dockerfile b/podman/Dockerfile index 2b4247b..5fdc380 100644 --- a/podman/Dockerfile +++ b/podman/Dockerfile @@ -7,8 +7,8 @@ RUN set -eux; \ apt-get update; \ apt-get install -y --no-install-recommends wget git build-essential; \ -wget -P /tmp https://github.com/jgm/pandoc/releases/download/3.1.12.2/pandoc-3.1.12.2-1-amd64.deb; \ -dpkg -i /tmp/pandoc-3.1.12.2-1-amd64.deb; \ +wget -P /tmp https://github.com/jgm/pandoc/releases/download/3.2/pandoc-3.2-1-amd64.deb; \ +dpkg -i /tmp/pandoc-3.2-1-amd64.deb; \ python3 -m venv /opt/jinjafx; \ /opt/jinjafx/bin/python3 -m pip install --upgrade git+https://github.com/cmason3/jinjafx_server.git@${BRANCH} lxml; \ diff --git a/setup.py b/setup.py index c30cc90..542154a 100644 --- a/setup.py +++ b/setup.py @@ -14,7 +14,7 @@ setup( name="jinjafx_server", version=__version__, - python_requires=">=3.8", + python_requires=">=3.9", description="JinjaFx Server - Jinja2 Templating Tool", long_description=README, long_description_content_type="text/markdown", diff --git a/www/dt.html b/www/dt.html index 6de0ab8..6b12313 100644 --- a/www/dt.html +++ b/www/dt.html @@ -6,7 +6,7 @@ JinjaFx DataTemplate - + diff --git a/www/index.html b/www/index.html index e822dbe..a8341ef 100644 --- a/www/index.html +++ b/www/index.html @@ -8,14 +8,14 @@ JinjaFx - Jinja2 Templating Tool - + - + @@ -31,8 +31,8 @@ - - + + @@ -156,7 +156,7 @@
-
G
L
O
B
A
L
.
Y
M
L
+
G
L
O
B
A
L
.
Y
M
L
@@ -206,7 +206,7 @@

Outputs

et-0/0/{0-9:1}

The above syntax would convert one row into ten rows using the values 0 to 9. If the end value is omitted then it is a passive counter and will only increment if something else is expanding the rows.


Inputs

-

Normally data is provided to JinjaFx via CSV or YAML using the above panes, but JinjaFx can also prompt the user for input using the "jinjafx_input" variable in "vars.yml", e.g:

+

Normally data is provided to JinjaFx via CSV or YAML/JSON using the above panes, but JinjaFx can also prompt the user for input using the "jinjafx_input" variable in "vars.yml", e.g:

jinjafx_input:
   prompt:
     name:
diff --git a/www/logs.html b/www/logs.html
index da35b7d..859f669 100644
--- a/www/logs.html
+++ b/www/logs.html
@@ -5,7 +5,7 @@
     
     JinjaFx Logs
     
-    
+