From cf365524cb8c85f6b3dd74cb5114f531605a64a4 Mon Sep 17 00:00:00 2001 From: Clint Adams Date: Sat, 28 Dec 2013 13:31:58 -0500 Subject: [PATCH 1/7] Use regex-tdfa instead of regex-compat-tdfa --- hledger-lib/Hledger/Utils.hs | 6 +++--- hledger-lib/hledger-lib.cabal | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/hledger-lib/Hledger/Utils.hs b/hledger-lib/Hledger/Utils.hs index 5e86b62bf..8114ec754 100644 --- a/hledger-lib/Hledger/Utils.hs +++ b/hledger-lib/Hledger/Utils.hs @@ -51,7 +51,7 @@ import System.IO.Unsafe (unsafePerformIO) import Test.HUnit import Text.ParserCombinators.Parsec import Text.Printf -import Text.Regex +import Text.Regex.TDFA import Text.RegexPR import Text.Show.Pretty -- import qualified Data.Map as Map @@ -246,10 +246,10 @@ regexSplit = splitRegexPR -- regex-compat (regex-posix) functions that perform better than regexpr. regexMatchesRegexCompat :: String -> String -> Bool -regexMatchesRegexCompat r = isJust . matchRegex (mkRegex r) +regexMatchesRegexCompat = flip (=~) regexMatchesCIRegexCompat :: String -> String -> Bool -regexMatchesCIRegexCompat r = isJust . matchRegex (mkRegexWithOpts r True False) +regexMatchesCIRegexCompat r = match (makeRegexOpts defaultCompOpt { multiline = True, caseSensitive = False, newSyntax = True } defaultExecOpt r) -- lists diff --git a/hledger-lib/hledger-lib.cabal b/hledger-lib/hledger-lib.cabal index 6886f0302..c9b5f9352 100644 --- a/hledger-lib/hledger-lib.cabal +++ b/hledger-lib/hledger-lib.cabal @@ -68,7 +68,7 @@ library ,old-time ,parsec ,pretty-show - ,regex-compat-tdfa == 0.95.* + ,regex-tdfa ,regexpr >= 0.5.1 ,safe >= 0.2 ,split >= 0.1 && < 0.3 @@ -100,7 +100,7 @@ test-suite tests , old-time , parsec , pretty-show - , regex-compat-tdfa + , regex-tdfa , regexpr , safe , split From 4c1b2c0f86446bdc1b6a41d1a1617923891b2198 Mon Sep 17 00:00:00 2001 From: Simon Michael Date: Wed, 8 Jan 2014 14:48:28 -0800 Subject: [PATCH 2/7] remove obsolete regex-compat-tdfa dependency from hledger --- hledger/hledger.cabal | 1 - 1 file changed, 1 deletion(-) diff --git a/hledger/hledger.cabal b/hledger/hledger.cabal index 03b585c86..b648b9ace 100644 --- a/hledger/hledger.cabal +++ b/hledger/hledger.cabal @@ -164,7 +164,6 @@ test-suite tests , parsec , pretty-show , process - , regex-compat-tdfa , regexpr , safe , shakespeare-text From 62b0461c0efb67e429ee736008f27a0278a6283c Mon Sep 17 00:00:00 2001 From: Simon Michael Date: Wed, 8 Jan 2014 15:00:41 -0800 Subject: [PATCH 3/7] require latest pretty-show to allow install with standard happy and fix hackage docs --- hledger-lib/hledger-lib.cabal | 4 ++-- hledger/hledger.cabal | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/hledger-lib/hledger-lib.cabal b/hledger-lib/hledger-lib.cabal index c9b5f9352..df3271e19 100644 --- a/hledger-lib/hledger-lib.cabal +++ b/hledger-lib/hledger-lib.cabal @@ -67,7 +67,7 @@ library ,old-locale ,old-time ,parsec - ,pretty-show + ,pretty-show >= 1.6.4 ,regex-tdfa ,regexpr >= 0.5.1 ,safe >= 0.2 @@ -99,7 +99,7 @@ test-suite tests , old-locale , old-time , parsec - , pretty-show + , pretty-show >= 1.6.4 , regex-tdfa , regexpr , safe diff --git a/hledger/hledger.cabal b/hledger/hledger.cabal index b648b9ace..a8f2af0c3 100644 --- a/hledger/hledger.cabal +++ b/hledger/hledger.cabal @@ -162,7 +162,7 @@ test-suite tests , old-locale , old-time , parsec - , pretty-show + , pretty-show >= 1.6.4 , process , regexpr , safe From 2ec6231a51a26d0bad917a2a40a57f93af7f14ba Mon Sep 17 00:00:00 2001 From: Simon Michael Date: Wed, 8 Jan 2014 15:01:45 -0800 Subject: [PATCH 4/7] bump version to 0.22.1 --- VERSION | 2 +- hledger-lib/hledger-lib.cabal | 2 +- hledger-web/hledger-web.cabal | 14 +++++++------- hledger/hledger.cabal | 10 +++++----- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/VERSION b/VERSION index e34629406..a723ece79 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.22 +0.22.1 diff --git a/hledger-lib/hledger-lib.cabal b/hledger-lib/hledger-lib.cabal index df3271e19..b3df015f7 100644 --- a/hledger-lib/hledger-lib.cabal +++ b/hledger-lib/hledger-lib.cabal @@ -1,5 +1,5 @@ name: hledger-lib -version: 0.22 +version: 0.22.1 stability: beta category: Finance synopsis: Core data types, parsers and utilities for the hledger accounting tool. diff --git a/hledger-web/hledger-web.cabal b/hledger-web/hledger-web.cabal index 0bb439279..37a624caa 100644 --- a/hledger-web/hledger-web.cabal +++ b/hledger-web/hledger-web.cabal @@ -1,5 +1,5 @@ name: hledger-web -version: 0.22 +version: 0.22.1 stability: beta category: Finance synopsis: A web interface for the hledger accounting tool. @@ -66,7 +66,7 @@ flag library-only Default: False library - cpp-options: -DVERSION="0.22" + cpp-options: -DVERSION="0.22.1" if flag(dev) || flag(library-only) cpp-options: -DDEVELOPMENT @@ -109,8 +109,8 @@ library Hledger.Web.Options -- Setup -- stops yesod devel complaining, requires build-depends: Cabal build-depends: - hledger == 0.22 - , hledger-lib == 0.22 + hledger == 0.22.1 + , hledger-lib == 0.22.1 , base >= 4 && < 5 , bytestring , clientsession @@ -157,7 +157,7 @@ executable hledger-web if flag(library-only) Buildable: False - cpp-options: -DVERSION="0.22" + cpp-options: -DVERSION="0.22.1" if flag(dev) cpp-options: -DDEVELOPMENT @@ -201,8 +201,8 @@ executable hledger-web Hledger.Web.Options build-depends: - hledger == 0.22 - , hledger-lib == 0.22 + hledger == 0.22.1 + , hledger-lib == 0.22.1 , base >= 4 && < 5 , bytestring , clientsession diff --git a/hledger/hledger.cabal b/hledger/hledger.cabal index a8f2af0c3..00a1cf902 100644 --- a/hledger/hledger.cabal +++ b/hledger/hledger.cabal @@ -1,6 +1,6 @@ name: hledger -- also in cpp-options below -version: 0.22 +version: 0.22.1 stability: beta category: Finance synopsis: The main command-line interface for the hledger accounting tool. @@ -41,7 +41,7 @@ flag threaded Default: True library - cpp-options: -DVERSION="0.22" + cpp-options: -DVERSION="0.22.1" ghc-options: -W -- should be the same as below exposed-modules: @@ -62,7 +62,7 @@ library Hledger.Cli.Stats -- should be the same as below build-depends: - hledger-lib == 0.22 + hledger-lib == 0.22.1 ,base >= 4.3 && < 5 -- ,cabal-file-th ,containers @@ -113,13 +113,13 @@ executable hledger Hledger.Cli.Print Hledger.Cli.Register Hledger.Cli.Stats - cpp-options: -DVERSION="0.22" + cpp-options: -DVERSION="0.22.1" ghc-options: -W if flag(threaded) ghc-options: -threaded -- should be the same as above build-depends: - hledger-lib == 0.22 + hledger-lib == 0.22.1 ,base >= 4.3 && < 5 ,containers ,cmdargs >= 0.10 && < 0.11 From 4d8ef7eaa3aed854db4ae85b740c138a0003f282 Mon Sep 17 00:00:00 2001 From: Simon Michael Date: Wed, 8 Jan 2014 15:02:33 -0800 Subject: [PATCH 5/7] docs: release notes --- NEWS.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/NEWS.md b/NEWS.md index eee9ffd07..11c5a28e1 100644 --- a/NEWS.md +++ b/NEWS.md @@ -4,6 +4,14 @@ title: hledger news # News +## 2014/1/6 hledger 0.22.1 + +- require the latest pretty-show so hledger installation no longer + needs an upgraded version of happy, and the docs build on hackage + +- require regex-tdfa directly instead of regex-compat-tdfa, + simplifying Debian packaging + ## 2013/12/13 hledger 0.22 **New:** From ff30fc5aa2984d55e8302c63adee521b0913a0f9 Mon Sep 17 00:00:00 2001 From: Simon Michael Date: Wed, 8 Jan 2014 15:22:43 -0800 Subject: [PATCH 6/7] tools: I think we're using simple git tags now --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 3655788dc..3331c14ad 100644 --- a/Makefile +++ b/Makefile @@ -818,7 +818,7 @@ DOWNLOAD.md: $(VERSIONFILE) perl -p -e "s/hledger(|-chart|-web|-vty)-[0-9.]+-/hledger\1-$(VERSION)-/g" -i $@ tagrelease: - git tag -a $(VERSION) + git tag $(VERSION) hackageupload-dry: for p in $(PACKAGES); do cabal upload $$p/dist/$$p-$(VERSION).tar.gz -v2 --check; done From ed8e93d1dd152913ce8ba68342a313fa881b9de9 Mon Sep 17 00:00:00 2001 From: Simon Michael Date: Wed, 8 Jan 2014 15:23:10 -0800 Subject: [PATCH 7/7] tools: disable some failing release test scripts --- Makefile | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 3331c14ad..97c73ee2e 100644 --- a/Makefile +++ b/Makefile @@ -349,7 +349,7 @@ committest: hlinttest unittest doctest functest haddocktest warningstest quickca # thorough pre-release tests - run before release # consider hiding dev-build symlinks in Hledger/ first -releasetest: Clean unittest doctest functest warningstest fullcabaltest haddocktest +releasetest: Clean unittest functest fullcabaltest haddocktest #warningstest doctest hlinttest hlint: hlint --hint=hlint --report=hlint.html $(SOURCEFILES) @@ -430,8 +430,16 @@ quickcabaltest: # make sure cabal is happy in all possible ways fullcabaltest: - (for p in $(PACKAGES); do (echo "testing $$p package" && cd $$p && cabal clean && cabal check && cabal install && cabal sdist && cabal upload dist/$$p-$(VERSION).tar.gz --check -v3); done \ + (for p in $(PACKAGES); do ( \ + printf "\ntesting $$p package\n" \ + && cd $$p \ + && cabal clean \ + && cabal check \ + && cabal install \ + && cabal sdist \ + ); done \ && echo $@ PASSED) || echo $@ FAILED +# && cabal upload dist/$$p-$(VERSION).tar.gz --check -v3 \ # run simple performance benchmarks without saving results # Requires some commands defined in bench.tests and some BENCHEXES defined above.