mystmd 1.3.0__py3-none-any.whl → 1.3.1__py3-none-any.whl

{mystmd-1.3.0.dist-info → mystmd-1.3.1.dist-info}/METADATA

@@ -1,10 +1,10 @@
 Metadata-Version: 2.3
 Name: mystmd
-Version: 1.3.0
+Version: 1.3.1
 Summary: Command line tools for MyST Markdown
-Project-URL: Homepage, https://github.com/executablebooks/mystmd
-Project-URL: Bug Tracker, https://github.com/executablebooks/mystmd/issues
-Project-URL: Repository, https://github.com/executablebooks/mystmd.git
+Project-URL: Homepage, https://github.com/jupyter-book/mystmd
+Project-URL: Bug Tracker, https://github.com/jupyter-book/mystmd/issues
+Project-URL: Repository, https://github.com/jupyter-book/mystmd.git
 Author-email: Rowan Cockett <rowan@curvenote.com>
 License-Expression: MIT
 License-File: LICENSE
@@ -28,8 +28,8 @@ Description-Content-Type: text/markdown
 
 # MyST Markdown Command Line Interface, `mystmd`
 
-[![MIT License](https://img.shields.io/badge/license-MIT-blue.svg)](https://github.com/executablebooks/mystmd/blob/main/LICENSE)
-![CI](https://github.com/executablebooks/mystmd/workflows/CI/badge.svg)
+[![MIT License](https://img.shields.io/badge/license-MIT-blue.svg)](https://github.com/jupyter-book/mystmd/blob/main/LICENSE)
+![CI](https://github.com/jupyter-book/mystmd/workflows/CI/badge.svg)
 
 `mystmd` is a set of open-source, community-driven tools designed for scientific communication, including a powerful authoring framework that supports blogs, online books, scientific papers, reports and journals articles.
 
@@ -69,4 +69,4 @@ conda config --set channel_priority strict
 conda install mystmd
 myst init
 myst build my-doc.md --tex
-```
+```

mystmd-1.3.1.dist-info/RECORD

@@ -0,0 +1,8 @@
+mystmd_py/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+mystmd_py/main.py,sha256=AAcX3rJdJgYboCxwjHoCi1TdHSfBjNstbr562tjey44,1470
+mystmd_py/myst.cjs,sha256=1p7ylti11os-YY6iqcthGEh1cxR5VLuLKRoE8z8XnD0,13059937
+mystmd-1.3.1.dist-info/METADATA,sha256=rZJZREYgrO0lNPuOy06UhLEX1z82HUV1k4IkUBznUCg,2954
+mystmd-1.3.1.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
+mystmd-1.3.1.dist-info/entry_points.txt,sha256=eC2ol2gqS2q5E-ktkMrBSvV0tckGUcNGS-c4hEQ-_V4,45
+mystmd-1.3.1.dist-info/licenses/LICENSE,sha256=4BcikqvulW5nh_MxaocO-lC7ydIX23dMbcqtNTUSxr4,1082
+mystmd-1.3.1.dist-info/RECORD,,

{mystmd-1.3.0.dist-info → mystmd-1.3.1.dist-info}/licenses/LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2023 ExecutableBookProject
+Copyright (c) 2024 Project Jupyter
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

mystmd_py/myst.cjs

@@ -193562,7 +193562,7 @@ var {
 } = import_index.default;
 
 // src/version.ts
-var version = "1.3.0";
+var version = "1.3.1";
 var version_default = version;
 
 // ../myst-cli/dist/build/build.js
@@ -288217,7 +288217,7 @@ var import_node_path16 = __toESM(require("path"), 1);
 var import_nbtx = __toESM(require_cjs2(), 1);
 
 // ../myst-cli/dist/version.js
-var version2 = "1.3.0";
+var version2 = "1.3.1";
 var version_default2 = version2;
 
 // ../myst-cli/dist/utils/headers.js
@@ -288567,6 +288567,7 @@ __export(imagemagick_exports, {
   convert: () => convert2,
   convertImageToWebp: () => convertImageToWebp,
   extractFirstFrameOfGif: () => extractFirstFrameOfGif,
+  imageMagickCommand: () => imageMagickCommand,
   isGif2webpAvailable: () => isGif2webpAvailable,
   isImageMagickAvailable: () => isImageMagickAvailable,
   isWebpAvailable: () => isWebpAvailable
@@ -288574,9 +288575,21 @@ __export(imagemagick_exports, {
 var import_node_fs9 = __toESM(require("fs"), 1);
 var import_node_path14 = __toESM(require("path"), 1);
 var import_which = __toESM(require_lib15(), 1);
-function isImageMagickAvailable() {
+function magickCommandAvailable() {
   return import_which.default.sync("magick", { nothrow: true });
 }
+function convertCommandAvailable() {
+  return import_which.default.sync("convert", { nothrow: true });
+}
+function isImageMagickAvailable() {
+  return magickCommandAvailable() || convertCommandAvailable();
+}
+function imageMagickCommand() {
+  if (!magickCommandAvailable() && convertCommandAvailable()) {
+    return "convert";
+  }
+  return "magick";
+}
 function isWebpAvailable() {
   return import_which.default.sync("cwebp", { nothrow: true });
 }
@@ -288617,7 +288630,7 @@ async function extractFirstFrameOfGif(session, gif, writeFolder) {
   if (import_node_fs9.default.existsSync(png)) {
     session.log.debug(`Cached file found for extracted GIF: ${gif}`);
   } else {
-    const executable = `magick -density 600 -colorspace RGB ${gif}[0] ${png}`;
+    const executable = `${imageMagickCommand()} -density 600 -colorspace RGB ${gif}[0] ${png}`;
     session.log.debug(`Executing: ${executable}`);
     const exec3 = makeExecutable(executable, session.log);
     try {
@@ -288645,7 +288658,7 @@ async function convert2(inputExtension, outputExtension, session, input3, writeF
     session.log.debug(`Cached file found for converted ${inputFormatUpper}: ${input3}`);
     return filename;
   } else {
-    const executable = `magick -density 600 -colorspace RGB ${input3}${(options === null || options === void 0 ? void 0 : options.trim) ? " -trim" : ""} ${output2}`;
+    const executable = `${imageMagickCommand()} -density 600 -colorspace RGB ${input3}${(options === null || options === void 0 ? void 0 : options.trim) ? " -trim" : ""} ${output2}`;
     session.log.debug(`Executing: ${executable}`);
     const exec3 = makeExecutable(executable, createImagemagikLogger(session));
     try {
@@ -288707,11 +288720,11 @@ async function convertImageToWebp(session, image6, { quality = 80, overwrite = f
   };
   const convertImg = makeExecutable(`cwebp -q ${quality} "${image6}" -o "${webp}"`, debugLogger2);
   const convertGif = makeExecutable(`gif2webp -q ${quality} "${image6}" -o "${webp}"`, debugLogger2);
-  const convertPdfPng = makeExecutable(`magick -density 600 -colorspace RGB ${image6} -trim ${png}`, debugLogger2);
+  const convertPdfPng = makeExecutable(`${imageMagickCommand()} -density 600 -colorspace RGB ${image6} -trim ${png}`, debugLogger2);
   const convertPdfWebP = makeExecutable(`cwebp -q ${quality} "${png}" -o "${webp}"`, debugLogger2);
   try {
     if (import_node_path14.default.extname(image6) === ".pdf") {
-      if (!isImageMagickAvailable() && !isWebpAvailable()) {
+      if (!isImageMagickAvailable() || !isWebpAvailable()) {
         addWarningForFile(session, image6, `Could not convert from image ${image6} to webp:
 imagemagick and cwebp are required
 `, "warn", { ruleId: RuleId.imageFormatOptimizes });
@@ -296468,7 +296481,7 @@ async function writeTOCToConfigFile(project, srcPath, dstPath) {
   } catch (err) {
     const errorMessage = lines.map((line2) => `    ${line2}`).join("\n");
     throw new Error(`Invalid YAML was generated when attempting to write the table-of-contents to ${dstPath}.
-This should not happenm please file a bug report at https://github.com/executablebooks/mystmd.
+This should not happenm please file a bug report at https://github.com/jupyter-book/mystmd.
 The invalid TOC contents are as follows:
 ${errorMessage}`);
   }
@@ -302896,7 +302909,7 @@ function renderImports(kind, output2, imports, packages, preamble) {
 }
 
 // ../jtex/dist/version.js
-var version3 = "1.0.17";
+var version3 = "1.0.18";
 var version_default3 = version3;
 
 // ../jtex/dist/jtex.js

mystmd-1.3.0.dist-info/RECORD

@@ -1,8 +0,0 @@
-mystmd_py/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-mystmd_py/main.py,sha256=AAcX3rJdJgYboCxwjHoCi1TdHSfBjNstbr562tjey44,1470
-mystmd_py/myst.cjs,sha256=JS-_Zfm1iluAUKLiEzKrfDBp_pJV-lE4uU9gQPmYCwA,13059491
-mystmd-1.3.0.dist-info/METADATA,sha256=vmLqEdC0FSajY0EvZnzaUYRlnEDCrIajjDYltUvGV-A,2968
-mystmd-1.3.0.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
-mystmd-1.3.0.dist-info/entry_points.txt,sha256=eC2ol2gqS2q5E-ktkMrBSvV0tckGUcNGS-c4hEQ-_V4,45
-mystmd-1.3.0.dist-info/licenses/LICENSE,sha256=vgXlcTOVbxYpGiMuE9NqgguIBXAH0hJAktlaxiyZ2wg,1088
-mystmd-1.3.0.dist-info/RECORD,,