Skip to content

Commit b7d28e7

Browse files
committed
preparation for a snapshot and PR merge
1 parent 6cbcfe2 commit b7d28e7

File tree

4 files changed

+18
-9
lines changed

4 files changed

+18
-9
lines changed

deps.edn

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
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

project.clj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
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"

src/clojisr/v1/impl/common.clj

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,13 @@
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))

src/clojisr/v1/require.clj

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,8 +98,10 @@
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

0 commit comments

Comments
 (0)