Merge #57

57: Release Varisat 0.2.1 r=jix a=jix



Co-authored-by: Jannis Harder <[email protected]>

.circleci/config.yml

@@ -138,15 +138,15 @@ jobs:
                 -r $CIRCLE_PROJECT_REPONAME \
                 -c $CIRCLE_SHA1 \
                 -n "Varisat $VER" \
+                -b "$(sed -ne '2,${/^#/q;p}' CHANGELOG.md)" \
                 -delete v$VER \
                 /tmp/workspace/release
 
               cargo login $CARGO_TOKEN
 
               for PKG in $(sed '/^]/{d;q};s/"\(.*\)",\?/\1/;t;d' Cargo.toml); do
                 cd $PKG
-                cargo package || { echo retrying && sleep 5 && cargo package; }
-                cargo publish
+                cargo publish || { echo retrying && sleep 5 && cargo publish; }
                 cd ..
               done
             fi

.circleci/tag_release.sh

@@ -43,6 +43,11 @@ for FILE in "${FILES[@]}"; do
     fi
 done
 
+if ! fgrep -q "# $VER (" <(head -1 CHANGELOG.md); then
+    echo "Changelog entry missing" >&2
+    exit 1
+fi
+
 if ! git tag -l v$VER | grep -q .; then
     git tag -a v$VER -m "Release of version $VER"
 fi

CHANGELOG.md

@@ -0,0 +1,14 @@
+# 0.2.1 (2019-05-18)
+
+  * Improved API for constructing formulas (#54 and #55)
+  * Fix proof generation when the formula contains duplicated unit clauses
+    (#26)
+  * Configurable search parameters (#39)
+  * Proofs for satisfiable instances (#47)
+  * Proofs for incremental solving (#48)
+  * Reduce size of proofs in native format (#42)
+  * Split independent parts into individual crates with re-exports (#51)
+
+# 0.2.0 (2019-05-04)
+
+Initial release

README.md

@@ -27,8 +27,8 @@ for Linux and Windows.
 
 ## Documentation
 
-  * [User Manual](https://jix.github.io/varisat/manual/0.2.0/)
-  * [Library API Documentation](https://docs.rs/varisat/0.2.0/varisat/)
+  * [User Manual](https://jix.github.io/varisat/manual/0.2.1/)
+  * [Library API Documentation](https://docs.rs/varisat/0.2.1/varisat/)
 
 ## Developer Documentation
 

manual/src/README.md

@@ -20,4 +20,4 @@ documentation][api-docs].
 [crate-varisat]: https://crates.io/crates/varisat
 [crate-varisat-cli]: https://crates.io/crates/varisat-cli
 [github]: https://github.com/jix/varisat
-[api-docs]: https://docs.rs/varisat/0.2.0/varisat/
+[api-docs]: https://docs.rs/varisat/0.2.1/varisat/

manual/src/lib/README.md

@@ -8,4 +8,4 @@ The Varisat library is available on [crates.io as the `varisat`
 crate][varisat-crate]. The API documentation can be viewed on [docs.rs].
 
 [varisat-crate]:https://crates.io/crates/varisat
-[docs.rs]:https://docs.rs/varisat/0.2.0/varisat/
+[docs.rs]:https://docs.rs/varisat/0.2.1/varisat/

varisat-checker/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "varisat-checker"
-version = "0.2.0"
+version = "0.2.1"
 authors = ["Jannis Harder <[email protected]>"]
 edition = "2018"
 description = "Proof checker for proofs generate by the Varisat SAT solver"
@@ -17,15 +17,15 @@ log = "0.4.6"
 
     [dependencies.varisat-formula]
     path = "../varisat-formula"
-    version = "=0.2.0"
+    version = "=0.2.1"
 
     [dependencies.varisat-dimacs]
     path = "../varisat-dimacs"
-    version = "=0.2.0"
+    version = "=0.2.1"
 
     [dependencies.varisat-internal-proof]
     path = "../varisat-internal-proof"
-    version = "=0.2.0"
+    version = "=0.2.1"
 
 [dev-dependencies]
 proptest = "0.9.3"

varisat-cli/Cargo.toml

@@ -3,7 +3,7 @@ name = "varisat-cli"
 description = "A CDCL based SAT solver (command line solver)"
 homepage = "https://jix.one/project/varisat/"
 repository = "https://github.com/jix/varisat"
-version = "0.2.0"
+version = "0.2.1"
 authors = ["Jannis Harder <[email protected]>"]
 license = "MIT/Apache-2.0"
 readme = "README.md"
@@ -20,11 +20,11 @@ toml = "0.5.1"
 
     [dependencies.varisat]
     path = "../varisat"
-    version = "=0.2.0"
+    version = "=0.2.1"
 
     [dependencies.varisat-lrat]
     path = "../varisat-lrat"
-    version = "=0.2.0"
+    version = "=0.2.1"
 
 [[bin]]
 name = "varisat"

varisat-dimacs/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "varisat-dimacs"
-version = "0.2.0"
+version = "0.2.1"
 authors = ["Jannis Harder <[email protected]>"]
 edition = "2018"
 description = "DIMCAS CNF parser and writer for the Varisat SAT solver"
@@ -14,7 +14,7 @@ failure = "0.1.5"
 itoa = "0.4.4"
     [dependencies.varisat-formula]
     path = "../varisat-formula"
-    version = "=0.2.0"
+    version = "=0.2.1"
 
 [dev-dependencies]
 proptest = "0.9.3"
@@ -24,5 +24,5 @@ env_logger = "0.6.1"
 
     [dev-dependencies.varisat-formula]
     path = "../varisat-formula"
-    version = "=0.2.0"
+    version = "=0.2.1"
     features = ["proptest-strategies", "internal-testing"]

varisat-formula/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "varisat-formula"
-version = "0.2.0"
+version = "0.2.1"
 authors = ["Jannis Harder <[email protected]>"]
 edition = "2018"
 description = "Basic formula data types used by the Varisat SAT solver"

varisat-internal-macros/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "varisat-internal-macros"
-version = "0.2.0"
+version = "0.2.1"
 authors = ["Jannis Harder <[email protected]>"]
 edition = "2018"
 description = "Internal macros for the Varisat SAT solver"

varisat-internal-proof/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "varisat-internal-proof"
-version = "0.2.0"
+version = "0.2.1"
 authors = ["Jannis Harder <[email protected]>"]
 edition = "2018"
 description = "Internal proof format for the Varisat SAT solver"
@@ -14,7 +14,7 @@ failure = "0.1.5"
 
     [dependencies.varisat-formula]
     path = "../varisat-formula"
-    version = "=0.2.0"
+    version = "=0.2.1"
 
 [dev-dependencies]
 proptest = "0.9.3"

varisat-lrat/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "varisat-lrat"
-version = "0.2.0"
+version = "0.2.1"
 authors = ["Jannis Harder <[email protected]>"]
 edition = "2018"
 description = "LRAT proof generation for the Varisat SAT solver"
@@ -16,11 +16,11 @@ itoa = "0.4.4"
 
     [dependencies.varisat-formula]
     path = "../varisat-formula"
-    version = "=0.2.0"
+    version = "=0.2.1"
 
     [dependencies.varisat-checker]
     path = "../varisat-checker"
-    version = "=0.2.0"
+    version = "=0.2.1"
 
 
 [dev-dependencies]
@@ -29,9 +29,9 @@ tempfile = "3.0.7"
 
     [dev-dependencies.varisat]
     path = "../varisat"
-    version = "=0.2.0"
+    version = "=0.2.1"
 
     [dev-dependencies.varisat-formula]
     path = "../varisat-formula"
-    version = "=0.2.0"
+    version = "=0.2.1"
     features = ["proptest-strategies", "internal-testing"]

varisat/Cargo.toml

@@ -3,7 +3,7 @@ name = "varisat"
 description = "A CDCL based SAT solver (library)"
 homepage = "https://jix.one/project/varisat/"
 repository = "https://github.com/jix/varisat"
-version = "0.2.0"
+version = "0.2.1"
 authors = ["Jannis Harder <[email protected]>"]
 license = "MIT/Apache-2.0"
 readme = "README.md"
@@ -23,23 +23,23 @@ vec_mut_scan = "0.1.0"
 
     [dependencies.varisat-internal-macros]
     path = "../varisat-internal-macros"
-    version = "=0.2.0"
+    version = "=0.2.1"
 
     [dependencies.varisat-formula]
     path = "../varisat-formula"
-    version = "=0.2.0"
+    version = "=0.2.1"
 
     [dependencies.varisat-dimacs]
     path = "../varisat-dimacs"
-    version = "=0.2.0"
+    version = "=0.2.1"
 
     [dependencies.varisat-internal-proof]
     path = "../varisat-internal-proof"
-    version = "=0.2.0"
+    version = "=0.2.1"
 
     [dependencies.varisat-checker]
     path = "../varisat-checker"
-    version = "=0.2.0"
+    version = "=0.2.1"
 
 [dev-dependencies]
 proptest = "0.9.3"
@@ -49,7 +49,7 @@ env_logger = "0.6.1"
 
     [dev-dependencies.varisat-formula]
     path = "../varisat-formula"
-    version = "=0.2.0"
+    version = "=0.2.1"
     features = ["proptest-strategies", "internal-testing"]
 
 [build-dependencies]

varisat/README.md

@@ -13,8 +13,8 @@ This is the library version. Varisat is also available as a command line solver
 
 ## Documentation
 
-  * [User Manual](https://jix.github.io/varisat/manual/0.2.0/)
-  * [Library API Documentation](https://docs.rs/varisat/0.2.0/varisat/)
+  * [User Manual](https://jix.github.io/varisat/manual/0.2.1/)
+  * [Library API Documentation](https://docs.rs/varisat/0.2.1/varisat/)
 
 ## Developer Documentation
 

varisat/src/lib.rs

@@ -6,7 +6,7 @@
 //!
 //! [cdcl]: https://en.wikipedia.org/wiki/Conflict-Driven_Clause_Learning
 //! [cnf]: https://en.wikipedia.org/wiki/Conjunctive_normal_form
-//! [user manual]: https://jix.github.io/varisat/manual/0.2.0/
+//! [user manual]: https://jix.github.io/varisat/manual/0.2.1/
 
 pub mod config;
 pub mod solver;