Update cabal bounds (#1319)

* Relax some cabal upper bounds

Primarily based on building against GHC 8.6.5 with stackage lts-13.23.

* Add swagger2 upper bound

With swagger2 2.4, we get a number of errors like the following:

src/PostgREST/OpenAPI.hs:58:11: error:
    • Couldn't match type ‘Maybe
                             (SwaggerType 'Data.Swagger.Internal.SwaggerKindSchema)’
                     with ‘SwaggerType 'Data.Swagger.Internal.SwaggerKindSchema’
        arising from a functional dependency between:
          constraint ‘HasType
                        Schema (SwaggerType 'Data.Swagger.Internal.SwaggerKindSchema)’
            arising from a use of ‘type_’
          instance ‘HasType
                      Schema
                      (Maybe (SwaggerType 'Data.Swagger.Internal.SwaggerKindSchema))’
            at <no location info>
    • In the first argument of ‘(.~)’, namely ‘type_’
      In the second argument of ‘(&)’, namely ‘type_ .~ SwaggerObject’
      In the first argument of ‘(&)’, namely
        ‘(mempty :: Schema) & description .~ tableDescription t
           & type_ .~ SwaggerObject’
   |
58 |         & type_ .~ SwaggerObject
   |           ^^^^^

* Require base 4.9 / GHC 8.0.1

The DuplicateRecordFields extension, which is used here,
was introduced with GHC 8.0.

* Set cabal lower bounds

These are based on building against stackage lts-7.24 / GHC 8.0.1.

* Set cabal upper bounds, and truncate lower bounds

These are primarily based on the output of `cabal bounds`, with a good
build against GHC 8.6.5. Some test dependencies were missing; these
were filled out based on a build against stackage nightly.

Also I truncated lower bounds to the third level, since that is what
`cabal bounds` seems to suggest anyway.

* Format postgrest.cabal using stylish-cabal

* Sort build-depends list
This commit is contained in:
Robert
2019-06-08 21:42:28 -05:00
committed by Steve Chávez
parent 7356327e5b
commit ea82b9f820
+174 -172
View File
@@ -1,179 +1,181 @@
name: postgrest name: postgrest
description: Reads the schema of a PostgreSQL database and creates RESTful routes version: 5.2.0
for the tables and views, supporting all HTTP verbs that security synopsis: REST API for any Postgres database
permits. description: Reads the schema of a PostgreSQL database and creates RESTful routes
version: 5.2.0 for the tables and views, supporting all HTTP verbs that security
synopsis: REST API for any Postgres database permits.
license: MIT license: MIT
license-file: LICENSE license-file: LICENSE
author: Joe Nelson, Adam Baker author: Joe Nelson, Adam Baker
homepage: https://postgrest.org maintainer: Steve Chávez <stevechavezast@gmail.com>
maintainer: Steve Chávez <stevechavezast@gmail.com> category: Executable, PostgreSQL, Network APIs
bug-reports: https://github.com/PostgREST/postgrest/issues homepage: https://postgrest.org
category: Executable, PostgreSQL, Network APIs bug-reports: https://github.com/PostgREST/postgrest/issues
extra-source-files: CHANGELOG.md build-type: Simple
build-type: Simple extra-source-files: CHANGELOG.md
cabal-version: >=1.10 cabal-version: >= 1.10
source-repository head source-repository head
type: git type: git
location: git://github.com/PostgREST/postgrest.git location: git://github.com/PostgREST/postgrest.git
Flag CI flag ci
Description: No warnings allowed in continuous integration default: False
Manual: True manual: True
Default: False description: No warnings allowed in continuous integration
executable postgrest
main-is: Main.hs
default-extensions: OverloadedStrings, QuasiQuotes, NoImplicitPrelude
ghc-options:
-threaded
-rtsopts
"-with-rtsopts=-N -I2"
default-language: Haskell2010
build-depends: auto-update
, base >= 4.8 && < 4.10
, hasql >= 1.3 && < 1.4
, hasql-pool >= 0.5 && < 0.6
, hasql-transaction >= 0.7 && < 0.8
, network == 2.6.3.2
, postgrest
, protolude == 0.2.2
, retry
, text
, time
, warp
, bytestring
, base64-bytestring
, retry
, directory
if !os(windows)
build-depends: unix
hs-source-dirs: main
library library
default-language: Haskell2010 exposed-modules: PostgREST.ApiRequest
default-extensions: OverloadedStrings, QuasiQuotes, NoImplicitPrelude PostgREST.App
build-depends: aeson PostgREST.Auth
, ansi-wl-pprint PostgREST.Config
, base >= 4.8 && < 4.10 PostgREST.DbRequestBuilder
, base64-bytestring PostgREST.DbStructure
, bytestring PostgREST.Error
, case-insensitive PostgREST.Middleware
, cassava PostgREST.OpenAPI
, configurator-pg >= 0.1 && < 0.2 PostgREST.Parsers
, containers PostgREST.QueryBuilder
, contravariant PostgREST.RangeQuery
, contravariant-extras PostgREST.Types
, cookie other-modules: Paths_postgrest
, either hs-source-dirs: src
, gitrev build-depends: base >= 4.9 && < 4.13
, hasql >= 1.3 && < 1.4 , HTTP >= 4000.3.7 && < 4000.4
, hasql-pool >= 0.5 && < 0.6 , Ranged-sets >= 0.3 && < 0.5
, hasql-transaction >= 0.7 && < 0.8 , aeson >= 0.11.3 && < 1.5
, heredoc , ansi-wl-pprint >= 0.6.7 && < 0.7
, HTTP , base64-bytestring >= 1 && < 1.1
, http-types >= 0.12.2 , bytestring >= 0.10.8 && < 0.11
, insert-ordered-containers , case-insensitive >= 1.2 && < 1.3
, interpolatedstring-perl6 , cassava >= 0.4.5 && < 0.6
, jose == 0.7.0.0 , configurator-pg >= 0.1 && < 0.2
, lens , containers >= 0.5.7 && < 0.7
, lens-aeson , contravariant >= 1.4 && < 1.6
, network-uri , contravariant-extras >= 0.3.3 && < 0.4
, optparse-applicative >= 0.13 && < 0.15 , cookie >= 0.4.2 && < 0.5
, parsec , either >= 4.4.1 && < 5.1
, protolude == 0.2.2 , gitrev >= 1.2 && < 1.4
, Ranged-sets == 0.3.0 , hasql >= 1.3 && < 1.4
, regex-tdfa , hasql-pool >= 0.5 && < 0.6
, scientific , hasql-transaction >= 0.7 && < 0.8
, swagger2 , heredoc >= 0.2 && < 0.3
, text , http-types >= 0.12.2 && < 0.13
, time , insert-ordered-containers >= 0.1 && < 0.3
, unordered-containers , interpolatedstring-perl6 >= 1 && < 1.1
, vector , jose >= 0.7 && < 0.8
, wai , lens >= 4.14 && < 4.18
, wai-cors , lens-aeson >= 1.0.1 && < 1.1
, wai-extra , network-uri >= 2.6.1 && < 2.7
, wai-middleware-static , optparse-applicative >= 0.13 && < 0.15
, parsec >= 3.1.11 && < 3.2
, protolude >= 0.2.2 && < 0.3
, regex-tdfa >= 1.2.2 && < 1.3
, scientific >= 0.3.4 && < 0.4
, swagger2 >= 2.1.4 && < 2.4
, text >= 1.2.2 && < 1.3
, time >= 1.6 && < 1.9
, unordered-containers >= 0.2.8 && < 0.3
, vector >= 0.11 && < 0.13
, wai >= 3.2.1 && < 3.3
, wai-cors >= 0.2.5 && < 0.3
, wai-extra >= 3.0.19 && < 3.1
, wai-middleware-static >= 0.8.1 && < 0.9
default-language: Haskell2010
default-extensions: OverloadedStrings
QuasiQuotes
NoImplicitPrelude
Other-Modules: Paths_postgrest executable postgrest
Exposed-Modules: PostgREST.ApiRequest main-is: Main.hs
, PostgREST.App hs-source-dirs: main
, PostgREST.Auth build-depends: base >= 4.9 && < 4.13
, PostgREST.Config , auto-update >= 0.1.4 && < 0.2
, PostgREST.DbStructure , base64-bytestring >= 1 && < 1.1
, PostgREST.DbRequestBuilder , bytestring >= 0.10.8 && < 0.11
, PostgREST.Error , directory >= 1.2.6 && < 1.4
, PostgREST.Middleware , hasql >= 1.3 && < 1.4
, PostgREST.OpenAPI , hasql-pool >= 0.5 && < 0.6
, PostgREST.Parsers , hasql-transaction >= 0.7 && < 0.8
, PostgREST.QueryBuilder , network < 2.9
, PostgREST.RangeQuery , postgrest
, PostgREST.Types , protolude >= 0.2.2 && < 0.3
hs-source-dirs: src , retry >= 0.7.4 && < 0.9
, text >= 1.2.2 && < 1.3
, time >= 1.6 && < 1.9
, warp >= 3.2.12 && < 3.3
default-language: Haskell2010
default-extensions: OverloadedStrings
QuasiQuotes
NoImplicitPrelude
ghc-options: -threaded -rtsopts "-with-rtsopts=-N -I2"
Test-Suite spec if !os(windows)
Type: exitcode-stdio-1.0 build-depends: unix
Default-Language: Haskell2010
default-extensions: OverloadedStrings, QuasiQuotes, NoImplicitPrelude test-suite spec
ghc-options: -threaded -rtsopts -with-rtsopts=-N type: exitcode-stdio-1.0
Hs-Source-Dirs: test main-is: Main.hs
Main-Is: Main.hs other-modules: Feature.AndOrParamsSpec
Other-Modules: Feature.AudienceJwtSecretSpec Feature.AsymmetricJwtSpec
, Feature.AuthSpec Feature.AudienceJwtSecretSpec
, Feature.AsymmetricJwtSpec Feature.AuthSpec
, Feature.BinaryJwtSecretSpec Feature.BinaryJwtSecretSpec
, Feature.ConcurrentSpec Feature.ConcurrentSpec
, Feature.CorsSpec Feature.CorsSpec
, Feature.DeleteSpec Feature.DeleteSpec
, Feature.ExtraSearchPathSpec Feature.ExtraSearchPathSpec
, Feature.InsertSpec Feature.InsertSpec
, Feature.JsonOperatorSpec Feature.JsonOperatorSpec
, Feature.NoJwtSpec Feature.NoJwtSpec
, Feature.PgVersion95Spec Feature.NonexistentSchemaSpec
, Feature.PgVersion96Spec Feature.PgVersion95Spec
, Feature.ProxySpec Feature.PgVersion96Spec
, Feature.QueryLimitedSpec Feature.ProxySpec
, Feature.QuerySpec Feature.QueryLimitedSpec
, Feature.RangeSpec Feature.QuerySpec
, Feature.SingularSpec Feature.RangeSpec
, Feature.StructureSpec Feature.RpcSpec
, Feature.UnicodeSpec Feature.SingularSpec
, Feature.AndOrParamsSpec Feature.StructureSpec
, Feature.RpcSpec Feature.UnicodeSpec
, Feature.NonexistentSchemaSpec Feature.UpsertSpec
, Feature.UpsertSpec SpecHelper
, SpecHelper TestTypes
, TestTypes hs-source-dirs: test
Build-Depends: aeson build-depends: base >= 4.9 && < 4.13
, aeson-qq , aeson >= 0.11.3 && < 1.5
, async , aeson-qq >= 0.8.1 && < 0.9
, auto-update , async >= 2.1.1 && < 2.3
, base >= 4.8 && < 4.10 , auto-update >= 0.1.4 && < 0.2
, bytestring , base64-bytestring >= 1 && < 1.1
, base64-bytestring , bytestring >= 0.10.8 && < 0.11
, case-insensitive , case-insensitive >= 1.2 && < 1.3
, cassava , cassava >= 0.4.5 && < 0.6
, containers , containers >= 0.5.7 && < 0.7
, contravariant , contravariant >= 1.4 && < 1.6
, hasql >= 1.3 && < 1.4 , hasql >= 1.3 && < 1.4
, hasql-pool >= 0.5 && < 0.6 , hasql-pool >= 0.5 && < 0.6
, hasql-transaction >= 0.7 && < 0.8 , hasql-transaction >= 0.7 && < 0.8
, heredoc , heredoc >= 0.2 && < 0.3
, hspec , hspec >= 2.3 && < 2.8
, hspec-wai >= 0.7.0 , hspec-wai >= 0.7 && < 0.10
, hspec-wai-json , hspec-wai-json >= 0.7 && < 0.10
, http-types , http-types >= 0.12.3 && < 0.13
, lens , lens >= 4.14 && < 4.18
, lens-aeson , lens-aeson >= 1.0.1 && < 1.1
, monad-control , monad-control >= 1.0.1 && < 1.1
, postgrest , postgrest
, process , process >= 1.4.2 && < 1.7
, protolude == 0.2.2 , protolude >= 0.2.2 && < 0.3
, regex-tdfa , regex-tdfa >= 1.2.2 && < 1.3
, text , text >= 1.2.2 && < 1.3
, time , time >= 1.6 && < 1.9
, transformers-base , transformers-base >= 0.4.4 && < 0.5
, wai , wai >= 3.2.1 && < 3.3
, wai-extra , wai-extra >= 3.0.19 && < 3.1
default-language: Haskell2010
default-extensions: OverloadedStrings
QuasiQuotes
NoImplicitPrelude
ghc-options: -threaded -rtsopts -with-rtsopts=-N