Skip to content

Commit

Permalink
Merge pull request #42 from JuliaImages/teh/deps
Browse files Browse the repository at this point in the history
Rely on ImageCore for Colors
  • Loading branch information
timholy authored Dec 29, 2019
2 parents 956bc07 + 29cb253 commit 4b16696
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 11 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/CompatHelper.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: CompatHelper

on:
schedule:
- cron: '00 * * * *'
- cron: '20 00 * * *'
issues:
types: [opened, reopened]

Expand Down
8 changes: 2 additions & 6 deletions Project.toml
Original file line number Diff line number Diff line change
@@ -1,21 +1,17 @@
name = "ImageAxes"
uuid = "2803e5a7-5153-5ecf-9a86-9b4c37f5f5ac"
version = "0.6.1"
version = "0.6.2"

[deps]
AxisArrays = "39de3d68-74b9-583c-8d2d-e117c070f3a9"
Colors = "5ae59095-9a9b-59fe-a467-6f913c188581"
FixedPointNumbers = "53c48c17-4a7d-5ca2-90c5-79b7896eea93"
ImageCore = "a09fc81d-aa75-5fe9-8630-4744c3626534"
MappedArrays = "dbb5928d-eab1-5f90-85c2-b9b0edb7c900"
Reexport = "189a3867-3050-52da-a836-e630ba90ab69"
SimpleTraits = "699a6c99-e7fa-54fc-8d76-47d257e15c1d"

[compat]
AxisArrays = "0.3"
Colors = "0.9"
FixedPointNumbers = "0.5, 0.6"
ImageCore = "0.8"
ImageCore = "0.8.1"
MappedArrays = "0.2"
Reexport = "0.2"
SimpleTraits = "0.8, 0.9"
Expand Down
6 changes: 3 additions & 3 deletions src/ImageAxes.jl
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
module ImageAxes

using Base: @pure, tail
using Reexport, Colors, SimpleTraits, MappedArrays
using Reexport, SimpleTraits, MappedArrays

# maybe return to "@reexport AxisArrays" if AxisArrays is fixed

Expand Down Expand Up @@ -202,7 +202,7 @@ be expensive or subject to restrictions. A canonical example would be
an AVI stream, where addressing pixels within the same frame is fast
but jumping between frames might be slow.
Here's a simple example of dividing by the mean of each slice of an image before returning values.
Here's a simple example of dividing by the mean of each slice of an image before returning values.
A = AxisArrays.AxisArray(reshape(1:36, 3, 3, 4))
Expand All @@ -229,7 +229,7 @@ The user-provided `f!` function should take arguments:
f!(buffer, slice)
Where `buffer` will be an empty array that can hold a slice of your series, and `slice` will hold the current input slice.
Where `buffer` will be an empty array that can hold a slice of your series, and `slice` will hold the current input slice.
It's worth noting that `StreamingContainer` is *not* a subtype of
`AbstractArray`, but that much of the array interface (`eltype`,
Expand Down
2 changes: 1 addition & 1 deletion test/runtests.jl
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using Colors, FixedPointNumbers, MappedArrays, Test, ImageCore
using MappedArrays, Test, ImageCore
import AxisArrays

ambs = detect_ambiguities(ImageCore,AxisArrays,Base,Core)
Expand Down

2 comments on commit 4b16696

@timholy
Copy link
Member Author

Choose a reason for hiding this comment

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

@JuliaRegistrator register()

@JuliaRegistrator
Copy link

Choose a reason for hiding this comment

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

Registration pull request created: JuliaRegistries/General/7299

After the above pull request is merged, it is recommended that a tag is created on this repository for the registered package version.

This will be done automatically if Julia TagBot is installed, or can be done manually through the github interface, or via:

git tag -a v0.6.2 -m "<description of version>" 4b166962b9e61e26d77f5b74c8d49df374128e35
git push origin v0.6.2

Please # to comment.