From 6b758fa1c8a48c77ba28c9647d14668fafe3e1b2 Mon Sep 17 00:00:00 2001 From: Peter Taoussanis Date: Thu, 27 Feb 2014 18:09:32 +0700 Subject: [PATCH 1/4] Update .gitignore --- .gitignore | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/.gitignore b/.gitignore index fad12cf..dd2503b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,12 +1,13 @@ -/target -/lib -/classes -/checkouts -/logs -/docs -/doc -*.jar -*.class -.lein* -pom.xml* -.env +/target/ +/lib/ +/classes/ +/checkouts/ +/logs/ +/docs/ +/doc/ +/*.jar +/*.class +/.lein* +/pom.xml* +/.env +.DS_Store \ No newline at end of file From bc7dc53a3dbd3e50deb5dc9b48c310f333e0640e Mon Sep 17 00:00:00 2001 From: Peter Taoussanis Date: Fri, 28 Feb 2014 20:53:18 +0700 Subject: [PATCH 2/4] Project.clj hk --- project.clj | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/project.clj b/project.clj index cb21e63..8ac3e63 100644 --- a/project.clj +++ b/project.clj @@ -34,12 +34,9 @@ :dev [:1.6 :test {:jvm-opts ^:replace ["-server" "-Xms1024m" "-Xmx2048m"] - :hooks [] :dependencies [] - :plugins []}]} - - :plugins [[lein-ancient "0.5.4"] - [codox "0.6.7"]] + :plugins [[lein-ancient "0.5.4"] + [codox "0.6.7"]]}]} ;; :codox {:sources ["target/classes"]} ; cljx :aliases From 66333155c9de1dc4bc9a3b5af9ad0f2277ebb289 Mon Sep 17 00:00:00 2001 From: Peter Taoussanis Date: Fri, 28 Feb 2014 21:01:20 +0700 Subject: [PATCH 3/4] simple-check -> test.check --- project.clj | 2 +- test/taoensso/nippy/tests/main.clj | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/project.clj b/project.clj index 8ac3e63..4636469 100644 --- a/project.clj +++ b/project.clj @@ -23,7 +23,7 @@ :1.6 {:dependencies [[org.clojure/clojure "1.6.0-beta1"]]} :test {:jvm-opts ["-Xms1024m" "-Xmx2048m"] :dependencies [[expectations "1.4.56"] - [reiddraper/simple-check "0.5.6"] + [org.clojure/test.check "0.5.7"] [org.clojure/data.fressian "0.2.0"] [org.xerial.snappy/snappy-java "1.1.1-M1"]] :plugins [[lein-expectations "0.0.8"] diff --git a/test/taoensso/nippy/tests/main.clj b/test/taoensso/nippy/tests/main.clj index ae79828..6da3f3b 100644 --- a/test/taoensso/nippy/tests/main.clj +++ b/test/taoensso/nippy/tests/main.clj @@ -1,7 +1,7 @@ (ns taoensso.nippy.tests.main - (:require [simple-check (core :as sc) - (generators :as sc-gen) - (properties :as sc-prop)] + (:require [clojure.test.check :as check] + [clojure.test.check.generators :as check-gen] + [clojure.test.check.properties :as check-props] [expectations :as test :refer :all] [taoensso.nippy :as nippy :refer (freeze thaw)] [taoensso.nippy.compression :as compression] @@ -30,8 +30,8 @@ test-data)) (expect ; Try roundtrip anything that simple-check can dream up - (:result (sc/quick-check 80 ; Time is n-non-linear - (sc-prop/for-all [val sc-gen/any] + (:result (check/quick-check 80 ; Time is n-non-linear + (check-props/for-all [val check-gen/any] (= val (nippy/thaw (nippy/freeze val))))))) (expect AssertionError (thaw (freeze test-data {:password "malformed"}))) @@ -88,8 +88,8 @@ (let [bin->val (atom {}) val->bin (atom {})] (merge - (sc/quick-check (or n 1) - (sc-prop/for-all [val sc-gen/any #_sc-gen/any-printable] + (check/quick-check (or n 1) + (check-props/for-all [val check-gen/any #_check-gen/any-printable] (let [;; Nb need `seq` for Clojure hash equality: bin (hash (seq (freeze val)))] (and @@ -107,7 +107,7 @@ nil))) (comment - (sc-gen/sample sc-gen/any 10) + (check-gen/sample check-gen/any 10) (:result (qc-prop-bijection 80)) (let [{:keys [result bin->val val->bin]} (qc-prop-bijection 10)] [result (vals bin->val)])) From 7cd4a39e8081c04cac9dbab89f23ed0d0e187049 Mon Sep 17 00:00:00 2001 From: Peter Taoussanis Date: Wed, 12 Mar 2014 12:13:34 +0700 Subject: [PATCH 4/4] v2.6.0-RC1 --- CHANGELOG.md | 2 +- README.md | 4 ++-- project.clj | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a11d457..e4148f0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -## v2.6.0-beta2 / 2014 Feb 26 +## v2.6.0-RC1 / 2014 Mar 12 > Welcoming feedback on any issues, etc.! diff --git a/README.md b/README.md index e953d5f..36467ca 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,8 @@ **[API docs][]** | **[CHANGELOG][]** | [other Clojure libs][] | [Twitter][] | [contact/contributing](#contact--contributing) | current ([semantic][]) version: ```clojure -[com.taoensso/nippy "2.5.2"] ; Stable -[com.taoensso/nippy "2.6.0-beta2"] ; For early adopters +[com.taoensso/nippy "2.5.2"] ; Stable +[com.taoensso/nippy "2.6.0-RC1"] ; Appropriate for staging, early production adopters ``` v2.6 will be a backwards-compatible release with: improved performance (incl. frozen data size), a new low-level DataInput/DataOuput API, improved support for headerless freezing, and 1-to-1 binary-value representation guarantees. See the [Changelog](https://github.com/ptaoussanis/nippy/blob/master/CHANGELOG.md) for details. diff --git a/project.clj b/project.clj index 4636469..8301e80 100644 --- a/project.clj +++ b/project.clj @@ -1,4 +1,4 @@ -(defproject com.taoensso/nippy "2.6.0-beta2" +(defproject com.taoensso/nippy "2.6.0-RC1" :author "Peter Taoussanis " :description "Clojure serialization library" :url "https://github.com/ptaoussanis/nippy" @@ -12,7 +12,7 @@ :dependencies [[org.clojure/clojure "1.4.0"] [org.clojure/tools.reader "0.8.3"] - [com.taoensso/encore "0.9.2"] + [com.taoensso/encore "0.9.8"] [org.iq80.snappy/snappy "0.3"] [org.tukaani/xz "1.4"]]