family-tree 0.5 → 0.5.1

raw patch · 2 files changed

+14/−14 lines, 2 filesdep ~binarydep ~intervalsdep ~lensPVP ok

version bump matches the API change (PVP)

Dependency ranges changed: binary, intervals, lens, tables, text

API changes (from Hackage documentation)

Files

• family-tree.cabal +6/−6
• src/Data/FamilyTree.hs +8/−8

@@ -1,5 +1,5 @@ name:                family-tree-version:             0.5+version:             0.5.1 package-url:         https://github.com/Taneb/family-tree synopsis:            A family tree library for the Haskell programming language. description:         A family tree library for the Haskell programming language.@@ -17,14 +17,14 @@ library   exposed-modules:     Data.FamilyTree   build-depends:       base >= 4.3 && < 5,-                       lens >= 3.8 && < 3.10,-                       binary < 0.7,+                       lens >= 3.8 && < 5,+                       binary < 0.8,                        unordered-containers ==0.2.*,                        containers >=0.4.2 && < 0.6,-                       text ==0.11.*,+                       text >0.11 && <1.3,                        time < 1.5,-                       intervals < 0.3,-                       tables ==0.3.*,+                       intervals < 0.8,+                       tables >0.3 && <0.5,                        hashable >= 1.1.1.0 && < 1.3   hs-source-dirs:      src 

@@ -60,7 +60,7 @@ ) where  import Control.Applicative (Applicative(..), (<$>), Alternative((<|>)))-import Control.Lens hiding (children)+import Control.Lens hiding (children, (...))  import Data.Binary (Binary(..), putWord8, getWord8) import Data.Function (on)@@ -78,7 +78,7 @@  import GHC.Generics (Generic) -import Numeric.Interval (Interval)+import Numeric.Interval (Interval, (...)) import qualified Numeric.Interval as I  -- | The Location type. Either a coordinate or a placename.  @@ -93,10 +93,10 @@ type PartialDate = Interval Day  partialDateFromYear :: Integer -> PartialDate-partialDateFromYear n = I.I (fromGregorian n 1 1) (fromGregorian n 12 31)+partialDateFromYear n = fromGregorian n 1 1 ... fromGregorian n 12 31  partialDateFromMonth :: Integer -> Int -> PartialDate-partialDateFromMonth y m = I.I (fromGregorian y m 1) . +partialDateFromMonth y m = (...) (fromGregorian y m 1) .      fromGregorian y m $ gregorianMonthLength y m  partialDateFromDay :: Integer -> Int -> Int -> PartialDate@@ -307,10 +307,10 @@     return Person       {_personId = i       ,_name = fmap decodeUtf8 n-      ,_birthdate = I.I <$> fmap ModifiedJulianDay bdi <*>+      ,_birthdate = (...) <$> fmap ModifiedJulianDay bdi <*>         fmap ModifiedJulianDay bds       ,_birthplace = bp-      ,_deathdate = I.I <$> fmap ModifiedJulianDay ddi <*>+      ,_deathdate = (...) <$> fmap ModifiedJulianDay ddi <*>         fmap ModifiedJulianDay dds       ,_deathplace = dp       ,_attributes = HM.fromList $ map (both %~ decodeUtf8) a@@ -342,8 +342,8 @@       ,_head1 = h1       ,_head2 = h2       ,_relationship = r-      ,_relationFrom = I.I <$> fmap ModifiedJulianDay rfi <*> fmap ModifiedJulianDay rfs-      ,_relationTo = I.I <$> fmap ModifiedJulianDay rti <*> fmap ModifiedJulianDay rts+      ,_relationFrom = (...) <$> fmap ModifiedJulianDay rfi <*> fmap ModifiedJulianDay rfs+      ,_relationTo = (...) <$> fmap ModifiedJulianDay rti <*> fmap ModifiedJulianDay rts       ,_children = c       }