Skip to content

Commit c6c3068

Browse files
committed
Merge branch 'master'
2 parents 294d1d7 + 66c3211 commit c6c3068

File tree

7 files changed

+14
-6
lines changed

7 files changed

+14
-6
lines changed

.github/workflows/TagBot.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ on:
55
push:
66
branches:
77
- actions/trigger/TagBot
8+
workflow_dispatch:
89
jobs:
910
TagBot:
1011
runs-on: ubuntu-latest

.mergify.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ pull_request_rules:
1111
- status-success=Test Julia ^1.5.0-rc1
1212
- status-success=Test Julia 1.4
1313
- status-success=Test Julia 1.3
14+
- status-success=Benchmark
1415
- status-success=Documenter
1516
- label=ready-to-merge:squash
1617
- label!=work-in-progress
@@ -24,6 +25,7 @@ pull_request_rules:
2425
- status-success=Test Julia ^1.5.0-rc1
2526
- status-success=Test Julia 1.4
2627
- status-success=Test Julia 1.3
28+
- status-success=Benchmark
2729
- status-success=Documenter
2830
- label=ready-to-merge:rebase
2931
- label!=work-in-progress
@@ -37,6 +39,7 @@ pull_request_rules:
3739
- status-success=Test Julia ^1.5.0-rc1
3840
- status-success=Test Julia 1.4
3941
- status-success=Test Julia 1.3
42+
- status-success=Benchmark
4043
- status-success=Documenter
4144
- label=ready-to-merge:merge
4245
- label!=work-in-progress
@@ -50,6 +53,7 @@ pull_request_rules:
5053
- status-success=Test Julia ^1.5.0-rc1
5154
- status-success=Test Julia 1.4
5255
- status-success=Test Julia 1.3
56+
- status-success=Benchmark
5357
- status-success=Documenter
5458
- label~=ready-to-merge:.*
5559
actions:

Project.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name = "ThreadsX"
22
uuid = "ac1d9e8a-700a-412c-b207-f0111f4b6c0d"
33
authors = ["Takafumi Arakaki <aka.tkf@gmail.com>"]
4-
version = "0.1.4-DEV"
4+
version = "0.1.5-DEV"
55

66
[deps]
77
ArgCheck = "dce04be8-c92d-5529-be00-80e4d2c0e197"
@@ -19,7 +19,7 @@ BangBang = "0.3.17"
1919
ConstructionBase = "0.1.0, 1.0"
2020
InitialValues = "0.2"
2121
Referenceables = "0.1"
22-
Setfield = "0.3, 0.4, 0.5, 0.6"
22+
Setfield = "0.3, 0.4, 0.5, 0.6, 0.7"
2323
SplittablesBase = "0.1.8"
2424
Transducers = "0.4.39"
2525
julia = "1"

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ all findfirst map! reduce
3333
### Rich collection support
3434

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

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

108108
Custom collections can support ThreadsX.jl API by implementing
109-
[`SplittablesBase.jl`](https://github.com/tkf/SplittablesBase.jl)
109+
[`SplittablesBase.jl`](https://github.com/JuliaFolds/SplittablesBase.jl)
110110
interface.

docs/Project.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,6 @@ BangBang = "198e06fe-97b7-11e9-32a5-e1d131e6ad66"
33
Documenter = "e30172f5-a6a5-5a46-863b-614d45cd2de4"
44
JSON = "682c06a0-de6a-54ab-a142-c8b1cf79cde6"
55
OnlineStats = "a15396b6-48d5-5d58-9928-6d29437db91e"
6+
SplittablesBase = "171d559e-b47b-412a-8079-5efa626c420e"
67
ThreadsX = "ac1d9e8a-700a-412c-b207-f0111f4b6c0d"
78
Transducers = "28d57a85-8fef-5791-bfe6-a80928e7c999"

src/ThreadsX.jl

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,13 +39,14 @@ using ArgCheck: @argcheck, @check
3939
using BangBang: SingletonVector, append!!, push!!, union!!
4040
using Base: Ordering, add_sum, mapreduce_empty, mul_prod, reduce_empty
4141
using ConstructionBase: setproperties
42-
using InitialValues: Init, asmonoid
42+
using InitialValues: asmonoid
4343
using Referenceables: referenceable
4444
using Setfield: @set
4545
using Transducers:
4646
Cat,
4747
Empty,
4848
Filter,
49+
Init,
4950
Map,
5051
MapSplat,
5152
OnInit,

test/environments/main/Project.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ Documenter = "e30172f5-a6a5-5a46-863b-614d45cd2de4"
55
OnlineStats = "a15396b6-48d5-5d58-9928-6d29437db91e"
66
Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
77
Referenceables = "42d2dcc6-99eb-4e98-b66c-637b7d73030e"
8+
SplittablesBase = "171d559e-b47b-412a-8079-5efa626c420e"
89
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
910
ThreadsX = "ac1d9e8a-700a-412c-b207-f0111f4b6c0d"
1011
Transducers = "28d57a85-8fef-5791-bfe6-a80928e7c999"

0 commit comments

Comments
 (0)