diff --git a/holidays.cabal b/holidays.cabal --- a/holidays.cabal +++ b/holidays.cabal @@ -1,10 +1,12 @@ cabal-version: 3.0 - name: holidays -version: 0.3.0.0 +version: 0.3.0.1 synopsis: Library for country public holidays description: - Library for country public holidays. Provides a small EDSL to describe holidays for a country. + Public holidays with Haskell. + Because lazy programmers need holidays! + Provides a small EDSL for finding dates. (Very useful if you are a lonely programmer) + category: Date homepage: https://github.com/danielc777888/holidays license: MIT @@ -12,12 +14,11 @@ author: Daniel Cabral maintainer: danielc777888@gmail.com extra-doc-files: CHANGELOG.md - -tested-with: GHC == 9.8.1 +tested-with: ghc ==9.8.1 source-repository head type: git - location: git://github.com/danielc777888/holidays.git + location: https://github.com/danielc777888/holidays.git common common ghc-options: -Wall @@ -25,13 +26,16 @@ base ^>=4.19.0.0, containers ^>=0.7, text ^>=2.1, - time >=1.4 && <2 - default-language: Haskell2010 + time >=1.4 && <2, + default-language: Haskell2010 + default-extensions: OverloadedStrings + library import: common exposed-modules: Holidays + other-modules: Holidays.Base Holidays.DateFinder @@ -42,6 +46,7 @@ Holidays.SouthAfrica Holidays.UnitedKingdom Holidays.UnitedStates + hs-source-dirs: src test-suite tests @@ -52,7 +57,8 @@ tasty >=1.5, tasty-hunit >=0.10, tasty-quickcheck >=0.10, - text ^>=2.1 + text ^>=2.1, + hs-source-dirs: tst main-is: Main.hs other-modules: diff --git a/src/Holidays.hs b/src/Holidays.hs --- a/src/Holidays.hs +++ b/src/Holidays.hs @@ -1,5 +1,3 @@ -{-# LANGUAGE OverloadedStrings #-} - {- | This module determines public holidays based on country code and year. -} @@ -51,4 +49,3 @@ apply (hs, transforms) year = let validDays = filter (validDay . holidayValue) $ map (\d -> d year) hs -- apply year and filter out invalid days in foldr (\d ds -> S.insert (foldr (\t d' -> t ds d') d transforms) ds) S.empty validDays -- apply transforms to valid days - diff --git a/src/Holidays/Base.hs b/src/Holidays/Base.hs --- a/src/Holidays/Base.hs +++ b/src/Holidays/Base.hs @@ -39,4 +39,3 @@ -- | Day is valid if its not a nullDate validDay :: Day -> Bool validDay = not . (nullDay ==) - diff --git a/src/Holidays/DateFinder.hs b/src/Holidays/DateFinder.hs --- a/src/Holidays/DateFinder.hs +++ b/src/Holidays/DateFinder.hs @@ -165,4 +165,3 @@ | otherwise = d where d' = holidayValue d - diff --git a/src/Holidays/Germany.hs b/src/Holidays/Germany.hs --- a/src/Holidays/Germany.hs +++ b/src/Holidays/Germany.hs @@ -3,8 +3,6 @@ https://en.wikipedia.org/wiki/Public_holidays_in_Germany https://publicholidays.de/ --} -{-# LANGUAGE OverloadedStrings #-} - module Holidays.Germany ( holidays, ) where diff --git a/src/Holidays/Mozambique.hs b/src/Holidays/Mozambique.hs --- a/src/Holidays/Mozambique.hs +++ b/src/Holidays/Mozambique.hs @@ -1,7 +1,5 @@ -- references: -- https://en.wikipedia.org/wiki/Public_holidays_in_Mozambique -{-# LANGUAGE OverloadedStrings #-} - module Holidays.Mozambique ( holidays, ) where diff --git a/src/Holidays/Namibia.hs b/src/Holidays/Namibia.hs --- a/src/Holidays/Namibia.hs +++ b/src/Holidays/Namibia.hs @@ -1,7 +1,5 @@ -- references: -- https://en.wikipedia.org/wiki/Public_holidays_in_Namibia -{-# LANGUAGE OverloadedStrings #-} - module Holidays.Namibia ( holidays, ) where diff --git a/src/Holidays/SouthAfrica.hs b/src/Holidays/SouthAfrica.hs --- a/src/Holidays/SouthAfrica.hs +++ b/src/Holidays/SouthAfrica.hs @@ -1,7 +1,5 @@ -- references: -- https://en.wikipedia.org/wiki/Public_holidays_in_South_Africa -{-# LANGUAGE OverloadedStrings #-} - module Holidays.SouthAfrica ( holidays, ) where diff --git a/src/Holidays/UnitedKingdom.hs b/src/Holidays/UnitedKingdom.hs --- a/src/Holidays/UnitedKingdom.hs +++ b/src/Holidays/UnitedKingdom.hs @@ -1,7 +1,5 @@ -- references: -- https://en.wikipedia.org/wiki/Public_holidays_in_the_United_Kingdom -{-# LANGUAGE OverloadedStrings #-} - module Holidays.UnitedKingdom ( holidays, ) where diff --git a/src/Holidays/UnitedStates.hs b/src/Holidays/UnitedStates.hs --- a/src/Holidays/UnitedStates.hs +++ b/src/Holidays/UnitedStates.hs @@ -1,7 +1,5 @@ -- references: -- https://en.wikipedia.org/wiki/Federal_holidays_in_the_United_States -{-# LANGUAGE OverloadedStrings #-} - module Holidays.UnitedStates ( holidays, ) where diff --git a/tst/Main.hs b/tst/Main.hs --- a/tst/Main.hs +++ b/tst/Main.hs @@ -19,4 +19,3 @@ propTests :: TestTree propTests = testGroup "Holidays property based tests" [DEU.propTests, GBR.propTests, MOZ.propTests, NAM.propTests, USA.propTests, ZAF.propTests] - diff --git a/tst/Test/Holidays/Germany.hs b/tst/Test/Holidays/Germany.hs --- a/tst/Test/Holidays/Germany.hs +++ b/tst/Test/Holidays/Germany.hs @@ -1,5 +1,3 @@ -{-# LANGUAGE OverloadedStrings #-} - module Test.Holidays.Germany ( unitTests, propTests, @@ -47,4 +45,3 @@ propTests :: TestTree propTests = countryPropTests "DEU" regions - diff --git a/tst/Test/Holidays/Mozambique.hs b/tst/Test/Holidays/Mozambique.hs --- a/tst/Test/Holidays/Mozambique.hs +++ b/tst/Test/Holidays/Mozambique.hs @@ -1,5 +1,3 @@ -{-# LANGUAGE OverloadedStrings #-} - module Test.Holidays.Mozambique ( unitTests, propTests, @@ -43,4 +41,3 @@ hday "armed_forces_day" . sep 25, hday "day_of_peace_and_reconciliation" . oct 4, hday "family_day" . christmasDay -} - diff --git a/tst/Test/Holidays/Namibia.hs b/tst/Test/Holidays/Namibia.hs --- a/tst/Test/Holidays/Namibia.hs +++ b/tst/Test/Holidays/Namibia.hs @@ -1,5 +1,3 @@ -{-# LANGUAGE OverloadedStrings #-} - module Test.Holidays.Namibia ( unitTests, propTests, @@ -51,4 +49,3 @@ propTests :: TestTree propTests = countryPropTests "NAM" [] - diff --git a/tst/Test/Holidays/SouthAfrica.hs b/tst/Test/Holidays/SouthAfrica.hs --- a/tst/Test/Holidays/SouthAfrica.hs +++ b/tst/Test/Holidays/SouthAfrica.hs @@ -1,5 +1,3 @@ -{-# LANGUAGE OverloadedStrings #-} - module Test.Holidays.SouthAfrica ( unitTests, propTests, @@ -51,4 +49,3 @@ propTests :: TestTree propTests = countryPropTests "ZAF" [] - diff --git a/tst/Test/Holidays/UnitedKingdom.hs b/tst/Test/Holidays/UnitedKingdom.hs --- a/tst/Test/Holidays/UnitedKingdom.hs +++ b/tst/Test/Holidays/UnitedKingdom.hs @@ -1,5 +1,3 @@ -{-# LANGUAGE OverloadedStrings #-} - module Test.Holidays.UnitedKingdom ( unitTests, propTests, @@ -42,4 +40,3 @@ propTests :: TestTree propTests = countryPropTests "GBR" [] - diff --git a/tst/Test/Holidays/UnitedStates.hs b/tst/Test/Holidays/UnitedStates.hs --- a/tst/Test/Holidays/UnitedStates.hs +++ b/tst/Test/Holidays/UnitedStates.hs @@ -1,5 +1,3 @@ -{-# LANGUAGE OverloadedStrings #-} - module Test.Holidays.UnitedStates ( unitTests, propTests, @@ -34,4 +32,3 @@ propTests :: TestTree propTests = countryPropTests "USA" [] -