Hello community, here is the log from the commit of package doctest for openSUSE:Factory checked in at 2017-06-04 01:51:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/doctest (Old) and /work/SRC/openSUSE:Factory/.doctest.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "doctest" Sun Jun 4 01:51:18 2017 rev:3 rq:494129 version:0.11.2 Changes: -------- --- /work/SRC/openSUSE:Factory/doctest/doctest.changes 2017-04-13 10:44:34.705598956 +0200 +++ /work/SRC/openSUSE:Factory/.doctest.new/doctest.changes 2017-06-04 01:51:19.332310685 +0200 @@ -1,0 +2,5 @@ +Mon Apr 24 12:26:27 UTC 2017 - [email protected] + +- Update to version 0.11.2 with cabal2obs. + +------------------------------------------------------------------- Old: ---- doctest-0.11.1.tar.gz New: ---- doctest-0.11.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ doctest.spec ++++++ --- /var/tmp/diff_new_pack.eyrr6J/_old 2017-06-04 01:51:19.848237791 +0200 +++ /var/tmp/diff_new_pack.eyrr6J/_new 2017-06-04 01:51:19.848237791 +0200 @@ -19,7 +19,7 @@ %global pkg_name doctest %bcond_with tests Name: %{pkg_name} -Version: 0.11.1 +Version: 0.11.2 Release: 0 Summary: Test interactive Haskell examples License: MIT @@ -44,6 +44,7 @@ BuildRequires: ghc-HUnit-devel BuildRequires: ghc-QuickCheck-devel BuildRequires: ghc-hspec-devel +BuildRequires: ghc-mockery-devel BuildRequires: ghc-setenv-devel BuildRequires: ghc-silently-devel BuildRequires: ghc-stringbuilder-devel ++++++ doctest-0.11.1.tar.gz -> doctest-0.11.2.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doctest-0.11.1/doctest.cabal new/doctest-0.11.2/doctest.cabal --- old/doctest-0.11.1/doctest.cabal 2017-01-25 04:45:41.000000000 +0100 +++ new/doctest-0.11.2/doctest.cabal 2017-04-18 07:39:08.000000000 +0200 @@ -1,5 +1,5 @@ name: doctest -version: 0.11.1 +version: 0.11.2 synopsis: Test interactive Haskell examples description: The doctest program checks examples in source code comments. It is modeled after doctest for Python @@ -51,7 +51,7 @@ build-depends: base == 4.* , base-compat >= 0.7.0 - , ghc >= 7.0 && < 8.2 + , ghc >= 7.0 && < 8.4 , syb >= 0.3 , code-page >= 0.1 , deepseq @@ -105,6 +105,7 @@ , silently >= 1.2.4 , setenv , with-location + , mockery test-suite doctests main-is: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doctest-0.11.1/src/GhcUtil.hs new/doctest-0.11.2/src/GhcUtil.hs --- old/doctest-0.11.1/src/GhcUtil.hs 2017-01-25 04:45:41.000000000 +0100 +++ new/doctest-0.11.2/src/GhcUtil.hs 2017-04-18 07:39:08.000000000 +0200 @@ -20,7 +20,7 @@ import Data.IORef (writeIORef) #elif __GLASGOW_HASKELL__ < 707 import StaticFlags (saveStaticFlagGlobals, restoreStaticFlagGlobals) -#else +#elif __GLASGOW_HASKELL__ < 801 import StaticFlags (discardStaticFlags) #endif @@ -58,8 +58,10 @@ handleStaticFlags :: [String] -> IO [Located String] #if __GLASGOW_HASKELL__ < 707 handleStaticFlags flags = fst `fmap` parseStaticFlags (map noLoc flags) -#else +#elif __GLASGOW_HASKELL__ < 801 handleStaticFlags flags = return $ map noLoc $ discardStaticFlags flags +#else +handleStaticFlags flags = return $ map noLoc $ flags #endif handleDynamicFlags :: GhcMonad m => [Located String] -> m [String] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doctest-0.11.1/src/Runner/Example.hs new/doctest-0.11.2/src/Runner/Example.hs --- old/doctest-0.11.1/src/Runner/Example.hs 2017-01-25 04:45:41.000000000 +0100 +++ new/doctest-0.11.2/src/Runner/Example.hs 2017-04-18 07:39:08.000000000 +0200 @@ -27,13 +27,12 @@ chunksMatch _ _ = False matches :: ExpectedResult -> [String] -> Bool + matches (ExpectedLine x : xs) (y : ys) = x `chunksMatch` y && xs `matches` ys + matches (WildCardLine : xs) ys | xs `matches` ys = True + matches zs@(WildCardLine : _) (_ : ys) = zs `matches` ys matches [] [] = True matches [] _ = False matches _ [] = False - matches (ExpectedLine x : xs) (y:ys) = - x `chunksMatch` y && xs `matches` ys - matches zs@(WildCardLine : xs) (_:ys) = - xs `matches` ys || zs `matches` ys formatNotEqual :: ExpectedResult -> [String] -> [String]
