Merge pull request #141 from scicloj/2-beta8

2 beta8
scicloj · Feb 25, 2025 · e445585 · e445585
2 parents 464155f + 81b153a
commit e445585
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 12 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,10 @@
 # Change Log
 All notable changes to this project will be documented in this file. This change log follows the conventions of [keepachangelog.com](http://keepachangelog.com/).
 
+## [2-beta8] - 2025-02-25
+- update deps (Clay)
+- added Clay's main CLI to the uberjar build
+
 ## [2-beta7] - 2025-02-20
 - updated deps (tablecloth, kindly, tableplot, same/ish, clay)
 

diff --git a/build.clj b/build.clj
@@ -17,7 +17,7 @@
 
 
 (def lib 'org.scicloj/noj)
-(def version "2-beta7")
+(def version "2-beta8")
 (def snapshot (str version "-SNAPSHOT"))
 (def class-dir "target/classes")
 
@@ -98,20 +98,22 @@
   opts)
 
 
-
-
 (def clojupyter-kernel-file (format "target/%s-%s-clojupyter.jar" (name lib) version))
 
 (defn create-clojupyter-kernel "Create clojupyter kernel with noj" [opts]
   (let [basis (b/create-basis {:aliases [:clojupyter]})]
+    (println "\nCompiling ...")
     (b/compile-clj {:basis basis
-                    :ns-compile ['clojupyter.kernel.core 'clojupyter.cmdline]
+                    :ns-compile '[clojupyter.kernel.core
+                                  clojupyter.cmdline
+                                  scicloj.clay.v2.main]
                     :class-dir class-dir})
-
+    (println "\nBuilding" clojupyter-kernel-file "...")    
     (b/uber {:uber-file clojupyter-kernel-file
              :class-dir "target/classes"
-             ;:conflict-handlers {:default  :warn }
-             :basis basis})))
+             ;;:conflict-handlers {:default  :warn }
+             :basis basis
+             :main 'scicloj.clay.v2.main})))
 
 
 (defn install-clojupyter-kernel "Install  clojupyter kernel in local Jupyter" [opts]

diff --git a/deps.edn b/deps.edn
@@ -13,7 +13,6 @@
 
         org.scicloj/scicloj.ml.tribuo              {:mvn/version "0.2"}
 
-
         org.tribuo/tribuo-regression-liblinear    {:mvn/version "4.3.1"}
         org.tribuo/tribuo-regression-libsvm       {:mvn/version "4.3.1"}
         org.tribuo/tribuo-regression-sgd          {:mvn/version "4.3.1"}
@@ -26,17 +25,16 @@
         org.tribuo/tribuo-classification-tree      {:mvn/version "4.3.1"}
         org.tribuo/tribuo-classification-xgboost   {:mvn/version "4.3.1"}
 
-
         clj-python/libpython-clj                  {:mvn/version "2.026"}
         org.scicloj/kind-pyplot                   {:mvn/version "1-beta2.1"}
         scicloj/clojisr                           {:mvn/version "1.0.0"}
 
         same/ish                                  {:mvn/version "0.1.7"}
-
+        
         org.babashka/sci                          {:mvn/version "0.9.44"}
         org.mentat/emmy-viewers                   {:mvn/version "0.3.2"}
 
-        org.scicloj/clay                          {:mvn/version "2-beta29"}}
+        org.scicloj/clay                          {:mvn/version "2-beta30"}}
  :aliases
  {:gen-tests {:extra-paths ["build"]}
 
@@ -49,7 +47,6 @@
          :extra-deps {org.clojure/test.check {:mvn/version "1.1.1"}
                       io.github.cognitect-labs/test-runner {:git/tag "v0.5.1" :git/sha "dfb30dd"}
                       org.slf4j/slf4j-nop {:mvn/version "2.0.16"}
-                      org.scicloj/clay {:mvn/version "2-beta25"}
                       clj-http/clj-http {:mvn/version "3.13.0"}
                       org.scicloj/scicloj.ml.smile       {:mvn/version "7.5.0"}   }}