Skip to content

Commit 6d9e3ed

Browse files
Update to PureScript v0.15.0 (#160)
* Update to CI to use 'unstable' purescript * Add CI test: verify 'bower.json' file works via pulp * Ignore spago-based tests (temporarily) * Update Bower dependencies to master or main * Update packages.dhall to 'prepare-0.15' package set * Installed bower dev dependency: purescript-assert@master * Drop MonadZero instance * Added changelog entry * Update .github/workflows/ci.yml Co-authored-by: Thomas Honeyman <[email protected]> Co-authored-by: Thomas Honeyman <[email protected]>
1 parent 24d6693 commit 6d9e3ed

File tree

5 files changed

+56
-43
lines changed

5 files changed

+56
-43
lines changed

.github/workflows/ci.yml

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ jobs:
1616
- name: Set up a PureScript toolchain
1717
uses: purescript-contrib/setup-purescript@main
1818
with:
19+
purescript: "unstable"
1920
purs-tidy: "latest"
2021

2122
- name: Cache PureScript dependencies
@@ -35,8 +36,17 @@ jobs:
3536
- name: Install dev dependencies
3637
run: spago -x spago-dev.dhall install
3738

38-
- name: Run tests
39-
run: spago -x spago-dev.dhall test --no-install
39+
# - name: Run tests
40+
# run: spago -x spago-dev.dhall test --no-install
4041

4142
- name: Check formatting
4243
run: purs-tidy check src test bench
44+
45+
- name: Verify Bower & Pulp
46+
run: |
47+
npm install bower [email protected]
48+
npx bower install
49+
npx pulp build -- --censor-lib --strict
50+
if [ -d "test" ]; then
51+
npx pulp test
52+
fi

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ Notable changes to this project are documented in this file. The format is based
55
## [Unreleased]
66

77
Breaking changes:
8+
- Update project and deps to PureScript v0.15.0 (#160 by @JordanMartinez)
9+
- Drop deprecated `MonadZero` instance (#160 by @JordanMartinez)
810

911
New features:
1012

bower.json

Lines changed: 39 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,41 @@
11
{
2-
"name": "purescript-parsing",
3-
"license": [
4-
"BSD-2-Clause"
5-
],
6-
"repository": {
7-
"type": "git",
8-
"url": "https://github.com/purescript-contrib/purescript-parsing.git"
9-
},
10-
"ignore": [
11-
"**/.*",
12-
"node_modules",
13-
"bower_components",
14-
"output"
15-
],
16-
"dependencies": {
17-
"purescript-arrays": "^v6.0.1",
18-
"purescript-control": "^v5.0.0",
19-
"purescript-either": "^v5.0.0",
20-
"purescript-foldable-traversable": "^v5.0.1",
21-
"purescript-identity": "^v5.0.0",
22-
"purescript-integers": "^v5.0.0",
23-
"purescript-lists": "^v6.0.1",
24-
"purescript-math": "^v3.0.0",
25-
"purescript-maybe": "^v5.0.0",
26-
"purescript-newtype": "^v4.0.0",
27-
"purescript-numbers": "^v8.0.0",
28-
"purescript-prelude": "^v5.0.1",
29-
"purescript-record": "^v3.0.0",
30-
"purescript-strings": "^v5.0.0",
31-
"purescript-tailrec": "^v5.0.1",
32-
"purescript-transformers": "^v5.1.0",
33-
"purescript-tuples": "^v6.0.1",
34-
"purescript-unfoldable": "^v5.0.0",
35-
"purescript-unicode": "^v5.0.0",
36-
"purescript-unsafe-coerce": "^v5.0.0"
37-
}
2+
"name": "purescript-parsing",
3+
"license": [
4+
"BSD-2-Clause"
5+
],
6+
"repository": {
7+
"type": "git",
8+
"url": "https://github.com/purescript-contrib/purescript-parsing.git"
9+
},
10+
"ignore": [
11+
"**/.*",
12+
"node_modules",
13+
"bower_components",
14+
"output"
15+
],
16+
"dependencies": {
17+
"purescript-arrays": "master",
18+
"purescript-control": "master",
19+
"purescript-either": "master",
20+
"purescript-foldable-traversable": "master",
21+
"purescript-identity": "master",
22+
"purescript-integers": "master",
23+
"purescript-lists": "master",
24+
"purescript-math": "master",
25+
"purescript-maybe": "master",
26+
"purescript-newtype": "master",
27+
"purescript-numbers": "master",
28+
"purescript-prelude": "master",
29+
"purescript-record": "master",
30+
"purescript-strings": "master",
31+
"purescript-tailrec": "master",
32+
"purescript-transformers": "master",
33+
"purescript-tuples": "master",
34+
"purescript-unfoldable": "master",
35+
"purescript-unicode": "main",
36+
"purescript-unsafe-coerce": "master"
37+
},
38+
"devDependencies": {
39+
"purescript-assert": "master"
40+
}
3841
}

packages.dhall

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
let upstream =
2-
https://github.com/purescript/package-sets/releases/download/psc-0.14.3-20210722/packages.dhall sha256:1ceb43aa59436bf5601bac45f6f3781c4e1f0e4c2b8458105b018e5ed8c30f8c
2+
https://raw.githubusercontent.com/purescript/package-sets/prepare-0.15/src/packages.dhall
33

44
in upstream

src/Text/Parsing/Parser.purs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import Control.Monad.Except (class MonadError, ExceptT(..), mapExceptT, runExcep
2626
import Control.Monad.Rec.Class (class MonadRec)
2727
import Control.Monad.State (class MonadState, StateT(..), evalStateT, gets, mapStateT, modify_, runStateT)
2828
import Control.Monad.Trans.Class (class MonadTrans, lift)
29-
import Control.MonadPlus (class Alternative, class MonadPlus, class MonadZero, class Plus)
29+
import Control.MonadPlus (class Alternative, class MonadPlus, class Plus)
3030
import Data.Either (Either(..))
3131
import Data.Identity (Identity)
3232
import Data.Newtype (class Newtype, over, unwrap)
@@ -139,7 +139,7 @@ derive newtype instance monadErrorParserT :: Monad m => MonadError ParseError (P
139139
-- |
140140
-- | If we read a file from disk and run this `fileParser` on it and the
141141
-- | `string "<html>"` parser succeeds, then we know that the first branch
142-
-- | is the correct branch, so we want to commit to the first branch.
142+
-- | is the correct branch, so we want to commit to the first branch.
143143
-- | Even if the `parseTheRestOfTheHtml` parser fails
144144
-- | we don’t want to try the second branch.
145145
-- |
@@ -164,8 +164,6 @@ instance plusParserT :: Monad m => Plus (ParserT s m) where
164164

165165
instance alternativeParserT :: Monad m => Alternative (ParserT s m)
166166

167-
instance monadZeroParserT :: Monad m => MonadZero (ParserT s m)
168-
169167
instance monadPlusParserT :: Monad m => MonadPlus (ParserT s m)
170168

171169
instance monadTransParserT :: MonadTrans (ParserT s) where

0 commit comments

Comments
 (0)