markdown-up 3.0.0__tar.gz → 3.0.1__tar.gz

{markdown_up-3.0.0/src/markdown_up.egg-info → markdown_up-3.0.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: markdown-up
-Version: 3.0.0
+Version: 3.0.1
 Summary: MarkdownUp is a Markdown viewer
 Home-page: https://github.com/craigahobbs/markdown-up-py
 Author: Craig A. Hobbs

{markdown_up-3.0.0 → markdown_up-3.0.1}/setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = markdown-up
-version = 3.0.0
+version = 3.0.1
 url = https://github.com/craigahobbs/markdown-up-py
 author = Craig A. Hobbs
 author_email = craigahobbs@gmail.com

{markdown_up-3.0.0 → markdown_up-3.0.1}/src/markdown_up/api.py

@@ -10,9 +10,9 @@ import os
 from pathlib import PurePosixPath
 
 import bare_script
+from bare_script.include import schema_parse, schema_type_model_validate
 from bare_script.value import value_args_model, value_args_validate
 import chisel
-import schema_markdown
 
 
 # Load the MarkdownUp API requests
@@ -25,8 +25,8 @@ def load_api_requests(root, config, api_config):
         schema_parts = PurePosixPath(schema_posix).parts
         schema_path = os.path.join(root, *(schema_parts[1:] if schema_parts[0] == '/' else schema_parts))
         with open(schema_path, 'r', encoding='utf-8') as schema_file:
-            schema_markdown.parse_schema_markdown(schema_file, types, filename=schema_posix, validate=False)
-    schema_markdown.validate_type_model(types)
+            schema_parse(schema_file.read(), types, schema_posix, False)
+    schema_type_model_validate(types)
 
     # Parse and execute the API BareScript files
     api_globals = {

{markdown_up-3.0.0 → markdown_up-3.0.1}/src/markdown_up/main.py

@@ -13,7 +13,7 @@ import sys
 import threading
 import webbrowser
 
-import schema_markdown
+from bare_script.include import schema_parse, schema_validate
 import waitress
 
 from .app import HTML_EXTS, MARKDOWN_EXTS, MarkdownUpApplication
@@ -71,7 +71,7 @@ def main(argv=None):
     config_path = os.path.normpath(os.path.join(root, args.config))
     if os.path.isfile(config_path):
         with open(config_path, 'r', encoding='utf-8') as config_file:
-            config = schema_markdown.validate_type(CONFIG_TYPES, 'MarkdownUpConfig', json.load(config_file))
+            config = schema_validate(CONFIG_TYPES, 'MarkdownUpConfig', json.load(config_file))
     else:
         config = {}
 
@@ -79,7 +79,7 @@ def main(argv=None):
     api_path = os.path.normpath(os.path.join(root, args.api))
     if os.path.isfile(api_path):
         with open(api_path, 'r', encoding='utf-8') as api_file:
-            api_config = schema_markdown.validate_type(CONFIG_TYPES, 'MarkdownUpAPIConfig', json.load(api_file))
+            api_config = schema_validate(CONFIG_TYPES, 'MarkdownUpAPIConfig', json.load(api_file))
     else:
         api_config = None
 
@@ -131,7 +131,7 @@ def _wsgiapp_log_access(wsgiapp, environ, start_response):
 
 
 # The backend configuration schema
-CONFIG_TYPES = schema_markdown.parse_schema_markdown('''\
+CONFIG_TYPES = schema_parse('''\
 group "Application Configuration"
 
 

{markdown_up-3.0.0 → markdown_up-3.0.1}/src/markdown_up/static/markdownUpIndex.bare

@@ -2,6 +2,8 @@
 # https://github.com/craigahobbs/markdown-up/blob/main/LICENSE
 
 include <args.bare>
+include <markdown.bare>
+include <url.bare>
 
 
 #

{markdown_up-3.0.0 → markdown_up-3.0.1/src/markdown_up.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: markdown-up
-Version: 3.0.0
+Version: 3.0.1
 Summary: MarkdownUp is a Markdown viewer
 Home-page: https://github.com/craigahobbs/markdown-up-py
 Author: Craig A. Hobbs