Fix tests for Julia 1.6, set filter pkgs to 0.2.0

JuliaIO · Jun 28, 2024 · 3c23e3c · 3c23e3c
1 parent a55738d
commit 3c23e3c
Show file tree

Hide file tree

Showing 8 changed files with 46 additions and 36 deletions.
diff --git a/Project.toml b/Project.toml
@@ -6,46 +6,42 @@ version = "0.17.1"
 Compat = "34da2185-b29b-5c13-b0c7-acf172513d20"
 HDF5_jll = "0234f1f7-429e-5d53-9886-15a909be8d59"
 Libdl = "8f399da3-3557-5675-b5ff-fb832c97cbdb"
+MPIPreferences = "3da0fdf6-3ccc-4f1b-acd9-58baa6c99267"
 Mmap = "a63ad114-7e13-5084-954f-fe012c677804"
 Preferences = "21216c6a-2e73-6563-6e65-726566657250"
 Printf = "de0858da-6303-5e67-8744-51eddeeeb8d7"
 Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
 Requires = "ae029012-a4dd-5104-9daa-d747884805df"
 UUIDs = "cf7118a7-6976-5b1a-9a39-7adc72f591a4"
-MPIPreferences = "3da0fdf6-3ccc-4f1b-acd9-58baa6c99267"
-
-[weakdeps]
-MPI = "da04e1cc-30fd-572f-bb4f-1f8673147195"
-bitshuffle_jll = "228fe19c-1b83-5282-a626-13744502a320"
-Blosc = "a74b3585-a348-5f62-a45c-50e91977d574"
-CodecBzip2 = "523fee87-0ab8-5b00-afb7-3ecf72e48cfd"
-CodecLz4 = "5ba52731-8f18-5e0d-9241-30f10d1ec561"
-CodecZstd = "6b39b394-51ab-5f42-8807-6242bab2b4c2"
-
-[extensions]
-MPIExt = "MPI"
-CodecBzip2Ext = "CodecBzip2"
-CodecLz4Ext = "CodecLz4"
-CodecZstdExt = "CodecZstd"
-bitshuffle_jll_ext = "bitshuffle_jll"
-BloscExt = "Blosc"
 
 [compat]
-bitshuffle_jll = "0.4.2, 0.5"
 Blosc = "0.7.3"
-Compat = "3.1.0, 4"
 CodecBzip2 = "0.7, 0.8"
 CodecLz4 = "0.4"
 CodecZstd = "0.7, 0.8"
+Compat = "3.1.0, 4"
 HDF5_jll = "~1.10.5, ~1.12.0, ~1.14.0"
 MPI = "0.20"
 MPIPreferences = "0.1.7"
 Preferences = "1.3"
 Requires = "1.0"
+bitshuffle_jll = "0.4.2, 0.5"
 julia = "1.6"
 
+[extensions]
+BloscExt = "Blosc"
+CodecBzip2Ext = "CodecBzip2"
+CodecLz4Ext = "CodecLz4"
+CodecZstdExt = "CodecZstd"
+MPIExt = "MPI"
+bitshuffle_jll_ext = "bitshuffle_jll"
+
 [extras]
+Blosc = "a74b3585-a348-5f62-a45c-50e91977d574"
 CRC32c = "8bf52ea8-c179-5cab-976a-9e18b702a9bc"
+CodecBzip2 = "523fee87-0ab8-5b00-afb7-3ecf72e48cfd"
+CodecLz4 = "5ba52731-8f18-5e0d-9241-30f10d1ec561"
+CodecZstd = "6b39b394-51ab-5f42-8807-6242bab2b4c2"
 Distributed = "8ba89e20-285c-5b6f-9357-94700520ee1b"
 FileIO = "5789e2e9-d7fb-5bc7-8068-2c6fae9b9549"
 H5Zblosc = "c8ec2601-a99c-407f-b158-e79c03c2f5f7"
@@ -57,6 +53,15 @@ MPI = "da04e1cc-30fd-572f-bb4f-1f8673147195"
 OrderedCollections = "bac558e1-5e72-5ebc-8fee-abe8a469f55d"
 Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
+bitshuffle_jll = "228fe19c-1b83-5282-a626-13744502a320"
 
 [targets]
 test = ["Test", "MPI", "Distributed", "LinearAlgebra", "OrderedCollections", "Pkg", "CRC32c", "FileIO"]
+
+[weakdeps]
+Blosc = "a74b3585-a348-5f62-a45c-50e91977d574"
+CodecBzip2 = "523fee87-0ab8-5b00-afb7-3ecf72e48cfd"
+CodecLz4 = "5ba52731-8f18-5e0d-9241-30f10d1ec561"
+CodecZstd = "6b39b394-51ab-5f42-8807-6242bab2b4c2"
+MPI = "da04e1cc-30fd-572f-bb4f-1f8673147195"
+bitshuffle_jll = "228fe19c-1b83-5282-a626-13744502a320"
diff --git a/ext/bitshuffle_jll_ext/bitshuffle_jll_ext.jl b/ext/bitshuffle_jll_ext/bitshuffle_jll_ext.jl
@@ -2,6 +2,7 @@
 Julia code wrapping the bitshuffle filter for HDF5. A rough translation of
 bshuf_h5filter.c by Kiyoshi Masui, see
 https://github.com/kiyo-masui/bitshuffle.
+Originally authored by "James.Hester <[email protected]>" as H5Zbitshuffle
 ==#
 """
 The bitshuffle filter for HDF5. See https://portal.hdfgroup.org/display/support/Filters#Filters-32008

diff --git a/filters/H5Zbitshuffle/Project.toml b/filters/H5Zbitshuffle/Project.toml
@@ -1,7 +1,7 @@
 name = "H5Zbitshuffle"
 uuid = "51b4e782-877f-4ccf-958a-27bf628210da"
 authors = ["James.Hester <[email protected]>"]
-version = "0.1.3"
+version = "0.2.0"
 
 [deps]
 HDF5 = "f67ccb44-e63f-5c2f-98bd-6dc0ccc4ba2f"
@@ -10,4 +10,4 @@ bitshuffle_jll = "228fe19c-1b83-5282-a626-13744502a320"
 [compat]
 HDF5 = "0.17"
 bitshuffle_jll = "0.4.2, 0.5"
-julia = "1.6"
+julia = "1.9"
diff --git a/filters/H5Zblosc/Project.toml b/filters/H5Zblosc/Project.toml
@@ -1,6 +1,6 @@
 name = "H5Zblosc"
 uuid = "c8ec2601-a99c-407f-b158-e79c03c2f5f7"
-version = "0.1.2"
+version = "0.2.0"
 
 [deps]
 Blosc = "a74b3585-a348-5f62-a45c-50e91977d574"
@@ -9,4 +9,4 @@ HDF5 = "f67ccb44-e63f-5c2f-98bd-6dc0ccc4ba2f"
 [compat]
 HDF5 = "0.17"
 Blosc = "0.7.3"
-julia = "1.3"
+julia = "1.9"
diff --git a/filters/H5Zbzip2/Project.toml b/filters/H5Zbzip2/Project.toml
@@ -1,6 +1,6 @@
 name = "H5Zbzip2"
 uuid = "094576f2-1e46-4c84-8e32-c46c042eaaa2"
-version = "0.1.2"
+version = "0.2.0"
 
 [deps]
 CodecBzip2 = "523fee87-0ab8-5b00-afb7-3ecf72e48cfd"
@@ -9,4 +9,4 @@ HDF5 = "f67ccb44-e63f-5c2f-98bd-6dc0ccc4ba2f"
 [compat]
 HDF5 = "0.17"
 CodecBzip2 = "0.7, 0.8"
-julia = "1.3"
+julia = "1.9"
diff --git a/filters/H5Zlz4/Project.toml b/filters/H5Zlz4/Project.toml
@@ -1,6 +1,6 @@
 name = "H5Zlz4"
 uuid = "eb20ec05-5464-47b5-ba41-098e3c1068a3"
-version = "0.1.1"
+version = "0.2.0"
 
 [deps]
 CodecLz4 = "5ba52731-8f18-5e0d-9241-30f10d1ec561"
@@ -9,4 +9,4 @@ HDF5 = "f67ccb44-e63f-5c2f-98bd-6dc0ccc4ba2f"
 [compat]
 HDF5 = "0.17"
 CodecLz4 = "0.4"
-julia = "1.3"
+julia = "1.9"
diff --git a/filters/H5Zzstd/Project.toml b/filters/H5Zzstd/Project.toml
@@ -9,4 +9,4 @@ HDF5 = "f67ccb44-e63f-5c2f-98bd-6dc0ccc4ba2f"
 [compat]
 HDF5 = "0.17"
 CodecZstd = "0.7, 0.8"
-julia = "1.3"
+julia = "1.9"
diff --git a/test/runtests.jl b/test/runtests.jl
@@ -16,14 +16,18 @@ filter_path = joinpath(dirname(pathof(HDF5)), "..", "filters")
 if !Base.BinaryPlatforms.CPUID.test_cpu_feature(Base.BinaryPlatforms.CPUID.JL_X86_avx2)
     Pkg.add(PackageSpec(; name="Blosc_jll", version=v"1.21.2+0"))
 end
-Pkg.develop([
-    PackageSpec(; path=joinpath(filter_path, "H5Zblosc")),
-    PackageSpec(; path=joinpath(filter_path, "H5Zbzip2")),
-    PackageSpec(; path=joinpath(filter_path, "H5Zlz4")),
-    PackageSpec(; path=joinpath(filter_path, "H5Zzstd")),
-])
-@static if VERSION >= v"1.6"
-    Pkg.develop(PackageSpec(; path=joinpath(filter_path, "H5Zbitshuffle")))
+@static if VERSION >= v"1.9"
+    Pkg.develop([
+        PackageSpec(; path=joinpath(filter_path, "H5Zblosc")),
+        PackageSpec(; path=joinpath(filter_path, "H5Zbzip2")),
+        PackageSpec(; path=joinpath(filter_path, "H5Zlz4")),
+        PackageSpec(; path=joinpath(filter_path, "H5Zzstd")),
+        PackageSpec(; path=joinpath(filter_path, "H5Zbitshuffle")),
+    ])
+elseif VERSION >= v"1.6"
+    Pkg.add(["H5Zblosc", "H5Zbzip2", "H5Zlz4", "H5Zzstd", "H5Zbitshuffle"])
+else
+    Pkg.add(["H5Zblosc", "H5Zbzip2", "H5Zlz4", "H5Zzstd"])
 end
 
 @info "libhdf5 v$(HDF5.API.h5_get_libversion())"