Upgrade emmy (#673)

Co-authored-by: Andrea Amantini <[email protected]>

Author: borkdude

.dir-locals.el

@@ -9,7 +9,7 @@
                         (apply orig-fun args)))
 
                     (advice-add 'cider-jack-in :around #'cider-jack-in-wrapper-function)
-                    
+
                     (when (not (featurep 'clerk))
                       (let ((init-file-path (expand-file-name "clerk.el" default-directory)))
                         (when (file-exists-p init-file-path)

book.clj

@@ -14,7 +14,8 @@
             [nextjournal.clerk.eval :as eval]
             [nextjournal.clerk.analyzer :as ana]
             [nextjournal.clerk.viewer :as v]
-            [sicmutils.env :as sicm]
+            [emmy.env :as emmy]
+            [emmy.expression]
             [weavejester.dependency :as dep])
   (:import (javax.imageio ImageIO)
            (java.net URL)))
@@ -626,7 +627,7 @@ v/table-viewer
 ;; using `clerk/html` on the JVM. When you want to run code in the
 ;; browser where Clerk's viewers are rendered, reach for
 ;; `:render-fn`. As an example, we'll write a multiviewer for a
-;; sicmutils literal expression that will compute two alternative
+;; emmy literal expression that will compute two alternative
 ;; representations and let the user switch between them in the
 ;; browser.
 
@@ -635,8 +636,8 @@ v/table-viewer
 ;; original form.
 
 (defn transform-literal [expr]
-  {:TeX (-> expr sicm/->TeX clerk/tex)
-   :original (clerk/code (with-out-str (sicm/print-expression (sicm/freeze expr))))})
+  {:TeX (-> expr emmy/->TeX clerk/tex)
+   :original (clerk/code (with-out-str (emmy/print-expression (emmy/freeze expr))))})
 
 ;; Our `literal-viewer` calls this `transform-literal` function and
 ;; also calls `clerk/mark-preserve-keys`. This tells Clerk to leave
@@ -650,7 +651,7 @@ v/table-viewer
 ;; `wrapped-value` that ran through `v/present` and show it.
 
 (def literal-viewer
-  {:pred sicmutils.expression/literal?
+  {:pred emmy.expression/literal?
    :transform-fn (comp clerk/mark-preserve-keys
                        (clerk/update-val transform-literal))
    :render-fn '(fn [label->val]
@@ -670,8 +671,8 @@ v/table-viewer
 ;; representation!
 
 ^{::clerk/viewer literal-viewer}
-(sicm/+ (sicm/square (sicm/sin 'x))
-        (sicm/square (sicm/cos 'x)))
+(emmy/+ (emmy/square (emmy/sin 'x))
+        (emmy/square (emmy/cos 'x)))
 
 ;; #### 🥇 Selection
 
@@ -696,8 +697,8 @@ v/table-viewer
 
 ;; As you can see we now get this viewer automatically, without
 ;; needing to explicitly select it.
-(sicm/+ (sicm/square (sicm/sin 'x))
-        (sicm/square (sicm/cos 'x)))
+(emmy/+ (emmy/square (emmy/sin 'x))
+        (emmy/square (emmy/cos 'x)))
 
 ;; #### 🔓 Elisions
 

deps.edn

@@ -75,9 +75,11 @@
                                com.github.seancorfield/honeysql {:mvn/version "2.6.1126"}
                                org.clojure/data.csv {:mvn/version "1.0.0"}
                                hickory/hickory {:mvn/version "0.7.1"}
-                               sicmutils/sicmutils {:mvn/version "0.20.0"}
-                               io.github.mentat-collective/emmy {:git/sha "b98fef51d80d3edcff3100562b929f9980ff34d7"
-                                                                 :exclusions [org.babashka/sci]}
+                               org.mentat/emmy {:mvn/version "0.32.0"
+                                                :exclusions [org.babashka/sci]}
+                               ;; emmy needs SCI, here we use the same version as in render:
+                               org.babashka/sci {:git/url "https://github.com/babashka/sci"
+                                                 :git/sha "c556f4474303c61da72e7a07eef496dcbf66a56e"}
                                io.github.nextjournal/clerk-slideshow {:git/sha "11a83fea564da04b9d17734f2031a4921d917893"}}}
 
            :nextjournal/garden {:exec-fn nextjournal.clerk/serve!

notebooks/double_pendulum.clj

@@ -14,7 +14,7 @@
             [aerial.hanami.templates :as hanami-templates]
             [notespace-sicmutils.hanami-extras :as hanami-extras]
             [nextjournal.clerk :as clerk]
-            [sicmutils.env :as e :refer :all]))
+            [emmy.env :as e :refer :all]))
 
 ;; ## Lagrangian
 ;;

notebooks/multiviewer.clj

@@ -1,13 +1,11 @@
 (ns multiviewer
-  (:require [clojure.walk :as w]
-            [nextjournal.clerk :as clerk]
-            [nextjournal.clerk.viewer :as viewer]
-            [sicmutils.env :refer :all]
-            [sicmutils.expression :as e]
-            [sicmutils.value :as v]))
+  (:require [nextjournal.clerk :as clerk]
+            [emmy.env :refer :all]
+            [emmy.expression :as e]
+            [emmy.generic :as g]))
 
 (defn ->formatted-str [expr]
-  (let [form (v/freeze expr)]
+  (let [form (g/freeze expr)]
     (with-out-str (e/print-expression form))))
 
 (defn transform-literal [literal]

notebooks/sicmutils.clj

@@ -11,7 +11,7 @@
   (:refer-clojure
    :exclude [+ - * / partial ref zero? numerator denominator compare = run!])
   (:require [nextjournal.clerk :as clerk]
-            [sicmutils.env :as e :refer :all]))
+            [emmy.env :as e :refer :all]))
 
 ;; ## Lagrangian
 ;;