Skip to content

Commit

Permalink
Merge branch '1.0.x' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
hkulyc authored Jan 8, 2022
2 parents ed1b6d4 + f27c6bf commit 6c086b9
Show file tree
Hide file tree
Showing 17 changed files with 10 additions and 1,072 deletions.
21 changes: 0 additions & 21 deletions .calva/output-window/output.calva-repl

This file was deleted.

24 changes: 0 additions & 24 deletions CHANGELOG.md

This file was deleted.

10 changes: 5 additions & 5 deletions project.clj
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
:url "http://example.com/FIXME"
:license {:name "EPL-2.0 OR GPL-2.0-or-later WITH Classpath-exception-2.0"
:url "https://www.eclipse.org/legal/epl-2.0/"}
:dependencies [[clojure-csv "2.0.2"]
[org.clojure/clojure "1.10.1"]
[org.clojure/math.numeric-tower "0.0.4"]
:dependencies [[org.clojure/clojure "1.10.1"]
;; [org.clojure/math.numeric-tower "0.0.4"]
[org.clojure/data.csv "1.0.0"]
^{:voom {:repo "git@github.com:onyx-platform/onyx.git" :branch "master"}}
[org.onyxplatform/onyx "0.14.5"]
[techascent/tech.ml.dataset "5.17" :exclusions [[ch.qos.logback/logback-classic][org.slf4j/slf4j-api]]]
[org.onyxplatform/onyx "0.14.6"]
;; [techascent/tech.ml.dataset "5.17" :exclusions [[ch.qos.logback/logback-classic][org.slf4j/slf4j-api]]]
[com.google.code.externalsortinginjava/externalsortinginjava "0.6.0"]]
:repl-options {:init-ns clojask.debug
:timeout 180000}
Expand Down
2 changes: 1 addition & 1 deletion src/main/clojure/aggregate/aggre_onyx_comps.clj
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
[onyx.api :refer :all]
[clojure.string :as string]
[onyx.test-helper :refer [with-test-env feedback-exception!]]
[tech.v3.dataset :as ds]
;; [tech.v3.dataset :as ds]
[clojure.data.csv :as csv]
[clojask.utils :as u]
[clojure.set :as set]
Expand Down
33 changes: 0 additions & 33 deletions src/main/clojure/clojask/.stream_input.clj

This file was deleted.

225 changes: 0 additions & 225 deletions src/main/clojure/clojask/core.clj

This file was deleted.

7 changes: 0 additions & 7 deletions src/main/clojure/clojask/delayed.clj

This file was deleted.

Loading

0 comments on commit 6c086b9

Please sign in to comment.