Travis fixes 10

989625b8 · Andrew Gibiansky · 654369fd · 989625b8 · 989625b8 · 989625b8
Commit 989625b8 authored Jun 08, 2016 by Andrew Gibiansky
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 233 additions and 241 deletions

.travis.yml .travis.yml +2 -0

Evaluate.hs src/IHaskell/Eval/Evaluate.hs +0 -1

Hspec.hs src/tests/Hspec.hs +229 -240

stack.yaml stack.yaml +2 -0

No files found.
--- a/.travis.yml
+++ b/.travis.yml
@@ -26,6 +26,7 @@ addons:
    packages:
      - libmagic-dev
      - libgmp-dev
+      - python3

 before_install:
    # Download and unpack the stack executable
@@ -58,3 +59,4 @@ script:
  - export LD_LIBRARY_PATH=$HOME/zeromq/lib
  - stack build --resolver=$RESOLVER
  - stack test --resolver=$RESOLVER
+  - ./verify_formatting.py
--- a/src/IHaskell/Eval/Evaluate.hs
+++ b/src/IHaskell/Eval/Evaluate.hs
@@ -147,7 +147,6 @@ ihaskellGlobalImports =
  , "import qualified IHaskell.Eval.Widgets"
  ]

-
 -- | Evaluation function for testing.
 testInterpret :: Interpreter a -> IO a
 testInterpret val = interpret GHC.Paths.libdir False (const val)

--- a/src/tests/Hspec.hs
+++ b/src/tests/Hspec.hs
--- a/stack.yaml
+++ b/stack.yaml
@@ -4,3 +4,5 @@ packages:
 - './ipython-kernel'
 - './ghc-parser'
 resolver: lts-6.2
+extra-deps:
+    - system-argv0-0.1.1 # Necessary for LTS 2.22 (GHC 7.8)