Skip to content

Commit

Permalink
Merge branch 'master'
Browse files Browse the repository at this point in the history
  • Loading branch information
tkf committed Jul 12, 2020
2 parents 294d1d7 + 66c3211 commit 7f0dd29
Show file tree
Hide file tree
Showing 7 changed files with 14 additions and 6 deletions.
1 change: 1 addition & 0 deletions .github/workflows/TagBot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ on:
push:
branches:
- actions/trigger/TagBot
workflow_dispatch:
jobs:
TagBot:
runs-on: ubuntu-latest
Expand Down
4 changes: 4 additions & 0 deletions .mergify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ pull_request_rules:
- status-success=Test Julia ^1.5.0-rc1
- status-success=Test Julia 1.4
- status-success=Test Julia 1.3
- status-success=Benchmark
- status-success=Documenter
- label=ready-to-merge:squash
- label!=work-in-progress
Expand All @@ -24,6 +25,7 @@ pull_request_rules:
- status-success=Test Julia ^1.5.0-rc1
- status-success=Test Julia 1.4
- status-success=Test Julia 1.3
- status-success=Benchmark
- status-success=Documenter
- label=ready-to-merge:rebase
- label!=work-in-progress
Expand All @@ -37,6 +39,7 @@ pull_request_rules:
- status-success=Test Julia ^1.5.0-rc1
- status-success=Test Julia 1.4
- status-success=Test Julia 1.3
- status-success=Benchmark
- status-success=Documenter
- label=ready-to-merge:merge
- label!=work-in-progress
Expand All @@ -50,6 +53,7 @@ pull_request_rules:
- status-success=Test Julia ^1.5.0-rc1
- status-success=Test Julia 1.4
- status-success=Test Julia 1.3
- status-success=Benchmark
- status-success=Documenter
- label~=ready-to-merge:.*
actions:
Expand Down
4 changes: 2 additions & 2 deletions Project.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name = "ThreadsX"
uuid = "ac1d9e8a-700a-412c-b207-f0111f4b6c0d"
authors = ["Takafumi Arakaki <[email protected]>"]
version = "0.1.4-DEV"
version = "0.1.5-DEV"

[deps]
ArgCheck = "dce04be8-c92d-5529-be00-80e4d2c0e197"
Expand All @@ -19,7 +19,7 @@ BangBang = "0.3.17"
ConstructionBase = "0.1.0, 1.0"
InitialValues = "0.2"
Referenceables = "0.1"
Setfield = "0.3, 0.4, 0.5, 0.6"
Setfield = "0.3, 0.4, 0.5, 0.6, 0.7"
SplittablesBase = "0.1.8"
Transducers = "0.4.39"
julia = "1"
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ all findfirst map! reduce
### Rich collection support

The `reduce`-based functions support any collections that implement
[`SplittablesBase.jl`](https://github.com/tkf/SplittablesBase.jl)
[`SplittablesBase.jl`](https://github.com/JuliaFolds/SplittablesBase.jl)
interface including arrays, `Dict`, `Set`, and iterator
transformations. In particular, these functions support iterator
comprehension:
Expand Down Expand Up @@ -103,8 +103,8 @@ value, `basesize` must be specified explicitly.
## Implementations

Most of `reduce`-based functions are implemented as thin wrappers of
[`Transducers.jl`](https://github.com/tkf/Transducers.jl).
[`Transducers.jl`](https://github.com/JuliaFolds/Transducers.jl).

Custom collections can support ThreadsX.jl API by implementing
[`SplittablesBase.jl`](https://github.com/tkf/SplittablesBase.jl)
[`SplittablesBase.jl`](https://github.com/JuliaFolds/SplittablesBase.jl)
interface.
1 change: 1 addition & 0 deletions docs/Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,6 @@ BangBang = "198e06fe-97b7-11e9-32a5-e1d131e6ad66"
Documenter = "e30172f5-a6a5-5a46-863b-614d45cd2de4"
JSON = "682c06a0-de6a-54ab-a142-c8b1cf79cde6"
OnlineStats = "a15396b6-48d5-5d58-9928-6d29437db91e"
SplittablesBase = "171d559e-b47b-412a-8079-5efa626c420e"
ThreadsX = "ac1d9e8a-700a-412c-b207-f0111f4b6c0d"
Transducers = "28d57a85-8fef-5791-bfe6-a80928e7c999"
3 changes: 2 additions & 1 deletion src/ThreadsX.jl
Original file line number Diff line number Diff line change
Expand Up @@ -39,13 +39,14 @@ using ArgCheck: @argcheck, @check
using BangBang: SingletonVector, append!!, push!!, union!!
using Base: Ordering, add_sum, mapreduce_empty, mul_prod, reduce_empty
using ConstructionBase: setproperties
using InitialValues: Init, asmonoid
using InitialValues: asmonoid
using Referenceables: referenceable
using Setfield: @set
using Transducers:
Cat,
Empty,
Filter,
Init,
Map,
MapSplat,
OnInit,
Expand Down
1 change: 1 addition & 0 deletions test/environments/main/Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ Documenter = "e30172f5-a6a5-5a46-863b-614d45cd2de4"
OnlineStats = "a15396b6-48d5-5d58-9928-6d29437db91e"
Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
Referenceables = "42d2dcc6-99eb-4e98-b66c-637b7d73030e"
SplittablesBase = "171d559e-b47b-412a-8079-5efa626c420e"
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
ThreadsX = "ac1d9e8a-700a-412c-b207-f0111f4b6c0d"
Transducers = "28d57a85-8fef-5791-bfe6-a80928e7c999"
Expand Down

0 comments on commit 7f0dd29

Please sign in to comment.