Update path upper bounds (#159)

This commit is contained in:
Esteban Ibarra 2021-05-31 19:36:23 -05:00 committed by GitHub
parent f5fa8713ad
commit 596f37f68d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 14 additions and 11 deletions

View File

@ -1,3 +1,7 @@
## 0.4.1.4
### Changed
* Bump path version upper constraint to 0.9
## 0.4.1.3
### Changed
* Allow formatting-7.0

View File

@ -1,5 +1,5 @@
name: hapistrano
version: 0.4.1.3
version: 0.4.1.4
synopsis: A deployment library for Haskell applications
description:
.
@ -60,7 +60,7 @@ library
, gitrev >= 1.2 && < 1.4
, mtl >= 2.0 && < 3.0
, stm >= 2.0 && < 2.6
, path >= 0.5 && < 0.8
, path >= 0.5 && < 0.9
, process >= 1.4 && < 1.7
, typed-process >= 0.2 && < 0.3
, time >= 1.5 && < 1.11
@ -83,7 +83,7 @@ executable hap
, gitrev >= 1.2 && < 1.4
, hapistrano
, optparse-applicative >= 0.11 && < 0.17
, path >= 0.5 && < 0.8
, path >= 0.5 && < 0.9
, path-io >= 1.2 && < 1.7
, stm >= 2.4 && < 2.6
, yaml >= 0.8.16 && < 0.12
@ -109,7 +109,7 @@ test-suite test
, hapistrano
, hspec >= 2.0 && < 3.0
, mtl >= 2.0 && < 3.0
, path >= 0.5 && < 0.7.1
, path >= 0.5 && < 0.9
, path-io >= 1.2 && < 1.7
, process >= 1.4 && < 1.7
, QuickCheck >= 2.5.1 && < 3.0

View File

@ -8,7 +8,7 @@ import System.Hapistrano.Types (Shell (..),
Source (..), TargetSystem (..))
import qualified Data.Yaml.Config as Yaml
import Path (mkAbsDir)
import Path (mkAbsDir, Abs, Dir)
import Test.Hspec

View File

@ -13,7 +13,7 @@ import Data.Maybe (mapMaybe)
import Numeric.Natural
import Path
import Path.IO
import System.Directory (listDirectory)
import System.Directory (getCurrentDirectory, listDirectory)
import qualified System.Hapistrano as Hap
import qualified System.Hapistrano.Commands as Hap
import qualified System.Hapistrano.Core as Hap
@ -43,11 +43,10 @@ spec = do
expectedOutput `Hspec.shouldSatisfy` (`isPrefixOf` actualOutput)
describe "readScript" $
it "performs all the necessary normalizations correctly" $ do
#if MIN_VERSION_path_io(1,6,0)
let spath = $(mkRelFile "script/clean-build.sh")
#else
spath <- makeAbsolute $(mkRelFile "script/clean-build.sh")
#endif
spath <- do
currentDirectory <- getCurrentDirectory >>= parseAbsDir
scriptFile <- parseRelFile "script/clean-build.sh"
return (currentDirectory </> scriptFile)
(fmap Hap.unGenericCommand <$> Hap.readScript spath) `Hspec.shouldReturn`
[ "export PATH=~/.cabal/bin:/usr/local/bin:$PATH"
, "cabal sandbox delete"