From 05ebb3f8ad2f6d68966eb9eb8b0c5a46b9e4a4a3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 4 Sep 2023 14:23:51 -0500 Subject: [PATCH 01/11] Bump actions/checkout from 3 to 4 (#378) Bumps [actions/checkout](https://github.com/actions/checkout) from 3 to 4. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v3...v4) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/Documenter.yml | 2 +- .github/workflows/Invalidations.yml | 4 ++-- .github/workflows/test.yml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/Documenter.yml b/.github/workflows/Documenter.yml index a83a2e7..6f8612f 100644 --- a/.github/workflows/Documenter.yml +++ b/.github/workflows/Documenter.yml @@ -10,7 +10,7 @@ jobs: name: Documentation runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: julia-actions/setup-julia@v1 with: version: nightly # change this to 1.6 once's that's official diff --git a/.github/workflows/Invalidations.yml b/.github/workflows/Invalidations.yml index 4d0004e..28b9ce2 100644 --- a/.github/workflows/Invalidations.yml +++ b/.github/workflows/Invalidations.yml @@ -19,12 +19,12 @@ jobs: - uses: julia-actions/setup-julia@v1 with: version: '1' - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: julia-actions/julia-buildpkg@v1 - uses: julia-actions/julia-invalidations@v1 id: invs_pr - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: ref: ${{ github.event.repository.default_branch }} - uses: julia-actions/julia-buildpkg@v1 diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 6bfcf71..4716443 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -31,7 +31,7 @@ jobs: run: | echo "TMP=${USERPROFILE}\AppData\Local\Temp" >> ${GITHUB_ENV} echo "TEMP=${USERPROFILE}\AppData\Local\Temp" >> ${GITHUB_ENV} - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: julia-actions/setup-julia@latest with: version: ${{ matrix.julia-version }} From 0a7bb653521f3841399b484121237758293f5111 Mon Sep 17 00:00:00 2001 From: rakeshksr Date: Sun, 8 Oct 2023 08:51:45 +0530 Subject: [PATCH 02/11] Initial support for OpenCV --- src/registry.jl | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/registry.jl b/src/registry.jl index ebeef1c..6f1323f 100644 --- a/src/registry.jl +++ b/src/registry.jl @@ -7,6 +7,7 @@ const idImageIO = :ImageIO => UUID("82e4d734-157c-48bb-816b-45c225c6df19") const idImageMagick = :ImageMagick => UUID("6218d12a-5da1-5696-b52f-db25d2ecc6d1") const idMeshIO = :MeshIO => UUID("7269a6da-0436-5bbc-96c2-40638cbb6118") const idNetpbm = :Netpbm => UUID("f09324ee-3d7c-5217-9330-fc30815ba969") +const idOpenCV = :OpenCV => UUID("f878e3a2-a245-4720-8660-60795d644f2a") const idQuartzImageIO = :QuartzImageIO => UUID("dca85d43-d64c-5e67-8c65-017450d5d020") const idRData = :RData => UUID("df47a6cb-8c03-5eed-afd8-b6050d6c41da") const idStatFiles = :StatFiles => UUID("1463e38c-9381-5320-bcd4-4134955f093a") @@ -180,6 +181,7 @@ add_format( [idImageIO], [idQuartzImageIO, OSX], [idImageMagick], + [idOpenCV], [MimeWriter, SAVE] ) add_format( @@ -189,7 +191,8 @@ add_format( [idJpegTurbo], [idImageIO], [idQuartzImageIO, OSX], - [idImageMagick] + [idImageMagick], + [idOpenCV] ) # 0xe1 add_format( format"BMP", From 013331951f98dc58956b0c27156e21fe1ddc5f71 Mon Sep 17 00:00:00 2001 From: rakeshksr Date: Sun, 8 Oct 2023 20:11:41 +0530 Subject: [PATCH 03/11] add more image formats for OpenCV --- src/registry.jl | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/registry.jl b/src/registry.jl index 6f1323f..189e6bf 100644 --- a/src/registry.jl +++ b/src/registry.jl @@ -150,7 +150,7 @@ add_format(format"EXR", UInt8[0x76,0x2f,0x31,0x01], ".exr", add_format(format"HDR", UInt8[0x23,0x3f,0x52,0x41,0x44,0x49,0x41,0x4e], ".hdr", [idImageMagick]) add_format(format"ICO", UInt8[0x00,0x00,0x01,0x00], ".ico", [idImageMagick]) add_format(format"INFO", UInt8[0x7a,0x62,0x65,0x78], ".info",[idImageMagick]) -add_format(format"JP2", UInt8[0x00,0x00,0x00,0x0c,0x6a,0x50,0x20,0x20], ".jp2", [idImageMagick]) +add_format(format"JP2", UInt8[0x00,0x00,0x00,0x0c,0x6a,0x50,0x20,0x20], ".jp2", [idImageMagick], [idOpenCV]) add_format(format"PDB", UInt8[0x73,0x7a,0x65,0x7a], ".pdb", [idImageMagick]) add_format(format"PDF", UInt8[0x25,0x50,0x44,0x46], ".pdf", [idImageMagick], [MimeWriter, SAVE]) add_format(format"PGM", UInt8[0x50,0x35,0x0a], ".pgm", [idImageMagick]) @@ -199,7 +199,8 @@ add_format( UInt8[0x42,0x4d], ".bmp", [idQuartzImageIO, OSX], - [idImageMagick] + [idImageMagick], + [idOpenCV] ) add_format( format"PCX", @@ -388,7 +389,7 @@ function detecttiff(io) end # normal TIFF detect_noometiff(io) = detecttiff(io) && ((:name ∉ propertynames(io)) || !(endswith(io.name, ".ome.tif>") || endswith(io.name, ".ome.tiff>"))) -add_format(format"TIFF", detect_noometiff, [".tiff", ".tif"], [idImageIO], [idQuartzImageIO, OSX], [idImageMagick]) +add_format(format"TIFF", detect_noometiff, [".tiff", ".tif"], [idImageIO], [idQuartzImageIO, OSX], [idImageMagick], [idOpenCV]) # OME-TIFF detect_ometiff(io) = detecttiff(io) && (:name ∈ propertynames(io)) && (endswith(io.name, ".ome.tif>") || endswith(io.name, ".ome.tiff>")) add_format(format"OMETIFF", detect_ometiff, [".tif", ".tiff"], [:OMETIFF => UUID("2d0ec36b-e807-5756-994b-45af29551fcf")]) From 0594a85e5fed3a04f20b743da5a9cdb9bbd92638 Mon Sep 17 00:00:00 2001 From: Steve Kelly Date: Thu, 14 Dec 2023 12:23:01 -0500 Subject: [PATCH 04/11] add Aqua and add compat entries in Project.toml Aqua.jl detected missing compat entries as problematic for registration. --- Project.toml | 15 +++++++++++++-- test/runtests.jl | 3 +++ 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/Project.toml b/Project.toml index e90ac4e..edeb03f 100644 --- a/Project.toml +++ b/Project.toml @@ -1,6 +1,6 @@ name = "FileIO" uuid = "5789e2e9-d7fb-5bc7-8068-2c6fae9b9549" -version = "1.16.1" +version = "1.16.2" [deps] Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f" @@ -8,10 +8,21 @@ Requires = "ae029012-a4dd-5104-9daa-d747884805df" UUIDs = "cf7118a7-6976-5b1a-9a39-7adc72f591a4" [compat] +UUIDs = "1" +Pkg = "1" Requires = "1" julia = "0.7, 1" +Aqua = "0.8" +CSVFiles = "1" +CodecZlib = "0.7" +ColorTypes = "0.11" +FilePathsBase = "0.9" +HTTP = "1" +Random = "1" +Test = "1" [extras] +Aqua = "4c88cf16-eb10-579e-8560-4a9242c79595" CSVFiles = "5d742f6a-9f54-50ce-8119-2520741973ca" CodecZlib = "944b1d66-785c-5afd-91f1-9de20f533193" ColorTypes = "3da002f7-5984-5a60-b8a6-cbb66c0b333f" @@ -21,4 +32,4 @@ Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c" Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40" [targets] -test = ["ColorTypes", "CodecZlib", "CSVFiles", "FilePathsBase", "HTTP", "Random", "Test"] +test = ["Aqua", "ColorTypes", "CodecZlib", "CSVFiles", "FilePathsBase", "HTTP", "Random", "Test"] diff --git a/test/runtests.jl b/test/runtests.jl index 9812982..f531393 100644 --- a/test/runtests.jl +++ b/test/runtests.jl @@ -25,3 +25,6 @@ end include("test_mimesave.jl") include("integration.jl") end + +using Aqua +Aqua.test_all(FileIO) From d627da3229ce8675a8c6679b94ba73f04373cf55 Mon Sep 17 00:00:00 2001 From: Steve Kelly Date: Fri, 15 Dec 2023 14:52:27 -0500 Subject: [PATCH 05/11] julia 1 compats --- Project.toml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Project.toml b/Project.toml index edeb03f..16ce00d 100644 --- a/Project.toml +++ b/Project.toml @@ -8,8 +8,8 @@ Requires = "ae029012-a4dd-5104-9daa-d747884805df" UUIDs = "cf7118a7-6976-5b1a-9a39-7adc72f591a4" [compat] -UUIDs = "1" -Pkg = "1" +UUIDs = "<0.0.1, 1" +Pkg = "<0.0.1, 1" Requires = "1" julia = "0.7, 1" Aqua = "0.8" @@ -18,8 +18,8 @@ CodecZlib = "0.7" ColorTypes = "0.11" FilePathsBase = "0.9" HTTP = "1" -Random = "1" -Test = "1" +Random = "<0.0.1, 1" +Test = "<0.0.1, 1" [extras] Aqua = "4c88cf16-eb10-579e-8560-4a9242c79595" From 80d444dadb99f0c60af20966e3ccba46f72a39fd Mon Sep 17 00:00:00 2001 From: Steve Kelly Date: Fri, 15 Dec 2023 14:53:33 -0500 Subject: [PATCH 06/11] [ci] test on 1.6 --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 4716443..7816330 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -13,7 +13,7 @@ jobs: strategy: fail-fast: false matrix: - julia-version: ['1.0', '1', 'nightly'] + julia-version: ['1.0', '1.6', '1', 'nightly'] julia-arch: [x64, x86] os: [ubuntu-latest, macOS-latest, windows-latest] exclude: From c48e747561d7da812781a2cc56f6adcb10281a71 Mon Sep 17 00:00:00 2001 From: Steve Kelly Date: Fri, 15 Dec 2023 15:25:45 -0500 Subject: [PATCH 07/11] loosen CodecZLib bounds for tests on old Julias --- Project.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Project.toml b/Project.toml index 16ce00d..64068ae 100644 --- a/Project.toml +++ b/Project.toml @@ -14,7 +14,7 @@ Requires = "1" julia = "0.7, 1" Aqua = "0.8" CSVFiles = "1" -CodecZlib = "0.7" +CodecZlib = "0.5, 0.6, 0.7" ColorTypes = "0.11" FilePathsBase = "0.9" HTTP = "1" From 246dadc8d720c4736d67d47c0af365c76ae86273 Mon Sep 17 00:00:00 2001 From: Steve Kelly Date: Wed, 3 Jan 2024 09:59:04 -0500 Subject: [PATCH 08/11] Update Project.toml --- Project.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Project.toml b/Project.toml index e90ac4e..8529b80 100644 --- a/Project.toml +++ b/Project.toml @@ -1,6 +1,6 @@ name = "FileIO" uuid = "5789e2e9-d7fb-5bc7-8068-2c6fae9b9549" -version = "1.16.1" +version = "1.16.2" [deps] Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f" From 2f587ed319154d67058c8e16916bd0eb762d2cfd Mon Sep 17 00:00:00 2001 From: Steve Kelly Date: Wed, 3 Jan 2024 10:12:11 -0500 Subject: [PATCH 09/11] add std lib compats --- Project.toml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Project.toml b/Project.toml index 64068ae..66cbe5c 100644 --- a/Project.toml +++ b/Project.toml @@ -8,9 +8,9 @@ Requires = "ae029012-a4dd-5104-9daa-d747884805df" UUIDs = "cf7118a7-6976-5b1a-9a39-7adc72f591a4" [compat] -UUIDs = "<0.0.1, 1" -Pkg = "<0.0.1, 1" +Pkg = "<0.0.1, 0.7, 1" Requires = "1" +UUIDs = "<0.0.1, 0.7, 1" julia = "0.7, 1" Aqua = "0.8" CSVFiles = "1" @@ -18,8 +18,8 @@ CodecZlib = "0.5, 0.6, 0.7" ColorTypes = "0.11" FilePathsBase = "0.9" HTTP = "1" -Random = "<0.0.1, 1" -Test = "<0.0.1, 1" +Random = "<0.0.1, 0.7, 1" +Test = "<0.0.1, 0.7, 1" [extras] Aqua = "4c88cf16-eb10-579e-8560-4a9242c79595" From d3e59322ca5ede84ec39e452c021a30580de1b6a Mon Sep 17 00:00:00 2001 From: Steve Kelly Date: Wed, 3 Jan 2024 10:21:06 -0500 Subject: [PATCH 10/11] HTTP comapt --- Project.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Project.toml b/Project.toml index 66cbe5c..3d5ea14 100644 --- a/Project.toml +++ b/Project.toml @@ -17,7 +17,7 @@ CSVFiles = "1" CodecZlib = "0.5, 0.6, 0.7" ColorTypes = "0.11" FilePathsBase = "0.9" -HTTP = "1" +HTTP = "0.6, 1" Random = "<0.0.1, 0.7, 1" Test = "<0.0.1, 0.7, 1" From 03efb20cbe4f6ba85d341eeb6060e2e3e7e9b62a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 5 Feb 2024 14:33:36 +0000 Subject: [PATCH 11/11] Bump codecov/codecov-action from 3 to 4 Bumps [codecov/codecov-action](https://github.com/codecov/codecov-action) from 3 to 4. - [Release notes](https://github.com/codecov/codecov-action/releases) - [Changelog](https://github.com/codecov/codecov-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/codecov/codecov-action/compare/v3...v4) --- updated-dependencies: - dependency-name: codecov/codecov-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 7816330..75d36d4 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -39,6 +39,6 @@ jobs: env: JULIA_NUM_THREADS: 2 - uses: julia-actions/julia-processcoverage@v1 - - uses: codecov/codecov-action@v3 + - uses: codecov/codecov-action@v4 with: file: lcov.info