diff --git a/build.clj b/build.clj index c587e1a..c5453c6 100644 --- a/build.clj +++ b/build.clj @@ -64,8 +64,20 @@ (def opts {}) +(defn models-integration-tests "Run integration tests." [opts] + (let [basis (b/create-basis {:aliases [:model-integration-tests]}) + cmds (b/java-command + {:basis basis + :main 'clojure.main + :main-args ["-m" "cognitect.test-runner" + "-d" "model-integration-tests"]})] + (b/process cmds)) + opts) + + (defn ci "Run the CI pipeline of tests (and build the JAR)." [opts] (generate-tests nil) + (models-integration-tests nil) (test (assoc opts :aliases [:dev :test])) (b/delete {:path "target"}) (let [opts (jar-opts opts)] @@ -84,11 +96,3 @@ opts) -(defn models-integration-tests "Run integration tests." [opts] - (let [basis (b/create-basis { :aliases [:model-integration-tests ]}) - cmds (b/java-command - {:basis basis - :main 'clojure.main - :main-args ["-m" "cognitect.test-runner" "-d" "model-integration-tests"]})] - (b/process cmds)) - opts) diff --git a/build/gen_tests.clj b/build/gen_tests.clj index 93aca74..818f87a 100644 --- a/build/gen_tests.clj +++ b/build/gen_tests.clj @@ -15,4 +15,3 @@ :show false})))) (shutdown-agents)) -#_(clay/make! {:source-path "notebooks/noj_book/automl.clj" :show false}) diff --git a/deps.edn b/deps.edn index 497cde9..95becb0 100644 --- a/deps.edn +++ b/deps.edn @@ -1,26 +1,27 @@ {:paths ["src" "resources"] - :deps {scicloj/tablecloth {:mvn/version "7.029.2"} - org.scicloj/tcutils {:mvn/version "0.1.0-alpha2"} - com.techascent/tmd-parquet {:mvn/version "1.001"} - org.scicloj/kindly {:mvn/version "4-beta12"} - generateme/fastmath {:mvn/version "3.0.0-alpha1"} - aerial.hanami/aerial.hanami {:mvn/version "0.20.0"} - org.scicloj/hanamicloth {:mvn/version "1-alpha8"} - org.scicloj/metamorph.ml {:mvn/version "0.9.0"} - org.scicloj/scicloj.ml.tribuo {:mvn/version "0.1.2"} - org.scicloj/scicloj.ml.smile {:mvn/version "7.4.2"} - org.scicloj/sklearn-clj {:mvn/version "0.4.1"} - scicloj/scicloj.ml.xgboost {:mvn/version "6.0.0"} - org.tribuo/tribuo-regression-sgd {:mvn/version "4.2.0"} - org.tribuo/tribuo-regression-tree {:mvn/version "4.2.0"} - org.tribuo/tribuo-regression-xgboost {:mvn/version "4.2.0"} - org.tribuo/tribuo-classification-sgd {:mvn/version "4.2.0"} - org.tribuo/tribuo-classification-tree {:mvn/version "4.2.0"} - org.tribuo/tribuo-classification-xgboost {:mvn/version "4.2.0"} - clj-python/libpython-clj {:mvn/version "2.025"} - org.scicloj/kind-pyplot {:mvn/version "1-beta1"} - scicloj/clojisr {:mvn/version "1.0.0"} - same/ish {:mvn/version "0.1.6"}} + :deps {scicloj/tablecloth {:mvn/version "7.029.2"} + org.scicloj/tcutils {:mvn/version "0.1.0-alpha2"} + com.techascent/tmd-parquet {:mvn/version "1.001"} + org.scicloj/kindly {:mvn/version "4-beta12"} + generateme/fastmath {:mvn/version "3.0.0-alpha1"} + aerial.hanami/aerial.hanami {:mvn/version "0.20.0"} + org.scicloj/hanamicloth {:mvn/version "1-alpha8"} + org.scicloj/metamorph.ml {:mvn/version "0.9.0"} + org.scicloj/scicloj.ml.smile {:mvn/version "7.4.2"} + org.scicloj/sklearn-clj {:mvn/version "0.4.1"} + scicloj/scicloj.ml.xgboost {:mvn/version "6.0.0"} + + org.scicloj/scicloj.ml.tribuo {:mvn/version "0.1.3"} + org.tribuo/tribuo-regression-sgd {:mvn/version "4.3.1"} + org.tribuo/tribuo-regression-tree {:mvn/version "4.3.1"} + org.tribuo/tribuo-regression-xgboost {:mvn/version "4.3.1"} + org.tribuo/tribuo-classification-sgd {:mvn/version "4.3.1"} + 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.025"} + org.scicloj/kind-pyplot {:mvn/version "1-beta1"} + scicloj/clojisr {:mvn/version "1.0.0"}} :aliases {:gen-tests {:extra-paths ["build"]} @@ -36,15 +37,18 @@ org.scicloj/clay {:mvn/version "2-beta16"}}} :model-integration-tests - {:extra-paths ["model-integration-tests"] - :extra-deps { + {:extra-paths ["model-integration-tests" "notebooks"] + :extra-deps {;; are needed by certain smile models org.bytedeco/arpack-ng {:mvn/version "3.7.0-1.5.4"} org.bytedeco/openblas-platform {:mvn/version "0.3.10-1.5.4"} org.bytedeco/arpack-ng-platform {:mvn/version "3.7.0-1.5.4"} org.bytedeco/openblas {:mvn/version "0.3.10-1.5.4"} org.bytedeco/javacpp {:mvn/version "1.5.4"} - org.scicloj/metamorph.ml {:mvn/version "0.9.0"} - io.github.cognitect-labs/test-runner {:git/tag "v0.5.1" :git/sha "dfb30dd"}}} + same/ish {:mvn/version "0.1.6"} + io.github.cognitect-labs/test-runner {:git/tag "v0.5.1" :git/sha "dfb30dd"} + }} + + :dev {:extra-paths ["notebooks"] :extra-deps {org.scicloj/clay {:mvn/version "2-beta16"}}}}}