Merge pull request #21 from lfborjas/update-base

Allow newer haskells, add to testing matrix.
lfborjas · Mar 14, 2021 · a717ff1 · a717ff1
2 parents f791d57 + f0da36d
commit a717ff1
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 9 deletions.
diff --git a/.github/workflows/haskell.yml b/.github/workflows/haskell.yml
@@ -12,14 +12,14 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ghc: ['8.0.2', '8.2.2', '8.4.4', '8.6.5', '8.8.3']
+        ghc: ['8.0.2', '8.2.2', '8.4.4', '8.6.5', '8.8.3', '8.10.2']
         cabal: ['3.2']
         os: [ubuntu-latest, macos-latest]
     env:
       CONFIG: "--enable-tests --enable-benchmarks --test-show-details=streaming"
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-haskell@v1.1.2
+      - uses: actions/setup-haskell@v1.1.4
         id: setup-haskell-cabal
         with:
           ghc-version: ${{ matrix.ghc }}

diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
 .stack-work/
 *~
-dist-newstyle
+dist-newstyle
+.vscode
diff --git a/ChangeLog.md b/ChangeLog.md
@@ -1,5 +1,9 @@
 # Changelog for swiss-ephemeris
 
+## v1.2.1.1 (2021-03-14)
+
+* Bump upper bound for `base`, to work with newer haskells.
+
 ## v1.2.1.0 (2020-11-14)
 
 * Introduces `gregorianDateTime`, which is the reverse of `julianDay`: given a JD, return

diff --git a/README.md b/README.md
@@ -79,3 +79,7 @@ data](https://www.astro.com/swisseph/swisseph.htm#_Toc46391741).
 
 I've only made available the types and functions that are useful for my own, traditional, horoscope calculations.
 Feel free to add more! See the [astro.com documentation](https://www.astro.com/swisseph/swisseph.htm) for ideas.
+
+### Releasing
+
+I use `stack` for this project, so releasing it should just be a matter of running `stack sdist`.
diff --git a/package.yaml b/package.yaml
@@ -1,5 +1,5 @@
 name:                swiss-ephemeris
-version:             1.2.1.0
+version:             1.2.1.1
 github:              "lfborjas/swiss-ephemeris"
 license:             GPL-2
 author:              "Luis Borjas Reyes"
@@ -19,7 +19,7 @@ category:            Data, Astrology
 description:         Please see the README on GitHub at <https://github.com/lfborjas/swiss-ephemeris#readme>
 
 dependencies:
-- base >= 4.7 && < 4.14
+- base >= 4.7 && <= 4.15
 
 ghc-options:
 - -Wall

diff --git a/src/SwissEphemeris.hs b/src/SwissEphemeris.hs
@@ -124,6 +124,8 @@ julianDay year month day hour = JulianTime $ realToFrac $ c_swe_julday y m d h g
     d = fromIntegral day
     h = realToFrac hour
 
+-- | Given a `JulianTime`, return a tuple with a year, month, day
+-- and hour (as a `Double`.) It is the reverse of `julianDay`.
 gregorianDateTime :: JulianTime -> (Int, Int, Int, Double)
 gregorianDateTime (JulianTime jd) =
   unsafePerformIO $ do

diff --git a/swiss-ephemeris.cabal b/swiss-ephemeris.cabal
@@ -4,10 +4,10 @@ cabal-version: 1.12
 --
 -- see: https://github.com/sol/hpack
 --
--- hash: 487b18d84ce97183156848cacbaf172f870c1cda01cb841feee5f230365175c3
+-- hash: 87e5143a1b60bccf232483d76a38cf044429f9a273bbd11667914c911d969015
 
 name:           swiss-ephemeris
-version:        1.2.1.0
+version:        1.2.1.1
 synopsis:       Haskell bindings for the Swiss Ephemeris C library
 description:    Please see the README on GitHub at <https://github.com/lfborjas/swiss-ephemeris#readme>
 category:       Data, Astrology
@@ -63,7 +63,7 @@ library
       csrc/sweph.c
       csrc/swephlib.c
   build-depends:
-      base >=4.7 && <4.14
+      base >=4.7 && <=4.15
   default-language: Haskell2010
 
 test-suite swiss-ephemeris-test
@@ -79,7 +79,7 @@ test-suite swiss-ephemeris-test
       hspec-discover:hspec-discover >=2.7 && <2.8
   build-depends:
       QuickCheck >=2.12 && <=2.14
-    , base >=4.7 && <4.14
+    , base >=4.7 && <=4.15
     , directory >=1.3 && <1.4
     , hspec >=2.7 && <2.8
     , swiss-ephemeris