diff --git a/CHANGES.md b/CHANGES.md --- a/CHANGES.md +++ b/CHANGES.md @@ -22,7 +22,13 @@ See also the hledger changelog. -# 2024-12-09 1.41 +# 2025-03-07 1.42 + +Fixes + +- Fix a test suite build issue: -threaded is needed in test suite now also. + +# 1.41 2024-12-09 Breaking changes diff --git a/Hledger/Web/Test.hs b/Hledger/Web/Test.hs --- a/Hledger/Web/Test.hs +++ b/Hledger/Web/Test.hs @@ -131,7 +131,7 @@ rawopts = [("forecast","")] iopts = rawOptsToInputOpts d usecolor True $ mkRawOpts rawopts f = "fake" -- need a non-null filename so forecast transactions get index 0 - pj <- readJournal' (T.pack $ unlines -- PARTIAL: readJournal' should not fail + pj <- readJournal'' (T.pack $ unlines -- PARTIAL: readJournal'' should not fail ["~ monthly" ," assets 10" ," income" diff --git a/Hledger/Web/Widget/Common.hs b/Hledger/Web/Widget/Common.hs --- a/Hledger/Web/Widget/Common.hs +++ b/Hledger/Web/Widget/Common.hs @@ -66,7 +66,7 @@ -- formatdirectivep, #1194) writeFileWithBackupIfChanged require them. -- XXX klunky. Any equivalent of "hSetNewlineMode h universalNewlineMode" for form posts ? let t' = T.replace "\r" "" t - j <- readJournal definputopts (Just f) t' + j <- readJournal definputopts (Just f) =<< liftIO (inputToHandle t') _ <- liftIO $ j `seq` writeFileWithBackupIfChanged f t' -- Only write backup if the journal didn't error return () diff --git a/hledger-web.1 b/hledger-web.1 --- a/hledger-web.1 +++ b/hledger-web.1 @@ -1,5 +1,5 @@ -.TH "HLEDGER\-WEB" "1" "October 2024" "hledger-web-1.41 " "hledger User Manuals" +.TH "HLEDGER\-WEB" "1" "March 2025" "hledger-web-1.42 " "hledger User Manuals" @@ -17,7 +17,7 @@ .PD \f[CR]hledger web \-\- [OPTS] [QUERY]\f[R] .SH DESCRIPTION -This manual is for hledger\[aq]s web interface, version 1.41. +This manual is for hledger\[aq]s web interface, version 1.42. See also the hledger manual for common concepts and file formats. .PP hledger is a robust, user\-friendly, cross\-platform set of programs for diff --git a/hledger-web.cabal b/hledger-web.cabal --- a/hledger-web.cabal +++ b/hledger-web.cabal @@ -5,7 +5,7 @@ -- see: https://github.com/sol/hpack name: hledger-web -version: 1.41 +version: 1.42 synopsis: Web user interface for the hledger accounting system description: A simple web user interface for the hledger accounting system, providing a more modern UI than the command-line or terminal interfaces. @@ -156,7 +156,7 @@ hs-source-dirs: ./ ghc-options: -Wall -Wredundant-constraints -Wincomplete-record-updates -Wincomplete-uni-patterns - cpp-options: -DVERSION="1.41" + cpp-options: -DVERSION="1.42" build-depends: Decimal >=0.5.1 , aeson >=1 && <2.3 @@ -178,8 +178,8 @@ , filepath , githash >=0.1.6.2 , hjsmin - , hledger ==1.41.* - , hledger-lib ==1.41.* + , hledger ==1.42.* + , hledger-lib ==1.42.* , hspec , http-client , http-conduit @@ -208,6 +208,8 @@ , yesod-static >=1.4 && <1.7 , yesod-test default-language: Haskell2010 + if flag(threaded) + ghc-options: -threaded if (flag(dev)) || (flag(library-only)) cpp-options: -DDEVELOPMENT if flag(dev) @@ -221,13 +223,15 @@ Paths_hledger_web hs-source-dirs: app - ghc-options: -Wall -Wredundant-constraints -Wincomplete-record-updates -Wincomplete-uni-patterns - cpp-options: -DVERSION="1.41" + ghc-options: -Wall -Wredundant-constraints -Wincomplete-record-updates -Wincomplete-uni-patterns -with-rtsopts=-T + cpp-options: -DVERSION="1.42" build-depends: base >=4.14 && <4.21 , base-compat >=0.14.0 , hledger-web default-language: Haskell2010 + if flag(threaded) + ghc-options: -threaded if (flag(dev)) || (flag(library-only)) cpp-options: -DDEVELOPMENT if flag(dev) @@ -236,8 +240,6 @@ cpp-options: -DDEBUG if flag(library-only) buildable: False - if flag(threaded) - ghc-options: -threaded -with-rtsopts=-T test-suite test type: exitcode-stdio-1.0 @@ -245,12 +247,14 @@ hs-source-dirs: test ghc-options: -Wall -Wredundant-constraints -Wincomplete-record-updates -Wincomplete-uni-patterns - cpp-options: -DVERSION="1.41" + cpp-options: -DVERSION="1.42" build-depends: base >=4.14 && <4.21 , base-compat >=0.14.0 , hledger-web default-language: Haskell2010 + if flag(threaded) + ghc-options: -threaded if (flag(dev)) || (flag(library-only)) cpp-options: -DDEVELOPMENT if flag(dev) diff --git a/hledger-web.info b/hledger-web.info --- a/hledger-web.info +++ b/hledger-web.info @@ -1,4 +1,4 @@ -This is hledger-web.info, produced by makeinfo version 7.1.1 from stdin. +This is hledger-web.info, produced by makeinfo version 7.2 from stdin. INFO-DIR-SECTION User Applications START-INFO-DIR-ENTRY @@ -18,7 +18,7 @@ or 'hledger web -- [OPTS] [QUERY]' - This manual is for hledger's web interface, version 1.41. See also + This manual is for hledger's web interface, version 1.42. See also the hledger manual for common concepts and file formats. hledger is a robust, user-friendly, cross-platform set of programs @@ -528,16 +528,16 @@  Tag Table: -Node: Top225 -Node: OPTIONS2568 -Node: PERMISSIONS11257 -Node: EDITING UPLOADING DOWNLOADING12608 -Node: RELOADING13623 -Node: JSON API14190 -Node: DEBUG OUTPUT19839 -Node: Debug output19991 -Node: ENVIRONMENT20509 -Node: BUGS20745 +Node: Top223 +Node: OPTIONS2566 +Node: PERMISSIONS11255 +Node: EDITING UPLOADING DOWNLOADING12606 +Node: RELOADING13621 +Node: JSON API14188 +Node: DEBUG OUTPUT19837 +Node: Debug output19989 +Node: ENVIRONMENT20507 +Node: BUGS20743  End Tag Table diff --git a/hledger-web.txt b/hledger-web.txt --- a/hledger-web.txt +++ b/hledger-web.txt @@ -11,7 +11,7 @@ hledger web -- [OPTS] [QUERY] DESCRIPTION - This manual is for hledger's web interface, version 1.41. See also the + This manual is for hledger's web interface, version 1.42. See also the hledger manual for common concepts and file formats. hledger is a robust, user-friendly, cross-platform set of programs for @@ -480,4 +480,4 @@ SEE ALSO hledger(1), hledger-ui(1), hledger-web(1), ledger(1) -hledger-web-1.41 October 2024 HLEDGER-WEB(1) +hledger-web-1.42 March 2025 HLEDGER-WEB(1)