Skip to content

Commit

Permalink
Drop Julia 1.0, ImageMagick; fix depwarn (#264)
Browse files Browse the repository at this point in the history
The previous version seems to run on Julia 1.0, but there's a conflict
installing test-only dependencies. Therefore it's best to drop 1.0.

This also eliminates ImageMagick as a test dependency.

Finally, tests were timing out due to a depwarn.
  • Loading branch information
timholy authored Jul 22, 2023
1 parent b54fa8b commit afd33f4
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 13 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/UnitTest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
strategy:
fail-fast: false
matrix:
julia-version: ['1.0', '1', 'nightly']
julia-version: ['1.6', '1', 'nightly']
os: [ubuntu-latest, windows-latest, macOS-latest]

steps:
Expand All @@ -31,15 +31,15 @@ jobs:
env:
cache-name: cache-artifacts
with:
path: ~/.julia/artifacts
path: ~/.julia/artifacts
key: ${{ runner.os }}-test-${{ env.cache-name }}-${{ hashFiles('**/Project.toml') }}
restore-keys: |
${{ runner.os }}-test-${{ env.cache-name }}-
${{ runner.os }}-test-
${{ runner.os }}-
- name: "Unit Test"
uses: julia-actions/julia-runtest@master
uses: julia-actions/julia-runtest@v1

- uses: julia-actions/julia-processcoverage@v1
- uses: codecov/codecov-action@v1
Expand Down
9 changes: 4 additions & 5 deletions Project.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name = "ImageFiltering"
uuid = "6a3955dd-da59-5b1f-98d4-e7296123deb5"
author = ["Tim Holy <[email protected]>", "Jan Weidner <[email protected]>"]
version = "0.7.6"
version = "0.7.7"

[deps]
CatIndices = "aafaddc9-749c-510e-ac4f-586e18779b91"
Expand All @@ -27,19 +27,18 @@ DataStructures = "0.17.7, 0.18"
FFTViews = "0.3"
FFTW = "0.3, 1"
ImageBase = "0.1.5"
ImageCore = "0.9, 0.10"
ImageCore = "0.10"
OffsetArrays = "1.9"
Reexport = "1.1"
PrecompileTools = "1"
StaticArrays = "0.10, 0.11, 0.12, 1.0"
TiledIteration = "0.2, 0.3, 0.4, 0.5"
julia = "1"
julia = "1.6"

[extras]
AxisArrays = "39de3d68-74b9-583c-8d2d-e117c070f3a9"
Documenter = "e30172f5-a6a5-5a46-863b-614d45cd2de4"
ImageIO = "82e4d734-157c-48bb-816b-45c225c6df19"
ImageMagick = "6218d12a-5da1-5696-b52f-db25d2ecc6d1"
ImageMetadata = "bc367c6b-8a6b-528e-b4bd-a4b897500b49"
ImageQualityIndexes = "2996bd0c-7a13-11e9-2da2-2f5ce47296a9"
Logging = "56ddb016-857b-54e1-b83d-db4d58db5568"
Expand All @@ -48,4 +47,4 @@ Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
TestImages = "5e47fb64-e119-507b-a336-dd2b206d9990"

[targets]
test = ["AxisArrays", "Documenter", "ImageIO", "ImageMagick", "ImageMetadata", "ImageQualityIndexes", "Logging", "Random", "Test", "TestImages"]
test = ["AxisArrays", "Documenter", "ImageIO", "ImageMetadata", "ImageQualityIndexes", "Logging", "Random", "Test", "TestImages"]
4 changes: 0 additions & 4 deletions src/models.jl
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,6 @@ using ImageBase
using ImageBase.ImageCore.MappedArrays: of_eltype
using ImageBase.FiniteDiff

# Introduced in ColorVectorSpace v0.9.3
# https://github.com/JuliaGraphics/ColorVectorSpace.jl/pull/172
using ImageBase.ImageCore.ColorVectorSpace.Future: abs2

"""
This submodule provides predefined image-related models and its solvers that can be reused
by many image processing tasks.
Expand Down

2 comments on commit afd33f4

@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
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/88075

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 the Julia TagBot GitHub Action is installed, or can be done manually through the github interface, or via:

git tag -a v0.7.7 -m "<description of version>" afd33f4e2903bc29f37cfe38afc2b7d7ff1142d8
git push origin v0.7.7

Please sign in to comment.