From d2e8ac3a2a0944906f065019ce07a361765a9d0d Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Thu, 10 Sep 2020 15:09:26 +0200 Subject: [PATCH] chore: bump zip-stream --- stack.yaml | 2 +- stack.yaml.lock | 6 +++--- test/Handler/Utils/ZipSpec.hs | 6 ------ 3 files changed, 4 insertions(+), 10 deletions(-) diff --git a/stack.yaml b/stack.yaml index 995468114..fbbcd4aaa 100644 --- a/stack.yaml +++ b/stack.yaml @@ -54,7 +54,7 @@ extra-deps: - fastcdc - git: git@gitlab2.rz.ifi.lmu.de:uni2work/zip-stream.git - commit: 094c70935f1d92016144cd4dfc0a99b831c56f25 + commit: 843683d024f767de236f74d24a3348f69181a720 - generic-lens-1.2.0.0@sha256:b19e7970c93743a46bc3702331512a96d163de4356472f2d51a2945887aefe8c,6524 # manual downgrade; won't compile with >=2.0.0.0 diff --git a/stack.yaml.lock b/stack.yaml.lock index ba4ec0b2c..053ebc2d9 100644 --- a/stack.yaml.lock +++ b/stack.yaml.lock @@ -228,11 +228,11 @@ packages: git: git@gitlab2.rz.ifi.lmu.de:uni2work/zip-stream.git pantry-tree: size: 812 - sha256: e191cb4e12ae1f056acdcf0393ff4dcb566b3ab82305aa14d6d4e35f49a64c96 - commit: 094c70935f1d92016144cd4dfc0a99b831c56f25 + sha256: 0da8bc38d73034962d2e2d1a7586b6dee848a629319fce9cbbf578348c61118c + commit: 843683d024f767de236f74d24a3348f69181a720 original: git: git@gitlab2.rz.ifi.lmu.de:uni2work/zip-stream.git - commit: 094c70935f1d92016144cd4dfc0a99b831c56f25 + commit: 843683d024f767de236f74d24a3348f69181a720 - completed: hackage: generic-lens-1.2.0.0@sha256:b19e7970c93743a46bc3702331512a96d163de4356472f2d51a2945887aefe8c,6524 pantry-tree: diff --git a/test/Handler/Utils/ZipSpec.hs b/test/Handler/Utils/ZipSpec.hs index 798cd049d..7c33dea28 100644 --- a/test/Handler/Utils/ZipSpec.hs +++ b/test/Handler/Utils/ZipSpec.hs @@ -1,5 +1,3 @@ -{-# OPTIONS_GHC -Wno-error=deprecations #-} - module Handler.Utils.ZipSpec where import TestImport @@ -70,10 +68,6 @@ spec = describe "Zip file handling" $ do acceptableTimeDifference t1 t2 = abs (diffUTCTime t1 t2) <= 2 forM_ (zipFiles `zip` zipFiles') $ \(file, file') -> do - when (((/=) `on` acceptableFilenameChanges) file' file) $ do - traceM $ show (fileTitle file, fileTitle file') - traceM $ show (acceptableFilenameChanges file, acceptableFilenameChanges file') - traceM $ show (isNothing $ fileContent file, isNothing $ fileContent file') (shouldBe `on` acceptableFilenameChanges) file' file (fileModified file', fileModified file) `shouldSatisfy` uncurry acceptableTimeDifference (view _pureFileContent file' :: Maybe ByteString) `shouldBe` (view _pureFileContent file)