File tree Expand file tree Collapse file tree 4 files changed +18
-9
lines changed Expand file tree Collapse file tree 4 files changed +18
-9
lines changed Original file line number Diff line number Diff line change 1- {:deps {org.clojure/clojure {:mvn/version " 1.11.1" },
2- org.clojure/tools.logging {:mvn/version " 1.3.0" },
3- scicloj/tablecloth {:mvn/version " 7.029.1 " }
1+ {:deps {org.clojure/clojure {:mvn/version " 1.11.1" }
2+ org.clojure/tools.logging {:mvn/version " 1.3.0" }
3+ scicloj/tablecloth {:mvn/version " 7.029.2 " }
44 org.scicloj/clojisr-rengine {:mvn/version " 0.1.2" }
5- ; ; org.rosuda.REngine/Rserve {:mvn/version "1.8.1"},
5+ ; ; org.rosuda.REngine/Rserve {:mvn/version "1.8.1"}
66 hiccup/hiccup {:mvn/version " 2.0.0-RC3" }
77 org.clojure/core.async {:mvn/version " 1.6.681" }
8- org.scicloj/kindly {:mvn/version " 4-beta4 " }}
8+ org.scicloj/kindly {:mvn/version " 4-beta12 " }}
99 :paths [" src" ]
1010 :aliases {:dev {:extra-paths [" resources" " notebooks" ]
1111 :jvm-opts [" -Dclojure.tools.logging.factory=clojure.tools.logging.impl/jul-factory" ]
12- :extra-deps {org.scicloj/clay {:mvn/version " 2-beta8 " }
12+ :extra-deps {org.scicloj/clay {:mvn/version " 2-beta16 " }
1313 io.github.nextjournal/clerk {:mvn/version " 0.7.418" }}}
1414 :test {:extra-paths [" test" ]
1515 :extra-deps {io.github.cognitect-labs/test-runner
Original file line number Diff line number Diff line change 1- (defproject scicloj /clojisr " 1.0.0 "
1+ (defproject scicloj /clojisr " 1.1.0-SNAPSHOT "
22 :description " Clojure <-> R interop"
33 :url " https://github.com/scicloj/clojisr"
44 :license {:name " EPL-2.0 OR GPL-2.0-or-later WITH Classpath-exception-2.0"
Original file line number Diff line number Diff line change 4848 (->clj [obj] obj)
4949 (->native [obj] obj))
5050
51+ (extend-type nil
52+ prot/RProto
53+ (inherits? [_ _] false )
54+ prot/Clojable
55+ (->clj [obj] obj)
56+ (->native [obj] obj))
57+
5158(defn ->seq-with-missing
5259 [xs missing]
5360 (mapv (fn [d na] (when-not na d)) xs missing))
Original file line number Diff line number Diff line change 9898
9999 ; ; alias namespaces
100100 ; ; https://clojurians.zulipchat.com/#narrow/stream/224816-clojisr-dev/topic/require-r.20vs.20-require-python
101- (alias package-symbol r-ns-symbol)
102- (when as (alias as r-ns-symbol))
101+ ; ; https://clojurians.zulipchat.com/#narrow/stream/224816-clojisr-dev/topic/clojisr.201.2E1.2E0/near/441026754
102+ (if as
103+ (alias as r-ns-symbol)
104+ (alias package-symbol r-ns-symbol))
103105
104106 ; ; inject symbol into current namespace
105107 (when refer
You can’t perform that action at this time.
0 commit comments