Add coloraide dependency (#947)

oscarlevin · web-flow · commit 1d5f6a9497c6 · 2025-03-24T08:27:10.000-06:00
* add coloraide to dependencies

* simplify sage name in executables constants
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,6 +9,11 @@ Instructions: Add a subsection under `[Unreleased]` for additions, fixes, change
 
 ## [Unreleased]
 
+### Added
+
+- Portable html builds now embed SVGs directly into the html (so you no longer need to upload them separately).
+- Coloraide package added as a dependency (for building custom themes).
+
 ## [2.15.0] - 2025-03-15
 
 Includes updates to core through commit: [bd0998c](https://github.com/PreTeXtBook/pretext/commit/bd0998c5663b25a9d2272ebc0e97bea80b66dc05)
diff --git a/poetry.lock b/poetry.lock
diff --git a/pretext/__init__.py b/pretext/__init__.py
@@ -18,7 +18,7 @@
 
 VERSION = get_version("pretext", Path(__file__).parent.parent)
 
-CORE_COMMIT = "bd0998c5663b25a9d2272ebc0e97bea80b66dc05"
+CORE_COMMIT = "7017d8fcc7005984ffc7fad81d0a37062a529a9d"
 
 
 def activate() -> None:
diff --git a/pretext/project/xml.py b/pretext/project/xml.py
@@ -16,8 +16,8 @@ class Executables(pxml.BaseXmlModel, tag="executables"):
     pdfsvg: t.Optional[str] = pxml.attr(default="pdf2svg")
     # If not specified, use a local executable if it exists; if it doesn't exist, choose `None`, which allows the generation logic to use the server instead.
     asy: t.Optional[str] = pxml.attr(default=shutil.which("asy"))
-    # The same applies to Sage.
-    sage: t.Optional[str] = pxml.attr(default=shutil.which("sage"))
+    # No sage server, so we don't do the same for sage.
+    sage: t.Optional[str] = pxml.attr(default="sage")
     mermaid: str = pxml.attr(default="mmdc")
     pdfpng: t.Optional[str] = pxml.attr(default="convert")
     pdfeps: str = pxml.attr(default="pdftops")
diff --git a/pretext/resources/resource_hash_table.json b/pretext/resources/resource_hash_table.json
@@ -68,5 +68,12 @@
     ".gitignore": "0e69b1765da2f482d737d7732b9b94b441fe29d4e88d110c6d59225ca4855f41",
     ".devcontainer.json": "670d3dc8d5bf1e825b93215961c64960defce193a4d8dcd266cb3dd8aa4c4a3f",
     "pretext-cli.yml": "f57f6ecd335bfbedf6d76e401aa48d0b9716e0f0aede050804600dcc11369cba"
+  },
+  "2.15.1": {
+    "project.ptx": "cf0cc772c3c0827bc586217ea71f3b6557660bc399d4be3f902bce6f746123b3",
+    "codechat_config.yaml": "73b46fafa848fee0e0b0aca32917bbe04804f56b4ab3e0c3b44e553110fbddd5",
+    ".gitignore": "8de226e98eacec4eb6d6897b35dc1304e4d758374566ed5759dc445542ad7bab",
+    ".devcontainer.json": "da0f949a050103fb7d7c97bd165573081c162bc82c6e868f545c26120692daef",
+    "pretext-cli.yml": "b8292fab364f1e9576d7f3f2fff9ed8f3891cecae182f568a9e7a091639b6078"
   }
 }
diff --git a/pyproject.toml b/pyproject.toml
@@ -33,7 +33,7 @@ GitPython = "^3"
 click = "^8"
 pdfCropMargins = "~1.0.9"
 PyPDF2 = "~2.5"
-pyMuPDF = "^1.23"
+pyMuPDF = "^1.24"
 click-log = "^0.4"
 ghp-import = "^2"
 single-version = "^1"
@@ -43,6 +43,7 @@ qrcode = "^7"
 psutil = "^7"
 plastex = "^3"
 jinja2 = "^3"
+coloraide = "^4"
 pelican = { extras = ["markdown"], version = "^4.10", optional = true }
 prefig = { extras = ["pycairo"], version = "^0.2.10", optional = true }
 
diff --git a/templates/.devcontainer.json b/templates/.devcontainer.json
@@ -1,4 +1,4 @@
-// This file was automatically generated with PreTeXt 2.14.1.
+// This file was automatically generated with PreTeXt 2.15.1.
 // If you modify this file, PreTeXt will no longer automatically update it.
 //
 //////////////////////////////////////////////////////////////
diff --git a/templates/.gitignore b/templates/.gitignore
@@ -1,4 +1,4 @@
-# This file was automatically generated with PreTeXt 2.14.1.
+# This file was automatically generated with PreTeXt 2.15.1.
 # If you modify this file, PreTeXt will no longer automatically update it.
 #
 # Boilerplate list of files in a PreTeXt project for git to ignore
diff --git a/templates/codechat_config.yaml b/templates/codechat_config.yaml
@@ -1,4 +1,4 @@
-# This file was automatically generated with PreTeXt 2.14.1.
+# This file was automatically generated with PreTeXt 2.15.1.
 # If you modify this file, PreTeXt will no longer automatically update it.
 #
 #############################################################
diff --git a/templates/pretext-cli.yml b/templates/pretext-cli.yml
@@ -1,4 +1,4 @@
-# This file was automatically generated with PreTeXt 2.14.1.
+# This file was automatically generated with PreTeXt 2.15.1.
 # If you modify this file, PreTeXt will no longer automatically update it.
 #
 name: PreTeXt-CLI Actions
diff --git a/templates/project.ptx b/templates/project.ptx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- This file was automatically generated by PreTeXt 2.14.1. -->
+<!-- This file was automatically generated by PreTeXt 2.15.1. -->
 <!-- If you modify this file, PreTeXt will no longer automatically update it.-->
 
 <!-- This file, the project manifest, provides the overall configuration for your PreTeXt project. To edit the content of your document, open `source/main.ptx`. See https://pretextbook.org/doc/guide/html/processing-CLI.html#cli-project-manifest. -->

Original file line number	Diff line number	Diff line change
`@@ -68,5 +68,12 @@`
`68`	`68`	`".gitignore": "0e69b1765da2f482d737d7732b9b94b441fe29d4e88d110c6d59225ca4855f41",`
`69`	`69`	`".devcontainer.json": "670d3dc8d5bf1e825b93215961c64960defce193a4d8dcd266cb3dd8aa4c4a3f",`
`70`	`70`	`"pretext-cli.yml": "f57f6ecd335bfbedf6d76e401aa48d0b9716e0f0aede050804600dcc11369cba"`
	`71`	`+ },`
	`72`	`+ "2.15.1": {`
	`73`	`+ "project.ptx": "cf0cc772c3c0827bc586217ea71f3b6557660bc399d4be3f902bce6f746123b3",`
	`74`	`+ "codechat_config.yaml": "73b46fafa848fee0e0b0aca32917bbe04804f56b4ab3e0c3b44e553110fbddd5",`
	`75`	`+ ".gitignore": "8de226e98eacec4eb6d6897b35dc1304e4d758374566ed5759dc445542ad7bab",`
	`76`	`+ ".devcontainer.json": "da0f949a050103fb7d7c97bd165573081c162bc82c6e868f545c26120692daef",`
	`77`	`+ "pretext-cli.yml": "b8292fab364f1e9576d7f3f2fff9ed8f3891cecae182f568a9e7a091639b6078"`
`71`	`78`	`}`
`72`	`79`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// This file was automatically generated with PreTeXt 2.14.1.`
	`1`	`+// This file was automatically generated with PreTeXt 2.15.1.`
`2`	`2`	`// If you modify this file, PreTeXt will no longer automatically update it.`
`3`	`3`	`//`
`4`	`4`	`//////////////////////////////////////////////////////////////`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-# This file was automatically generated with PreTeXt 2.14.1.`
	`1`	`+# This file was automatically generated with PreTeXt 2.15.1.`
`2`	`2`	`# If you modify this file, PreTeXt will no longer automatically update it.`
`3`	`3`	`#`
`4`	`4`	`# Boilerplate list of files in a PreTeXt project for git to ignore`