Merge pull request #366 from SethTisue/remove-spire-and-breeze

comment out Breeze and Spire
scala · Oct 25, 2016 · 528e3ae · 528e3ae
2 parents da19f34 + 1da42f9
commit 528e3ae
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 24 deletions.
diff --git a/community.dbuild b/community.dbuild
@@ -503,28 +503,30 @@ build += {
     // extra.sbt-version: "0.13.13-RC3"
   }
 
-  ${vars.base} {
-    name: "spire"
-    uri:  ${vars.uris.spire-uri}
-    // TODO: tests crash with:
-    // [info] [error] Could not run test spire.laws.LawTests:
-    // java.lang.ClassFormatError: Duplicate method name&signature in class file spire/std/OrderProductInstances$$anon$228
-    extra.test-tasks: ["compile"]
-    // hopefully avoid intermittent OutOfMemoryErrors during compilation
-    extra.options: ["-Xmx2560m"]
-    extra.projects: ["spireJVM"]  // no Scala.js please
-    // no longer exists in 2.12
-    extra.commands: ${vars.default-commands} [
-      "removeScalacOptions -Yinline-warnings"
-    ]
-  }
-
-  ${vars.base} {
-    name: "breeze"
-    uri:  ${vars.uris.breeze-uri}
-    // failing tests reported upstream at https://github.com/scalanlp/breeze/issues/587
-    extra.test-tasks: ["compile"]
-  }
+// TODO Spire is commented out because of https://github.com/non/spire/issues/592
+// and Breeze because it depends on Spire
+//   ${vars.base} {
+//     name: "spire"
+//     uri:  ${vars.uris.spire-uri}
+//     // TODO: tests crash with:
+//     // [info] [error] Could not run test spire.laws.LawTests:
+//     // java.lang.ClassFormatError: Duplicate method name&signature in class file spire/std/OrderProductInstances$$anon$228
+//     extra.test-tasks: ["compile"]
+//     // hopefully avoid intermittent OutOfMemoryErrors during compilation
+//     extra.options: ["-Xmx2560m"]
+//     extra.projects: ["spireJVM"]  // no Scala.js please
+//     // no longer exists in 2.12
+//     extra.commands: ${vars.default-commands} [
+//       "removeScalacOptions -Yinline-warnings"
+//     ]
+//   }
+//
+//   ${vars.base} {
+//     name: "breeze"
+//     uri:  ${vars.uris.breeze-uri}
+//     // failing tests reported upstream at https://github.com/scalanlp/breeze/issues/587
+//     extra.test-tasks: ["compile"]
+//   }
 
   ${vars.base} {
     name: "specs2"

diff --git a/project-refs.conf b/project-refs.conf
@@ -4,7 +4,7 @@ vars.uris: {
   akka-uri:                     "https://github.com/akka/akka.git#db482180b63028a1b283e06e6c1c7caf10d470f0"
   argonaut-uri:                 "https://github.com/argonaut-io/argonaut.git"
   async-uri:                    "https://github.com/scala/async.git"
-  breeze-uri:                   "https://github.com/scalanlp/breeze.git"
+//  breeze-uri:                   "https://github.com/scalanlp/breeze.git"
   browse-uri:                   "https://github.com/SethTisue/browse.git#topic/2.12-compat"
   catalysts-uri:                "https://github.com/typelevel/catalysts.git"
   cats-uri:                     "https://github.com/SethTisue/cats.git#community-build-2.12"
@@ -58,7 +58,7 @@ vars.uris: {
   slick-uri:                    "https://github.com/slick/slick.git"
   sourcecode-uri:               "https://github.com/lihaoyi/sourcecode.git"
   specs2-uri:                   "https://github.com/etorreborre/specs2.git"
-  spire-uri:                    "https://github.com/non/spire.git"
+//  spire-uri:                    "https://github.com/non/spire.git"
   spray-json-uri:               "https://github.com/spray/spray-json.git"
   spray-json-shapeless-uri:     "https://github.com/fommil/spray-json-shapeless.git"
   ssl-config-uri:               "https://github.com/typesafehub/ssl-config.git"