hledger-lib 1.16 → 1.16.1

raw patch · 19 files changed

+208/−193 lines, 19 filesdep −mtl-compatdep ~mtlPVP ok

version bump matches the API change (PVP)

Dependencies removed: mtl-compat

Dependency ranges changed: mtl

API changes (from Hackage documentation)

Files

• CHANGES.md +8/−0
• Hledger/Data/Dates.hs +2/−0
• Hledger/Read.hs +3/−1
• Hledger/Read/Common.hs +2/−0
• Hledger/Read/CsvReader.hs +2/−0
• Hledger/Read/JournalReader.hs +2/−0
• hledger-lib.cabal +5/−8
• hledger_csv.5 +1/−1
• hledger_csv.info +54/−54
• hledger_csv.txt +1/−1
• hledger_journal.5 +1/−1
• hledger_journal.info +116/−116
• hledger_journal.txt +1/−1
• hledger_timeclock.5 +1/−1
• hledger_timeclock.info +2/−2
• hledger_timeclock.txt +1/−1
• hledger_timedot.5 +1/−1
• hledger_timedot.info +4/−4
• hledger_timedot.txt +1/−1

@@ -1,6 +1,14 @@ Internal/api/developer-ish changes in the hledger-lib (and hledger) packages. For user-visible changes, see the hledger package changelog. +# 1.16.1 2019-12-03++++- Drop unnecessary mtl-compat dependency++- Fix building with GHC 8.0, 8.2+ # 1.16 2019-12-01  - drop support for GHC 7.10, due to MonadFail hassles in JournalReader.hs

@@ -75,6 +75,8 @@ ) where +import Prelude ()+import "base-compat-batteries" Prelude.Compat hiding (fail) import qualified "base-compat-batteries" Control.Monad.Fail.Compat as Fail (MonadFail, fail) import Control.Applicative.Permutations import Control.Monad (unless)

@@ -7,6 +7,7 @@ -}  {-# LANGUAGE ScopedTypeVariables, OverloadedStrings #-}+{-# LANGUAGE PackageImports #-}  module Hledger.Read ( @@ -36,7 +37,8 @@  import Control.Arrow (right) import qualified Control.Exception as C-import Control.Monad.Except+import Control.Monad (when)+import "mtl" Control.Monad.Except (runExceptT) import Data.Default import Data.List import Data.Maybe

@@ -100,6 +100,8 @@ ) where --- * imports+import Prelude ()+import "base-compat-batteries" Prelude.Compat hiding (fail, readFile) import qualified "base-compat-batteries" Control.Monad.Fail.Compat as Fail (fail) import Control.Monad.Except (ExceptT(..), runExceptT, throwError) import Control.Monad.State.Strict hiding (fail)

@@ -30,6 +30,8 @@   tests_CsvReader, ) where+import Prelude ()+import "base-compat-batteries" Prelude.Compat hiding (fail) import qualified "base-compat-batteries" Control.Monad.Fail.Compat as Fail (fail) import Control.Exception          (IOException, handle, throw) import Control.Monad              (liftM, unless, when)

@@ -63,6 +63,8 @@ ) where --- * imports+-- import qualified Prelude (fail)+-- import "base-compat-batteries" Prelude.Compat hiding (fail, readFile) import qualified "base-compat-batteries" Control.Monad.Fail.Compat as Fail (fail) import qualified Control.Exception as C import Control.Monad (forM_, when, void)

@@ -4,10 +4,10 @@ -- -- see: https://github.com/sol/hpack ----- hash: 3228f8dbb178d427e76291b5e60b3dee1eb4d2e5f9ab803ce8e3fe85e79f25ad+-- hash: f67238ad457aa23ba68686a932bc3f37f30d6f3f9f4514468e35e960ab81fe1b  name:           hledger-lib-version:        1.16+version:        1.16.1 synopsis:       Core data types, parsers and functionality for the hledger accounting tools description:    This is a reusable library containing hledger's core functionality.                 .@@ -127,8 +127,7 @@     , filepath     , hashtables >=1.2.3.1     , megaparsec >=7.0.0 && <8-    , mtl-    , mtl-compat+    , mtl >=2.2.1     , old-time     , parsec >=3     , parser-combinators >=0.4.0@@ -179,8 +178,7 @@     , filepath     , hashtables >=1.2.3.1     , megaparsec >=7.0.0 && <8-    , mtl-    , mtl-compat+    , mtl >=2.2.1     , old-time     , parsec >=3     , parser-combinators >=0.4.0@@ -234,8 +232,7 @@     , hashtables >=1.2.3.1     , hledger-lib     , megaparsec >=7.0.0 && <8-    , mtl-    , mtl-compat+    , mtl >=2.2.1     , old-time     , parsec >=3     , parser-combinators >=0.4.0

@@ -1,6 +1,6 @@ .\"t -.TH "hledger_csv" "5" "December 2019" "hledger 1.16" "hledger User Manuals"+.TH "hledger_csv" "5" "December 2019" "hledger 1.16.1" "hledger User Manuals"   

@@ -3,8 +3,8 @@  File: hledger_csv.info,  Node: Top,  Next: EXAMPLES,  Up: (dir) -hledger_csv(5) hledger 1.16-***************************+hledger_csv(5) hledger 1.16.1+*****************************  hledger can read CSV (comma-separated value, or character-separated value) files as if they were journal files, automatically converting@@ -888,57 +888,57 @@  Tag Table: Node: Top72-Node: EXAMPLES1829-Ref: #examples1935-Node: Basic2143-Ref: #basic2243-Node: Bank of Ireland2785-Ref: #bank-of-ireland2920-Node: Amazon4383-Ref: #amazon4501-Node: Paypal6434-Ref: #paypal6528-Node: CSV RULES14411-Ref: #csv-rules14520-Node: skip14765-Ref: #skip14858-Node: fields15233-Ref: #fields15355-Node: Transaction field names16422-Ref: #transaction-field-names16582-Node: Posting field names16693-Ref: #posting-field-names16845-Node: field assignment18077-Ref: #field-assignment18213-Node: if19031-Ref: #if19140-Node: end20856-Ref: #end20962-Node: date-format21186-Ref: #date-format21318-Node: newest-first22067-Ref: #newest-first22205-Node: include22888-Ref: #include22996-Node: TIPS23440-Ref: #tips23522-Node: Valid CSV23771-Ref: #valid-csv23890-Node: Other separator characters24082-Ref: #other-separator-characters24270-Node: Reading multiple CSV files24599-Ref: #reading-multiple-csv-files24796-Node: Valid transactions25037-Ref: #valid-transactions25215-Node: Deduplicating importing25843-Ref: #deduplicating-importing26022-Node: Setting amounts27055-Ref: #setting-amounts27224-Node: Setting currency/commodity28210-Ref: #setting-currencycommodity28402-Node: Referencing other fields29205-Ref: #referencing-other-fields29405-Node: How CSV rules are evaluated30302-Ref: #how-csv-rules-are-evaluated30473+Node: EXAMPLES1833+Ref: #examples1939+Node: Basic2147+Ref: #basic2247+Node: Bank of Ireland2789+Ref: #bank-of-ireland2924+Node: Amazon4387+Ref: #amazon4505+Node: Paypal6438+Ref: #paypal6532+Node: CSV RULES14415+Ref: #csv-rules14524+Node: skip14769+Ref: #skip14862+Node: fields15237+Ref: #fields15359+Node: Transaction field names16426+Ref: #transaction-field-names16586+Node: Posting field names16697+Ref: #posting-field-names16849+Node: field assignment18081+Ref: #field-assignment18217+Node: if19035+Ref: #if19144+Node: end20860+Ref: #end20966+Node: date-format21190+Ref: #date-format21322+Node: newest-first22071+Ref: #newest-first22209+Node: include22892+Ref: #include23000+Node: TIPS23444+Ref: #tips23526+Node: Valid CSV23775+Ref: #valid-csv23894+Node: Other separator characters24086+Ref: #other-separator-characters24274+Node: Reading multiple CSV files24603+Ref: #reading-multiple-csv-files24800+Node: Valid transactions25041+Ref: #valid-transactions25219+Node: Deduplicating importing25847+Ref: #deduplicating-importing26026+Node: Setting amounts27059+Ref: #setting-amounts27228+Node: Setting currency/commodity28214+Ref: #setting-currencycommodity28406+Node: Referencing other fields29209+Ref: #referencing-other-fields29409+Node: How CSV rules are evaluated30306+Ref: #how-csv-rules-are-evaluated30477  End Tag Table

@@ -760,4 +760,4 @@   -hledger 1.16                     December 2019                  hledger_csv(5)+hledger 1.16.1                   December 2019                  hledger_csv(5)

@@ -1,6 +1,6 @@ .\"t -.TH "hledger_journal" "5" "December 2019" "hledger 1.16" "hledger User Manuals"+.TH "hledger_journal" "5" "December 2019" "hledger 1.16.1" "hledger User Manuals"   

@@ -4,8 +4,8 @@  File: hledger_journal.info,  Node: Top,  Next: FILE FORMAT,  Up: (dir) -hledger_journal(5) hledger 1.16-*******************************+hledger_journal(5) hledger 1.16.1+*********************************  hledger's usual data source is a plain text file containing journal entries in hledger journal format.  This file represents a standard@@ -1747,119 +1747,119 @@  Tag Table: Node: Top76-Node: FILE FORMAT2352-Ref: #file-format2476-Node: Transactions2779-Ref: #transactions2900-Node: Postings3584-Ref: #postings3711-Node: Dates4706-Ref: #dates4821-Node: Simple dates4886-Ref: #simple-dates5012-Node: Secondary dates5378-Ref: #secondary-dates5532-Node: Posting dates7095-Ref: #posting-dates7224-Node: Status8596-Ref: #status8716-Node: Description10424-Ref: #description10562-Node: Payee and note10882-Ref: #payee-and-note10996-Node: Account names11331-Ref: #account-names11474-Node: Amounts11961-Ref: #amounts12097-Node: Digit group marks13030-Ref: #digit-group-marks13179-Node: Amount display format14117-Ref: #amount-display-format14274-Node: Virtual Postings15299-Ref: #virtual-postings15458-Node: Balance Assertions16678-Ref: #balance-assertions16853-Node: Assertions and ordering17812-Ref: #assertions-and-ordering17998-Node: Assertions and included files18698-Ref: #assertions-and-included-files18939-Node: Assertions and multiple -f options19272-Ref: #assertions-and-multiple--f-options19526-Node: Assertions and commodities19658-Ref: #assertions-and-commodities19888-Node: Assertions and prices21044-Ref: #assertions-and-prices21256-Node: Assertions and subaccounts21696-Ref: #assertions-and-subaccounts21923-Node: Assertions and virtual postings22247-Ref: #assertions-and-virtual-postings22487-Node: Assertions and precision22629-Ref: #assertions-and-precision22820-Node: Balance Assignments23087-Ref: #balance-assignments23268-Node: Balance assignments and prices24433-Ref: #balance-assignments-and-prices24605-Node: Transaction prices24829-Ref: #transaction-prices24998-Node: Comments27264-Ref: #comments27398-Node: Tags28568-Ref: #tags28686-Node: Directives30079-Ref: #directives30222-Node: Comment blocks35830-Ref: #comment-blocks35975-Node: Including other files36151-Ref: #including-other-files36331-Node: Default year36739-Ref: #default-year36908-Node: Declaring commodities37315-Ref: #declaring-commodities37498-Node: Default commodity39159-Ref: #default-commodity39335-Node: Market prices39969-Ref: #market-prices40134-Node: Declaring accounts40975-Ref: #declaring-accounts41151-Node: Account comments42076-Ref: #account-comments42239-Node: Account subdirectives42634-Ref: #account-subdirectives42829-Node: Account types43142-Ref: #account-types43326-Node: Account display order44968-Ref: #account-display-order45138-Node: Rewriting accounts46267-Ref: #rewriting-accounts46452-Node: Basic aliases47188-Ref: #basic-aliases47334-Node: Regex aliases48038-Ref: #regex-aliases48210-Node: Combining aliases48928-Ref: #combining-aliases49106-Node: end aliases50382-Ref: #end-aliases50530-Node: Default parent account50631-Ref: #default-parent-account50797-Node: Periodic transactions51681-Ref: #periodic-transactions51879-Node: Periodic rule syntax53751-Ref: #periodic-rule-syntax53957-Node: Two spaces between period expression and description!54661-Ref: #two-spaces-between-period-expression-and-description54980-Node: Forecasting with periodic transactions55664-Ref: #forecasting-with-periodic-transactions55969-Node: Budgeting with periodic transactions57995-Ref: #budgeting-with-periodic-transactions58234-Node: Auto postings / transaction modifiers58683-Ref: #auto-postings-transaction-modifiers58894-Node: Auto postings and dates61123-Ref: #auto-postings-and-dates61380-Node: Auto postings and transaction balancing / inferred amounts / balance assertions61555-Ref: #auto-postings-and-transaction-balancing-inferred-amounts-balance-assertions61930-Node: Auto posting tags62308-Ref: #auto-posting-tags62547-Node: EDITOR SUPPORT63212-Ref: #editor-support63330+Node: FILE FORMAT2356+Ref: #file-format2480+Node: Transactions2783+Ref: #transactions2904+Node: Postings3588+Ref: #postings3715+Node: Dates4710+Ref: #dates4825+Node: Simple dates4890+Ref: #simple-dates5016+Node: Secondary dates5382+Ref: #secondary-dates5536+Node: Posting dates7099+Ref: #posting-dates7228+Node: Status8600+Ref: #status8720+Node: Description10428+Ref: #description10566+Node: Payee and note10886+Ref: #payee-and-note11000+Node: Account names11335+Ref: #account-names11478+Node: Amounts11965+Ref: #amounts12101+Node: Digit group marks13034+Ref: #digit-group-marks13183+Node: Amount display format14121+Ref: #amount-display-format14278+Node: Virtual Postings15303+Ref: #virtual-postings15462+Node: Balance Assertions16682+Ref: #balance-assertions16857+Node: Assertions and ordering17816+Ref: #assertions-and-ordering18002+Node: Assertions and included files18702+Ref: #assertions-and-included-files18943+Node: Assertions and multiple -f options19276+Ref: #assertions-and-multiple--f-options19530+Node: Assertions and commodities19662+Ref: #assertions-and-commodities19892+Node: Assertions and prices21048+Ref: #assertions-and-prices21260+Node: Assertions and subaccounts21700+Ref: #assertions-and-subaccounts21927+Node: Assertions and virtual postings22251+Ref: #assertions-and-virtual-postings22491+Node: Assertions and precision22633+Ref: #assertions-and-precision22824+Node: Balance Assignments23091+Ref: #balance-assignments23272+Node: Balance assignments and prices24437+Ref: #balance-assignments-and-prices24609+Node: Transaction prices24833+Ref: #transaction-prices25002+Node: Comments27268+Ref: #comments27402+Node: Tags28572+Ref: #tags28690+Node: Directives30083+Ref: #directives30226+Node: Comment blocks35834+Ref: #comment-blocks35979+Node: Including other files36155+Ref: #including-other-files36335+Node: Default year36743+Ref: #default-year36912+Node: Declaring commodities37319+Ref: #declaring-commodities37502+Node: Default commodity39163+Ref: #default-commodity39339+Node: Market prices39973+Ref: #market-prices40138+Node: Declaring accounts40979+Ref: #declaring-accounts41155+Node: Account comments42080+Ref: #account-comments42243+Node: Account subdirectives42638+Ref: #account-subdirectives42833+Node: Account types43146+Ref: #account-types43330+Node: Account display order44972+Ref: #account-display-order45142+Node: Rewriting accounts46271+Ref: #rewriting-accounts46456+Node: Basic aliases47192+Ref: #basic-aliases47338+Node: Regex aliases48042+Ref: #regex-aliases48214+Node: Combining aliases48932+Ref: #combining-aliases49110+Node: end aliases50386+Ref: #end-aliases50534+Node: Default parent account50635+Ref: #default-parent-account50801+Node: Periodic transactions51685+Ref: #periodic-transactions51883+Node: Periodic rule syntax53755+Ref: #periodic-rule-syntax53961+Node: Two spaces between period expression and description!54665+Ref: #two-spaces-between-period-expression-and-description54984+Node: Forecasting with periodic transactions55668+Ref: #forecasting-with-periodic-transactions55973+Node: Budgeting with periodic transactions57999+Ref: #budgeting-with-periodic-transactions58238+Node: Auto postings / transaction modifiers58687+Ref: #auto-postings-transaction-modifiers58898+Node: Auto postings and dates61127+Ref: #auto-postings-and-dates61384+Node: Auto postings and transaction balancing / inferred amounts / balance assertions61559+Ref: #auto-postings-and-transaction-balancing-inferred-amounts-balance-assertions61934+Node: Auto posting tags62312+Ref: #auto-posting-tags62551+Node: EDITOR SUPPORT63216+Ref: #editor-support63334  End Tag Table

@@ -1414,4 +1414,4 @@   -hledger 1.16                     December 2019              hledger_journal(5)+hledger 1.16.1                   December 2019              hledger_journal(5)

@@ -1,5 +1,5 @@ -.TH "hledger_timeclock" "5" "December 2019" "hledger 1.16" "hledger User Manuals"+.TH "hledger_timeclock" "5" "December 2019" "hledger 1.16.1" "hledger User Manuals"   

@@ -4,8 +4,8 @@  File: hledger_timeclock.info,  Node: Top,  Up: (dir) -hledger_timeclock(5) hledger 1.16-*********************************+hledger_timeclock(5) hledger 1.16.1+***********************************  hledger can read timeclock files.  As with Ledger, these are (a subset of) timeclock.el's format, containing clock-in and clock-out entries as

@@ -78,4 +78,4 @@   -hledger 1.16                     December 2019            hledger_timeclock(5)+hledger 1.16.1                   December 2019            hledger_timeclock(5)

@@ -1,5 +1,5 @@ -.TH "hledger_timedot" "5" "December 2019" "hledger 1.16" "hledger User Manuals"+.TH "hledger_timedot" "5" "December 2019" "hledger 1.16.1" "hledger User Manuals"   

@@ -4,8 +4,8 @@  File: hledger_timedot.info,  Node: Top,  Next: FILE FORMAT,  Up: (dir) -hledger_timedot(5) hledger 1.16-*******************************+hledger_timedot(5) hledger 1.16.1+*********************************  Timedot is a plain text format for logging dated, categorised quantities (of time, usually), supported by hledger.  It is convenient for@@ -111,7 +111,7 @@  Tag Table: Node: Top76-Node: FILE FORMAT808-Ref: #file-format909+Node: FILE FORMAT812+Ref: #file-format913  End Tag Table

@@ -124,4 +124,4 @@   -hledger 1.16                     December 2019              hledger_timedot(5)+hledger 1.16.1                   December 2019              hledger_timedot(5)