Merge pull request #332 from phadej/tighten-bounds

Tighten lower bounds

Author: phadej

.travis.yml

@@ -2,7 +2,7 @@
 #
 #   runghc make_travis_yml_2.hs '--branch' 'master' '-o' '.travis.yml' 'github.cabal'
 #
-# For more information, see https://github.com/hvr/multi-ghc-travis
+# For more information, see https://github.com/haskell-CI/haskell-ci
 #
 language: c
 sudo: false
@@ -64,14 +64,18 @@ install:
   - BENCH=${BENCH---enable-benchmarks}
   - TEST=${TEST---enable-tests}
   - HADDOCK=${HADDOCK-true}
-  - INSTALLED=${INSTALLED-true}
+  - UNCONSTRAINED=${UNCONSTRAINED-true}
+  - NOINSTALLEDCONSTRAINTS=${NOINSTALLEDCONSTRAINTS-false}
   - GHCHEAD=${GHCHEAD-false}
   - travis_retry cabal update -v
   - "sed -i.bak 's/^jobs:/-- jobs:/' ${HOME}/.cabal/config"
   - rm -fv cabal.project cabal.project.local
   - grep -Ev -- '^\s*--' ${HOME}/.cabal/config | grep -Ev '^\s*$'
   - "printf 'packages: \".\"\\n' > cabal.project"
-  - cat cabal.project
+  - touch cabal.project.local
+  - "if ! $NOINSTALLEDCONSTRAINTS; then for pkg in $($HCPKG list --simple-output); do echo $pkg  | grep -vw -- github | sed 's/^/constraints: /' | sed 's/-[^-]*$/ installed/' >> cabal.project.local; done; fi"
+  - cat cabal.project || true
+  - cat cabal.project.local || true
   - if [ -f "./configure.ac" ]; then
       (cd "." && autoreconf -i);
     fi
@@ -90,13 +94,13 @@ script:
   - cd ${DISTDIR} || false
   - find . -maxdepth 1 -name '*.tar.gz' -exec tar -xvf '{}' \;
   - "printf 'packages: github-*/*.cabal\\n' > cabal.project"
-  - cat cabal.project
+  - touch cabal.project.local
+  - "if ! $NOINSTALLEDCONSTRAINTS; then for pkg in $($HCPKG list --simple-output); do echo $pkg  | grep -vw -- github | sed 's/^/constraints: /' | sed 's/-[^-]*$/ installed/' >> cabal.project.local; done; fi"
+  - cat cabal.project || true
+  - cat cabal.project.local || true
   # this builds all libraries and executables (without tests/benchmarks)
   - cabal new-build -w ${HC} --disable-tests --disable-benchmarks all
 
-  # Build with installed constraints for packages in global-db
-  - if $INSTALLED; then echo cabal new-build -w ${HC} --disable-tests --disable-benchmarks $(${HCPKG} list --global --simple-output --names-only | sed 's/\([a-zA-Z0-9-]\{1,\}\) */--constraint="\1 installed" /g') all | sh; else echo "Not building with installed constraints"; fi
-
   # build & run tests, build benchmarks
   - cabal new-build -w ${HC} ${TEST} ${BENCH} all
   - if [ "x$TEST" = "x--enable-tests" ]; then cabal new-test -w ${HC} ${TEST} ${BENCH} all; fi
@@ -108,5 +112,8 @@ script:
   - rm -rf ./dist-newstyle
   - if $HADDOCK; then cabal new-haddock -w ${HC} ${TEST} ${BENCH} all; else echo "Skipping haddock generation";fi
 
+  # Build without installed constraints for packages in global-db
+  - if $UNCONSTRAINED; then rm -f cabal.project.local; echo cabal new-build -w ${HC} --disable-tests --disable-benchmarks all; else echo "Not building without installed constraints"; fi
+
 # REGENDATA ["--branch","master","-o",".travis.yml","github.cabal"]
 # EOF

CHANGELOG.md

@@ -1,11 +1,13 @@
-## Changes for 0.19.1
+## Changes for 0.20
 
 - Add ratelimit endpoint
-  [#315](https://github.com/phadej/github/pull/315/)
+  [#315](https://github.com/phadej/github/pull/315)
 - Add some deployment endoints
-  [#330](https://github.com/phadej/github/pull/330/)
+  [#330](https://github.com/phadej/github/pull/330)
 - Add webhook installation events
-  [#329](https://github.com/phadej/github/pull/330/)
+  [#329](https://github.com/phadej/github/pull/330)
+- Tigthen lower bounds (also remove aeson-compat dep)
+  [#332](https://github.com/phadej/github/pull/332)
 
 ## Changes for 0.19
 

github.cabal

@@ -1,6 +1,5 @@
 name:                github
-version:             0.19
-x-revision:          3
+version:             0.20
 synopsis:            Access to the GitHub API, v3.
 description:
   The GitHub API provides programmatic access to the full
@@ -39,11 +38,6 @@ extra-source-files:
   fixtures/user-organizations.json,
   fixtures/user.json
 
-flag aeson-compat
-  description: Whether to use aeson-compat or aeson-extra
-  default: True
-  manual: False
-
 source-repository head
   type: git
   location: git://github.com/phadej/github.git
@@ -140,6 +134,7 @@ Library
   -- Packages bundles with GHC, mtl and text are also here
   build-depends:
     base                  >=4.7       && <4.12,
+    binary                >=0.7.1.0   && <0.10,
     bytestring            >=0.10.4.0  && <0.11,
     containers            >=0.5.5.1   && <0.6,
     deepseq               >=1.3.0.2   && <1.5,
@@ -150,34 +145,28 @@ Library
 
   -- other packages
   build-depends:
-    aeson                 >=0.7.0.6   && <1.5,
-    base-compat           >=0.9.1     && <0.11,
+    aeson                 >=1.4.0.0   && <1.5,
+    base-compat           >=0.10.4    && <0.11,
     base16-bytestring     >=0.1.1.6   && <0.2,
-    binary                >=0.7.1.0   && <0.10,
-    binary-orphans        >=0.1.0.0   && <0.2,
+    binary-orphans        >=0.1.8.0   && <0.2,
     byteable              >=0.1.1     && <0.2,
-    cryptohash            >=0.11      && <0.12,
-    deepseq-generics      >=0.1.1.2   && <0.3,
-    exceptions            >=0.8.0.2   && <0.11,
-    hashable              >=1.2.3.3   && <1.3,
-    http-client           >=0.4.8.1   && <0.6,
-    http-client-tls       >=0.2.2     && <0.4,
-    http-link-header      >=1.0.1     && <1.1,
+    cryptohash            >=0.11.9    && <0.12,
+    deepseq-generics      >=0.2.0.0   && <0.3,
+    exceptions            >=0.10.0    && <0.11,
+    hashable              >=1.2.7.0   && <1.3,
+    http-client           >=0.5.12    && <0.6,
+    http-client-tls       >=0.3.5.3   && <0.4,
+    http-link-header      >=1.0.3.1   && <1.1,
     http-types            >=0.12.1    && <0.13,
-    iso8601-time          >=0.1.4     && <0.2,
-    network-uri           >=2.6.0.3   && <2.7,
-    semigroups            >=0.16.2.2  && <0.19,
-    transformers-compat   >=0.4.0.3   && <0.7,
-    unordered-containers  >=0.2       && <0.3,
-    vector                >=0.10.12.3 && <0.13,
-    vector-instances      >=3.3.0.1   && <3.5,
+    iso8601-time          >=0.1.5     && <0.2,
+    network-uri           >=2.6.1.0   && <2.7,
+    semigroups            >=0.18.5    && <0.19,
+    transformers-compat   >=0.6       && <0.7,
+    unordered-containers  >=0.2.9.0   && <0.3,
+    vector                >=0.12.0.1  && <0.13,
+    vector-instances      >=3.4       && <3.5,
 
-    tls                   >=1.3.5
-
-  if flag(aeson-compat)
-    build-depends: aeson-compat >=0.3.0.0 && <0.4
-  else
-    build-depends: aeson-extra  >=0.2.0.0 && <0.3
+    tls                   >=1.4.1
 
 test-suite github-test
   default-language: Haskell2010
@@ -188,28 +177,25 @@ test-suite github-test
   other-modules:
     GitHub.ActivitySpec
     GitHub.CommitsSpec
-    GitHub.OrganizationsSpec
+    GitHub.EventsSpec
     GitHub.IssuesSpec
-    GitHub.PullRequestsSpec
+    GitHub.OrganizationsSpec
     GitHub.PullRequestReviewsSpec
+    GitHub.PullRequestsSpec
+    GitHub.RateLimitSpec
     GitHub.ReleasesSpec
     GitHub.ReposSpec
     GitHub.SearchSpec
     GitHub.UsersSpec
-    GitHub.EventsSpec
   main-is: Spec.hs
   ghc-options: -Wall
-  build-tool-depends: hspec-discover:hspec-discover
+  build-tool-depends: hspec-discover:hspec-discover >=2.5.6 && <2.6
   build-depends: base,
                  base-compat,
+                 aeson,
                  bytestring,
                  github,
                  vector,
                  unordered-containers,
                  file-embed,
-                 hspec
-  if flag(aeson-compat)
-    build-depends: aeson-compat
-  else
-    build-depends: aeson-extra
-
+                 hspec >= 2.5.6 && <2.6

spec/GitHub/OrganizationsSpec.hs

@@ -3,19 +3,18 @@
 module GitHub.OrganizationsSpec where
 
 import GitHub.Auth                            (Auth (..))
-import GitHub.Data                            (SimpleOrganization (..),
-                                               SimpleOwner (..),
-                                               SimpleTeam (..))
+import GitHub.Data
+       (SimpleOrganization (..), SimpleOwner (..), SimpleTeam (..))
 import GitHub.Endpoints.Organizations         (publicOrganizationsFor')
 import GitHub.Endpoints.Organizations.Members (membersOf')
 
-import Data.Aeson.Compat  (eitherDecodeStrict)
+import Data.Aeson         (eitherDecodeStrict)
 import Data.Either.Compat (isRight)
 import Data.FileEmbed     (embedFile)
 import Data.String        (fromString)
 import System.Environment (lookupEnv)
-import Test.Hspec         (Spec, describe, it, pendingWith, shouldBe,
-                           shouldSatisfy)
+import Test.Hspec
+       (Spec, describe, it, pendingWith, shouldBe, shouldSatisfy)
 
 fromRightS :: Show a => Either a b -> b
 fromRightS (Right b) = b

spec/GitHub/PullRequestReviewsSpec.hs

@@ -2,16 +2,16 @@
 module GitHub.PullRequestReviewsSpec where
 
 import qualified GitHub
-import GitHub.Data.Id (Id(Id))
+import           GitHub.Data.Id (Id (Id))
 
 import Prelude ()
 import Prelude.Compat
 
-import Data.Either.Compat   (isRight)
-import Data.Foldable        (for_)
-import Data.String          (fromString)
-import System.Environment   (lookupEnv)
-import Test.Hspec           (Spec, describe, it, pendingWith, shouldSatisfy)
+import Data.Either.Compat (isRight)
+import Data.Foldable      (for_)
+import Data.String        (fromString)
+import System.Environment (lookupEnv)
+import Test.Hspec         (Spec, describe, it, pendingWith, shouldSatisfy)
 
 withAuth :: (GitHub.Auth -> IO ()) -> IO ()
 withAuth action = do

spec/GitHub/PullRequestsSpec.hs

@@ -3,20 +3,21 @@
 module GitHub.PullRequestsSpec where
 
 import qualified GitHub
-import GitHub.Data.Id (Id(Id))
+import           GitHub.Data.Id (Id (Id))
 
 import Prelude ()
 import Prelude.Compat
 
-import Data.Aeson.Compat     (eitherDecodeStrict)
-import Data.ByteString       (ByteString)
-import Data.Either.Compat    (isRight)
-import Data.FileEmbed        (embedFile)
-import Data.Foldable         (for_)
-import Data.String           (fromString)
-import qualified Data.Vector as V
-import System.Environment    (lookupEnv)
-import Test.Hspec            (Spec, describe, it, pendingWith, shouldBe, shouldSatisfy)
+import           Data.Aeson         (eitherDecodeStrict)
+import           Data.ByteString    (ByteString)
+import           Data.Either.Compat (isRight)
+import           Data.FileEmbed     (embedFile)
+import           Data.Foldable      (for_)
+import           Data.String        (fromString)
+import qualified Data.Vector        as V
+import           System.Environment (lookupEnv)
+import           Test.Hspec
+                 (Spec, describe, it, pendingWith, shouldBe, shouldSatisfy)
 
 fromRightS :: Show a => Either a b -> b
 fromRightS (Right b) = b

spec/GitHub/RateLimitSpec.hs

@@ -0,0 +1,30 @@
+{-# LANGUAGE OverloadedStrings #-}
+module GitHub.RateLimitSpec where
+
+import qualified GitHub
+
+import Prelude ()
+import Prelude.Compat
+
+import Data.Either.Compat (isRight)
+import Data.Foldable      (for_)
+import Data.String        (fromString)
+import System.Environment (lookupEnv)
+import Test.Hspec         (Spec, describe, it, pendingWith, shouldSatisfy)
+
+fromRightS :: Show a => Either a b -> b
+fromRightS (Right b) = b
+fromRightS (Left a) = error $ "Expected a Right and got a Left" ++ show a
+
+withAuth :: (GitHub.Auth -> IO ()) -> IO ()
+withAuth action = do
+    mtoken <- lookupEnv "GITHUB_TOKEN"
+    case mtoken of
+        Nothing    -> pendingWith "no GITHUB_TOKEN"
+        Just token -> action (GitHub.OAuth $ fromString token)
+
+spec :: Spec
+spec = describe "rateLimitR" $
+    it "works" $ withAuth $ \auth -> do
+        cs <- GitHub.executeRequest auth GitHub.rateLimitR
+        cs `shouldSatisfy` isRight

spec/GitHub/SearchSpec.hs

@@ -2,10 +2,10 @@
 {-# LANGUAGE TemplateHaskell   #-}
 module GitHub.SearchSpec where
 
-import Prelude        ()
+import Prelude ()
 import Prelude.Compat
 
-import Data.Aeson.Compat  (eitherDecodeStrict)
+import Data.Aeson         (eitherDecodeStrict)
 import Data.FileEmbed     (embedFile)
 import Data.Proxy         (Proxy (..))
 import Data.String        (fromString)
@@ -14,7 +14,7 @@ import Test.Hspec         (Spec, describe, it, pendingWith, shouldBe)
 
 import qualified Data.Vector as V
 
-import GitHub.Data             (Auth (..), Issue (..), mkId, IssueState (..))
+import GitHub.Data             (Auth (..), Issue (..), IssueState (..), mkId)
 import GitHub.Endpoints.Search (SearchResult (..), searchIssues')
 
 fromRightS :: Show a => Either a b -> b

spec/GitHub/UsersSpec.hs

@@ -2,20 +2,20 @@
 {-# LANGUAGE TemplateHaskell   #-}
 module GitHub.UsersSpec where
 
-import Data.Aeson.Compat  (eitherDecodeStrict)
+import Data.Aeson         (eitherDecodeStrict)
 import Data.Either.Compat (isLeft, isRight)
 import Data.FileEmbed     (embedFile)
 import Data.String        (fromString)
 import System.Environment (lookupEnv)
-import Test.Hspec         (Spec, describe, it, pendingWith, shouldBe,
-                           shouldSatisfy)
+import Test.Hspec
+       (Spec, describe, it, pendingWith, shouldBe, shouldSatisfy)
 
 import qualified GitHub
 
-import GitHub.Data                      (Auth (..), Organization (..),
-                                         User (..), fromOwner)
-import GitHub.Endpoints.Users           (ownerInfoForR, userInfoCurrent',
-                                         userInfoFor')
+import GitHub.Data
+       (Auth (..), Organization (..), User (..), fromOwner)
+import GitHub.Endpoints.Users
+       (ownerInfoForR, userInfoCurrent', userInfoFor')
 import GitHub.Endpoints.Users.Followers (usersFollowedByR, usersFollowingR)
 import GitHub.Request                   (executeRequest)
 

src/GitHub/Data/Request.hs

@@ -37,6 +37,7 @@ import qualified Data.Text                 as T
 import qualified Network.HTTP.Types        as Types
 import qualified Network.HTTP.Types.Method as Method
 import Network.URI                         (URI)
+
 ------------------------------------------------------------------------------
 -- Auxillary types
 ------------------------------------------------------------------------------