From 2d99be5909522384b5c7ae9547117c7948971641 Mon Sep 17 00:00:00 2001 From: David Luevano Alvarado Date: Sat, 26 Nov 2022 22:18:18 -0600 Subject: replace uncompatible highlighter/marker --- README.md | 2 +- requirements.txt | 9 ++++----- src/pyssg/md_parser.py | 3 +-- src/pyssg/per_level_formatter.py | 3 ++- 4 files changed, 8 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index dfa0290..f01e03c 100644 --- a/README.md +++ b/README.md @@ -40,11 +40,11 @@ This program uses the base [`markdown` syntax](https://daringfireball.net/projec - Table of Contents. - WikiLinks. - [yafg - Yet Another Figure Generator](https://git.sr.ht/~ferruck/yafg) -- [markdown.highlight](https://github.com/ribalba/markdown.highlight) - [Markdown Checklist](https://github.com/FND/markdown-checklist) - [PyMdown Extensions](https://facelessuser.github.io/pymdown-extensions/) - [Caret](https://facelessuser.github.io/pymdown-extensions/extensions/caret/) - [Tilde](https://facelessuser.github.io/pymdown-extensions/extensions/tilde/) + - [Mark](https://facelessuser.github.io/pymdown-extensions/extensions/mark/) ## Installation diff --git a/requirements.txt b/requirements.txt index 8cc9c23..d5997fd 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,7 +1,6 @@ -Jinja2>=3.1.1 -Markdown>=3.3.6 -markdown-checklist>=0.4.3 -MarkdownHighlight>=0.1.3 +Jinja2>=3.1.2 +Markdown>=3.4.1 +markdown-checklist>=0.4.4 MarkupSafe>=2.1.1 yafg>=0.3 -pymdown-extensions>=9.4 +pymdown-extensions>=9.9 diff --git a/src/pyssg/md_parser.py b/src/pyssg/md_parser.py index 8148536..759ead6 100644 --- a/src/pyssg/md_parser.py +++ b/src/pyssg/md_parser.py @@ -6,7 +6,6 @@ from logging import Logger, getLogger from markdown import Markdown from yafg import YafgExtension -from MarkdownHighlight.highlight import HighlightExtension from markdown_checklist.extension import ChecklistExtension from .database import Database @@ -30,8 +29,8 @@ def _get_md_obj() -> Markdown: figureNumbering=False, figureNumberClass="number", figureNumberText="Figure"), - HighlightExtension(), ChecklistExtension(), + 'pymdownx.mark', 'pymdownx.caret', 'pymdownx.tilde'] log.debug('list of md extensions: (%s)', diff --git a/src/pyssg/per_level_formatter.py b/src/pyssg/per_level_formatter.py index 7b93890..5ab3946 100644 --- a/src/pyssg/per_level_formatter.py +++ b/src/pyssg/per_level_formatter.py @@ -1,6 +1,7 @@ from logging import Formatter, DEBUG, INFO, WARNING, ERROR, CRITICAL - +# only reason for this class is to get info formatting as normal text +# and everything else with more info and with colors class PerLevelFormatter(Formatter): # colors for the terminal in ansi __YELLOW: str = "\x1b[33m" -- cgit v1.2.3-70-g09d2