Skip to content

Updates for 0.11, remove deprecated generics dependency #16

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Apr 7, 2017
Merged

Updates for 0.11, remove deprecated generics dependency #16

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8b821ee
Updates for 0.11, remove deprecated generics dependency
paf31 Apr 5, 2017
f7210d4
Remove test calls
paf31 Apr 5, 2017
1bb5e24
stable
paf31 Apr 7, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 1 addition & 7 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,10 @@ language: node_js
dist: trusty
sudo: required
node_js: 6
Copy link
Member

@garyb garyb Apr 6, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've been updating this to stable in other builds.

env:
- PATH=$HOME/purescript:$PATH
install:
- TAG=$(wget -q -O - https://github.com/purescript/purescript/releases/latest --server-response --max-redirect 0 2>&1 | sed -n -e 's/.*Location:.*tag\///p')
- wget -O $HOME/purescript.tar.gz https://github.com/purescript/purescript/releases/download/$TAG/linux64.tar.gz
- tar -xvf $HOME/purescript.tar.gz -C $HOME/
- chmod a+x $HOME/purescript
- npm install -g bower
- npm install
- bower install
- bower install --production
script:
- npm run -s build
after_success:
Expand Down
2 changes: 1 addition & 1 deletion bower.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@
"package.json"
],
"dependencies": {
"purescript-generics": "^3.0.0"
"purescript-tuples": "^4.0.0"
}
}
9 changes: 5 additions & 4 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,12 @@
"private": true,
"scripts": {
"clean": "rimraf output && rimraf .pulp-cache",
"build": "pulp build --censor-lib --strict"
"build": "pulp build -- --censor-lib --strict"
},
"devDependencies": {
"pulp": "^9.0.0",
"purescript-psa": "^0.3.9",
"rimraf": "^2.5.0"
"pulp": "^11.0.0",
"purescript-psa": "^0.5.0",
"purescript": "^0.11.1",
"rimraf": "^2.5.4"
}
}
2 changes: 0 additions & 2 deletions src/Data/These.purs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import Control.Extend (class Extend)
import Data.Bifunctor (class Bifunctor)
import Data.Bitraversable (class Bitraversable, class Bifoldable, bitraverse)
import Data.Functor.Invariant (class Invariant, imapF)
import Data.Generic (class Generic)
import Data.Maybe (Maybe(..))
import Data.Traversable (class Traversable, class Foldable, foldMap, foldl, foldr)
import Data.Tuple (Tuple(..))
Expand All @@ -19,7 +18,6 @@ data These a b

derive instance eqThese :: (Eq a, Eq b) => Eq (These a b)
derive instance ordThese :: (Ord a, Ord b) => Ord (These a b)
derive instance genericThese :: (Generic a, Generic b) => Generic (These a b)

instance semigroupThese :: (Semigroup a, Semigroup b) => Semigroup (These a b) where
append (This a) (This b) = This (a <> b)
Expand Down