Skip to content

Commit

Permalink
Resolve warnings and build errors and build against recent stack lts
Browse files Browse the repository at this point in the history
  • Loading branch information
erewok committed Dec 1, 2018
1 parent 9f83ef4 commit 6e7f110
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 36 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,5 @@
build/
examples/*py
__pycache__
dist-newstyle
*ghc.environment*
6 changes: 3 additions & 3 deletions servant-py.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@ description:
Automatically derive python functions to query servant webservices.
.
Supports deriving functions using Python's requests library.
homepage: https://github.com/pellagic-puffbomb/servant-py#readme
homepage: https://github.com/erewok/servant-py#readme
license: BSD3
license-file: LICENSE
author: Erik Aker
maintainer: [email protected]
copyright: 2017 Erik Aker
copyright: 2019 Erik Aker
category: Web
build-type: Simple
extra-source-files: README.md
Expand Down Expand Up @@ -89,4 +89,4 @@ test-suite servant-py-test

source-repository head
type: git
location: https://github.com/pellagic-puffbomb/servant-py
location: https://github.com/erewok/servant-py
32 changes: 1 addition & 31 deletions src/Servant/PY/Internal.hs
Original file line number Diff line number Diff line change
Expand Up @@ -37,44 +37,14 @@ module Servant.PY.Internal
, functionArguments
, formatBuilder
, remainingReqCall
-- re-exports
, (:<|>)(..)
, (:>)
, defReq
, reqHeaders
, HasForeign(..)
, HasForeignType(..)
, GenerateList(..)
, NoTypes
, ArgType(..)
, HeaderArg(..)
, QueryArg(..)
, Req(..)
, Segment(..)
, SegmentType(..)
, Url(..)
, Path
, Arg(..)
, FunctionName(..)
, PathSegment(..)
, concatCase
, snakeCase
, camelCase
, ReqBody
, JSON
, FormUrlEncoded
, Post
, Get
, Raw
, Header
) where

import Control.Lens hiding (List)
import qualified Data.CharSet as Set
import qualified Data.CharSet.Unicode.Category as Set
import Data.Data
import Data.Maybe (isJust)
import Data.Monoid()
import Data.Monoid ( (<>) )
import Data.Text (Text)
import qualified Data.Text as T
import Data.Text.Encoding (decodeUtf8)
Expand Down
2 changes: 1 addition & 1 deletion src/Servant/PY/Requests.hs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module Servant.PY.Requests where

import Data.Monoid()
import Data.Monoid ( (<>) )
import Data.Proxy
import Data.Text (Text)
import qualified Data.Text as T
Expand Down
2 changes: 1 addition & 1 deletion stack.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# For more information, see: http://docs.haskellstack.org/en/stable/yaml_configuration/

# Specifies the GHC version and set of packages available (e.g., lts-3.5, nightly-2015-09-21, ghc-7.10.2)
resolver: lts-7.19
resolver: lts-12.20

# Local packages, usually specified by relative directory name
packages:
Expand Down

0 comments on commit 6e7f110

Please sign in to comment.