Skip to content

Commit a515601

Browse files
committed
Merge remote-tracking branch 'patch/develop' into extra-group-instances
2 parents 25b2155 + def3eb4 commit a515601

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

78 files changed

+131
-13579
lines changed

.travis.yml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -139,12 +139,12 @@ script:
139139
- cd ${DISTDIR} || false
140140
- find . -maxdepth 1 -type f -name '*.tar.gz' -exec tar -xvf '{}' \;
141141
- find . -maxdepth 1 -type f -name '*.tar.gz' -exec rm '{}' \;
142-
- PKGDIR_reflex="$(find . -maxdepth 1 -type d -regex '.*/reflex-[0-9.]*')"
142+
- PKGDIR_patch="$(find . -maxdepth 1 -type d -regex '.*/patch-[0-9.]*')"
143143
# Generate cabal.project
144144
- rm -rf cabal.project cabal.project.local cabal.project.freeze
145145
- touch cabal.project
146146
- |
147-
echo "packages: ${PKGDIR_reflex}" >> cabal.project
147+
echo "packages: ${PKGDIR_patch}" >> cabal.project
148148
- |
149149
- cat cabal.project || true
150150
- cat cabal.project.local || true
@@ -157,13 +157,11 @@ script:
157157
# Testing...
158158
- if ! $GHCJS ; then ${CABAL} v2-test $WITHCOMPILER ${TEST} ${BENCH} all | color_cabal_output ; fi
159159
# cabal check...
160-
- (cd ${PKGDIR_reflex} && ${CABAL} -vnormal check)
160+
- (cd ${PKGDIR_patch} && ${CABAL} -vnormal check)
161161
# haddock...
162162
- if ! $GHCJS ; then ${CABAL} v2-haddock $WITHCOMPILER ${TEST} ${BENCH} all | color_cabal_output ; fi
163163
# Constraint sets
164164
- rm -rf cabal.project.local
165-
# Constraint set no-th
166-
- ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks --constraint='reflex -use-template-haskell' all | color_cabal_output
167165
# Constraint set old-these
168166
- if $GHCJS || ! $GHCJS && [ $HCNUMVER -lt 80800 ] ; then ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks --constraint='these <1' all | color_cabal_output ; fi
169167
# Constraint set old-witherable

CONTRIBUTING.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ Before opening an issue, please check whether your issue has already been report
1515

1616
* Describe the issue you're encountering or the suggestion you're making
1717
* Include any relevant steps to reproduce or code samples you can. It's always easier for us to debug if we have something that demonstrates the error.
18-
* Let us know what version of reflex you were using. If you're using a github checkout, provide the git hash.
19-
* Describe how you're building reflex (i.e., via reflex-platform, cabal install, stack, obelisk, etc.). If you're using reflex-platform or obelisk, provide the git hash of your checkout.
18+
* Let us know what version of patch you were using. If you're using a github checkout, provide the git hash.
19+
* Describe how you're building patch (i.e., via patch-platform, cabal install, stack, obelisk, etc.). If you're using patch-platform or obelisk, provide the git hash of your checkout.
2020

2121
## Submitting Changes
2222

@@ -47,7 +47,7 @@ Make sure the project builds and that the tests pass! This will generally also b
4747

4848
#### Dependencies
4949

50-
Include version bounds whenever adding a dependency to the library stanza of the cabal file. Note that libraries added to reflex.cabal also need to be added to default.nix.
50+
Include version bounds whenever adding a dependency to the library stanza of the cabal file. Note that libraries added to patch.cabal also need to be added to default.nix.
5151

5252
### Documentation
5353

ChangeLog.md

Lines changed: 7 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -1,86 +1,15 @@
1-
# Revision history for reflex
1+
# Revision history for patch
22

33
## Unreleased
44

5-
* Add `Reflex.Query.Base.mapQueryT`. See that module for documentation
5+
* Support older GHCs with `split-these` flag.
66

7-
## 0.6.3
7+
* Additional instances for the `Group` class for basic types.
88

9-
* `Data.WeakBag.traverse` and `Data.FastWeakBag.traverse` have been deprecated.
10-
They are replaced with `Data.WeakBag.traverse_` and `Data.FastWeakBag.traverse_`, respectively.
9+
## 0.0.0.1
1110

12-
* Fixes a bug in `Reflex.Patch.MapWithMove.patchThatSortsMapWith` that was producing invalid `PatchMapWithMove`.
11+
* Remove unneeded dependencies
1312

14-
* Add missing `NotReady` instances:
15-
- `instance NotReady (SpiderTimeline x) (SpiderHost x)`
16-
- `instance HasSpiderTimeline x => NotReady (SpiderTimeline x) (PerformEventT (SpiderTimeline x) (SpiderHost x))`
13+
## 0.0.0.0
1714

18-
* Additional instances for `Group` and `Query` classes for basic types.
19-
20-
## 0.6.2.4
21-
22-
* Update to monoidal-containers 0.6
23-
24-
## 0.6.2.3
25-
26-
* Add an upper-bound to witherable
27-
28-
## 0.6.2.2
29-
30-
* Support these >= 1. Add `split-these` flag to control whether to use new these/semialign combination or not.
31-
32-
* Update version bounds to fix some CI failures
33-
34-
* Add travis CI configuration
35-
36-
## 0.6.2.1
37-
38-
* Generalize `fan` to `fanG` to take a `DMap` with non-`Identity`
39-
functor:
40-
* `fan` to `fanG`
41-
* `EventSelectorG` for `fanG` result selector.
42-
43-
* Reduce the amount of unsafeCoerce in coercing newtypes under Event/Dynamic/Behavior.
44-
* Add fused ReaderIO for the purpose of coercion (ReaderT's third argument has nominal role preventing automated coerce)
45-
* Add incrementalCoercion/coerceIncremental to go with dynamicCoercion/coerceDynamic
46-
47-
* Generalize merging functions:
48-
`merge` to `mergeG`,
49-
`mergeIncremental` to `mergeIncrementalG`,
50-
`mergeIncrementalWithMove` to `mergeIncrementalWithMoveG`.
51-
52-
* Generalize distribute function:
53-
`distributeDMapOverDynPure` to `distributeDMapOverDynPureG`,
54-
55-
## 0.6.2.0
56-
57-
* Fix `holdDyn` so that it is lazy in its event argument
58-
These produce `DMap`s whose values needn't be `Identity`.
59-
60-
* Stop using the now-deprecated `*Tag` classes (e.g., `ShowTag`).
61-
62-
* Fix `holdDyn` so that it is lazy in its event argument.
63-
64-
## 0.6.1.0
65-
66-
* Re-export all of `Data.Map.Monoidal`
67-
68-
* Fix `QueryT` and `RequesterT` tests
69-
70-
## 0.6.0.0 -- 2019-03-20
71-
72-
* Deprecate `FunctorMaybe` in favor of `Data.Witherable.Filterable`. We still export `fmapMaybe`, `ffilter`, etc., but they all rely on `Filterable` now.
73-
74-
* Rename `MonadDynamicWriter` to `DynamicWriter` and add a deprecation for the old name.
75-
76-
* Remove many deprecated functions.
77-
78-
* Add a `Num` instance for `Dynamic`.
79-
80-
* Add `matchRequestsWithResponses` to make it easier to use `Requester` with protocols that don't do this matching for you.
81-
82-
* Add `withRequesterT` to map functions over the request and response of a `RequesterT`.
83-
84-
* Suppress nil patches in `QueryT` as an optimization. The `Query` type must now have an `Eq` instance.
85-
86-
* Add `throttleBatchWithLag` to `Reflex.Time`. See that module for details.
15+
* Extract patching functionality from Reflex.

0 commit comments

Comments
 (0)