mirror of
https://github.com/simonmichael/hledger.git
synced 2024-09-21 03:08:10 +03:00
Fix rebase
This commit is contained in:
parent
1a24ddfa54
commit
af0719a33b
@ -36,7 +36,7 @@ import Control.Exception hiding (try)
|
|||||||
import Control.Monad
|
import Control.Monad
|
||||||
import Control.Monad.Except
|
import Control.Monad.Except
|
||||||
import Control.Monad.State.Strict (StateT, get, modify', evalStateT)
|
import Control.Monad.State.Strict (StateT, get, modify', evalStateT)
|
||||||
import Data.Char (toLower, isDigit, isSpace)
|
import Data.Char (toLower, isDigit, isSpace, ord)
|
||||||
import "base-compat-batteries" Data.List.Compat
|
import "base-compat-batteries" Data.List.Compat
|
||||||
import Data.List.NonEmpty (fromList)
|
import Data.List.NonEmpty (fromList)
|
||||||
import Data.Maybe
|
import Data.Maybe
|
||||||
@ -56,9 +56,7 @@ import System.Locale (defaultTimeLocale)
|
|||||||
import Safe
|
import Safe
|
||||||
import System.Directory (doesFileExist)
|
import System.Directory (doesFileExist)
|
||||||
import System.FilePath
|
import System.FilePath
|
||||||
import Text.CSV (parseCSV, CSV)
|
|
||||||
import qualified Data.Csv as DSCV
|
import qualified Data.Csv as DSCV
|
||||||
import Test.HUnit hiding (State)
|
|
||||||
import qualified Data.Csv as Cassava
|
import qualified Data.Csv as Cassava
|
||||||
import qualified Data.Csv.Parser.Megaparsec as CassavaMP
|
import qualified Data.Csv.Parser.Megaparsec as CassavaMP
|
||||||
import qualified Data.ByteString as B
|
import qualified Data.ByteString as B
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
--
|
--
|
||||||
-- see: https://github.com/sol/hpack
|
-- see: https://github.com/sol/hpack
|
||||||
--
|
--
|
||||||
-- hash: a597a2ab01a2e6ae417661916f3a2565a20b35b7a6160a2c2b9c1faa8df71fbb
|
-- hash: 7d48cc897fb582a2600c3f3405a5463b853316f4a9fae370f0a74c46576a6198
|
||||||
|
|
||||||
name: hledger-lib
|
name: hledger-lib
|
||||||
version: 1.10.99
|
version: 1.10.99
|
||||||
@ -110,6 +110,7 @@ library
|
|||||||
, base-compat-batteries >=0.10.1 && <0.11
|
, base-compat-batteries >=0.10.1 && <0.11
|
||||||
, blaze-markup >=0.5.1
|
, blaze-markup >=0.5.1
|
||||||
, bytestring
|
, bytestring
|
||||||
|
, call-stack
|
||||||
, cassava
|
, cassava
|
||||||
, cassava-megaparsec
|
, cassava-megaparsec
|
||||||
, cmdargs >=0.10
|
, cmdargs >=0.10
|
||||||
@ -208,6 +209,7 @@ test-suite doctests
|
|||||||
, base-compat-batteries >=0.10.1 && <0.11
|
, base-compat-batteries >=0.10.1 && <0.11
|
||||||
, blaze-markup >=0.5.1
|
, blaze-markup >=0.5.1
|
||||||
, bytestring
|
, bytestring
|
||||||
|
, call-stack
|
||||||
, cassava
|
, cassava
|
||||||
, cassava-megaparsec
|
, cassava-megaparsec
|
||||||
, cmdargs >=0.10
|
, cmdargs >=0.10
|
||||||
@ -307,6 +309,7 @@ test-suite easytests
|
|||||||
, base-compat-batteries >=0.10.1 && <0.11
|
, base-compat-batteries >=0.10.1 && <0.11
|
||||||
, blaze-markup >=0.5.1
|
, blaze-markup >=0.5.1
|
||||||
, bytestring
|
, bytestring
|
||||||
|
, call-stack
|
||||||
, cassava
|
, cassava
|
||||||
, cassava-megaparsec
|
, cassava-megaparsec
|
||||||
, cmdargs >=0.10
|
, cmdargs >=0.10
|
||||||
@ -339,104 +342,3 @@ test-suite easytests
|
|||||||
build-depends:
|
build-depends:
|
||||||
semigroups ==0.18.*
|
semigroups ==0.18.*
|
||||||
default-language: Haskell2010
|
default-language: Haskell2010
|
||||||
|
|
||||||
test-suite hunittests
|
|
||||||
type: exitcode-stdio-1.0
|
|
||||||
main-is: hunittests.hs
|
|
||||||
other-modules:
|
|
||||||
Hledger
|
|
||||||
Hledger.Data
|
|
||||||
Hledger.Data.Account
|
|
||||||
Hledger.Data.AccountName
|
|
||||||
Hledger.Data.Amount
|
|
||||||
Hledger.Data.Commodity
|
|
||||||
Hledger.Data.Dates
|
|
||||||
Hledger.Data.Journal
|
|
||||||
Hledger.Data.Ledger
|
|
||||||
Hledger.Data.MarketPrice
|
|
||||||
Hledger.Data.Period
|
|
||||||
Hledger.Data.PeriodicTransaction
|
|
||||||
Hledger.Data.Posting
|
|
||||||
Hledger.Data.RawOptions
|
|
||||||
Hledger.Data.StringFormat
|
|
||||||
Hledger.Data.Timeclock
|
|
||||||
Hledger.Data.Transaction
|
|
||||||
Hledger.Data.TransactionModifier
|
|
||||||
Hledger.Data.Types
|
|
||||||
Hledger.Query
|
|
||||||
Hledger.Read
|
|
||||||
Hledger.Read.Common
|
|
||||||
Hledger.Read.CsvReader
|
|
||||||
Hledger.Read.JournalReader
|
|
||||||
Hledger.Read.TimeclockReader
|
|
||||||
Hledger.Read.TimedotReader
|
|
||||||
Hledger.Reports
|
|
||||||
Hledger.Reports.BalanceHistoryReport
|
|
||||||
Hledger.Reports.BalanceReport
|
|
||||||
Hledger.Reports.BudgetReport
|
|
||||||
Hledger.Reports.EntriesReport
|
|
||||||
Hledger.Reports.MultiBalanceReports
|
|
||||||
Hledger.Reports.PostingsReport
|
|
||||||
Hledger.Reports.ReportOptions
|
|
||||||
Hledger.Reports.ReportTypes
|
|
||||||
Hledger.Reports.TransactionsReports
|
|
||||||
Hledger.Utils
|
|
||||||
Hledger.Utils.Color
|
|
||||||
Hledger.Utils.Debug
|
|
||||||
Hledger.Utils.Parse
|
|
||||||
Hledger.Utils.Regex
|
|
||||||
Hledger.Utils.String
|
|
||||||
Hledger.Utils.Test
|
|
||||||
Hledger.Utils.Text
|
|
||||||
Hledger.Utils.Tree
|
|
||||||
Hledger.Utils.UTF8IOCompat
|
|
||||||
Text.Megaparsec.Custom
|
|
||||||
Text.Tabular.AsciiWide
|
|
||||||
Paths_hledger_lib
|
|
||||||
hs-source-dirs:
|
|
||||||
./.
|
|
||||||
tests
|
|
||||||
ghc-options: -Wall -fno-warn-unused-do-bind -fno-warn-name-shadowing -fno-warn-missing-signatures -fno-warn-type-defaults -fno-warn-orphans
|
|
||||||
build-depends:
|
|
||||||
Decimal
|
|
||||||
, Glob >=0.9
|
|
||||||
, HUnit
|
|
||||||
, ansi-terminal >=0.6.2.3
|
|
||||||
, array
|
|
||||||
, base >=4.8 && <4.12
|
|
||||||
, base-compat-batteries >=0.10.1 && <0.11
|
|
||||||
, blaze-markup >=0.5.1
|
|
||||||
, bytestring
|
|
||||||
, cassava
|
|
||||||
, cassava-megaparsec
|
|
||||||
, cmdargs >=0.10
|
|
||||||
, containers
|
|
||||||
, data-default >=0.5
|
|
||||||
, deepseq
|
|
||||||
, directory
|
|
||||||
, extra
|
|
||||||
, filepath
|
|
||||||
, hashtables >=1.2.3.1
|
|
||||||
, hledger-lib
|
|
||||||
, megaparsec >=6.4.1
|
|
||||||
, mtl
|
|
||||||
, mtl-compat
|
|
||||||
, old-time
|
|
||||||
, parsec >=3
|
|
||||||
, parser-combinators >=0.4.0
|
|
||||||
, pretty-show >=1.6.4
|
|
||||||
, regex-tdfa
|
|
||||||
, safe >=0.2
|
|
||||||
, split >=0.1
|
|
||||||
, tabular >=0.2
|
|
||||||
, test-framework
|
|
||||||
, test-framework-hunit
|
|
||||||
, text >=1.2
|
|
||||||
, time >=1.5
|
|
||||||
, transformers >=0.2
|
|
||||||
, uglymemo
|
|
||||||
, utf8-string >=0.3.5
|
|
||||||
if (!impl(ghc >= 8.0))
|
|
||||||
build-depends:
|
|
||||||
semigroups ==0.18.*
|
|
||||||
default-language: Haskell2010
|
|
||||||
|
@ -258,8 +258,7 @@ import qualified Data.Text as T
|
|||||||
import qualified Data.Text.Lazy as TL
|
import qualified Data.Text.Lazy as TL
|
||||||
import System.Console.CmdArgs.Explicit as C
|
import System.Console.CmdArgs.Explicit as C
|
||||||
import Lucid as L
|
import Lucid as L
|
||||||
import Text.CSV
|
import Test.HUnit hiding (test)
|
||||||
import Test.HUnit
|
|
||||||
import Text.Printf (printf)
|
import Text.Printf (printf)
|
||||||
import Text.Tabular as T
|
import Text.Tabular as T
|
||||||
--import Text.Tabular.AsciiWide
|
--import Text.Tabular.AsciiWide
|
||||||
|
@ -19,7 +19,6 @@ import qualified Data.Text as T
|
|||||||
import System.Console.CmdArgs.Explicit
|
import System.Console.CmdArgs.Explicit
|
||||||
import Test.HUnit
|
import Test.HUnit
|
||||||
import Hledger.Read.CsvReader (CSV, printCSV)
|
import Hledger.Read.CsvReader (CSV, printCSV)
|
||||||
import Text.CSV
|
|
||||||
|
|
||||||
import Hledger
|
import Hledger
|
||||||
import Hledger.Cli.CliOptions
|
import Hledger.Cli.CliOptions
|
||||||
|
@ -21,8 +21,7 @@ import Data.Maybe
|
|||||||
import qualified Data.Text as T
|
import qualified Data.Text as T
|
||||||
import System.Console.CmdArgs.Explicit
|
import System.Console.CmdArgs.Explicit
|
||||||
import Hledger.Read.CsvReader (CSV, Record, printCSV)
|
import Hledger.Read.CsvReader (CSV, Record, printCSV)
|
||||||
import Test.HUnit
|
import Test.HUnit hiding (test)
|
||||||
import Text.CSV
|
|
||||||
|
|
||||||
import Hledger
|
import Hledger
|
||||||
import Hledger.Cli.CliOptions
|
import Hledger.Cli.CliOptions
|
||||||
|
@ -2,8 +2,7 @@
|
|||||||
--
|
--
|
||||||
-- see: https://github.com/sol/hpack
|
-- see: https://github.com/sol/hpack
|
||||||
--
|
--
|
||||||
-- hash: b3a4eb54eefbb3d5d70acc5d567276f2e06d13a59aebfa31bcd988ff1b54b88c
|
-- hash: 670748bbdefdd5950fbc676e79a7c3924edbe21ac333141915b5509e799fa071
|
||||||
-- hash: fc9d50bfd8e455c344f6ba60fd05358537cb2f3a6bc968eca7e554364f4cc1fe
|
|
||||||
|
|
||||||
name: hledger
|
name: hledger
|
||||||
version: 1.10.99
|
version: 1.10.99
|
||||||
|
Loading…
Reference in New Issue
Block a user