From f9fa1c37108942fc6f793304746893d6a7985366 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mos=C3=A8=20Giordano?= <765740+giordano@users.noreply.github.com> Date: Sun, 26 Jan 2025 19:32:35 +0100 Subject: [PATCH] Prepare to release of v2.12.0 (#175) * Remove old code now that we require Julia v1.10+ * Minor improvements to CI setup * Bump version to v2.12.0 * Remove `RecipesBase` from direct dependencies * Run benchmarks with Julia v1.11 --- .github/workflows/benchmark.yml | 2 +- .github/workflows/ci.yml | 15 +- NEWS.md | 9 + Project.toml | 5 +- benchmark/Manifest.toml | 350 +++++++++++++++---------- benchmark/Project.toml | 3 + docs/Project.toml | 4 + ext/MeasurementsBaseTypeExt.jl | 9 +- ext/MeasurementsJunoExt.jl | 9 +- ext/MeasurementsMakieExt.jl | 10 +- ext/MeasurementsRecipesBaseExt.jl | 9 +- ext/MeasurementsSpecialFunctionsExt.jl | 13 +- ext/MeasurementsUnitfulExt.jl | 13 +- src/Measurements.jl | 15 -- src/conversions.jl | 6 - src/math.jl | 16 +- src/show.jl | 4 +- test/runtests.jl | 65 ++--- 18 files changed, 281 insertions(+), 276 deletions(-) diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml index d4b7df8c..ddcae454 100644 --- a/.github/workflows/benchmark.yml +++ b/.github/workflows/benchmark.yml @@ -17,7 +17,7 @@ jobs: - uses: actions/checkout@v4 - uses: julia-actions/setup-julia@v2 with: - version: '1.8.5' + version: '1.11.3' - uses: julia-actions/cache@v2 - name: Run benchmarks shell: julia --color=yes --project=benchmark {0} diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 79204b52..97a471a0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -9,9 +9,9 @@ on: concurrency: # Skip intermediate builds: always. - # Cancel intermediate builds: always. + # Cancel intermediate builds: on PRs. group: ${{ github.workflow }}-${{ github.ref }} - cancel-in-progress: true + cancel-in-progress: ${{ startsWith(github.ref, 'refs/pull/') }} jobs: test: @@ -21,6 +21,7 @@ jobs: fail-fast: false matrix: julia-version: + - "min" - "1" - "nightly" os: @@ -44,7 +45,13 @@ jobs: token: ${{ secrets.CODECOV_TOKEN }} files: lcov.info continue-on-error: true - - uses: julia-actions/julia-uploadcoveralls@v1.0 + - name: Coveralls + uses: coverallsapp/github-action@v2 + with: + github-token: ${{ secrets.GITHUB_TOKEN }} + path-to-lcov: lcov.info + flag-name: run-${{ join(matrix.*, '-') }} + parallel: true continue-on-error: true Documentation: @@ -57,6 +64,6 @@ jobs: - uses: julia-actions/cache@v2 with: cache-registries: "true" - - uses: julia-actions/julia-docdeploy@releases/v1 + - uses: julia-actions/julia-docdeploy@v1 env: DOCUMENTER_KEY: ${{ secrets.DOCUMENTER_KEY }} diff --git a/NEWS.md b/NEWS.md index 80e5b448..2fd5ed00 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,5 +1,14 @@ # History of Measurements.jl +## v2.12.0 (2025-01-26) + +### New features + +* The package new requires Julia v1.10. +* New package extension with + [`Makie.jl`](https://github.com/MakieOrg/Makie.jl) + ([#174](https://github.com/JuliaPhysics/Measurements.jl/pull/174)). + ## v2.11.0 (2023-11-03) ### New features diff --git a/Project.toml b/Project.toml index 9b435609..254bcd22 100644 --- a/Project.toml +++ b/Project.toml @@ -1,14 +1,12 @@ name = "Measurements" uuid = "eff96d63-e80a-5855-80a2-b1b0885c5ab7" authors = ["Mosè Giordano "] -version = "2.11.0" +version = "2.12.0" [deps] Calculus = "49dc2e85-a5d0-5ad3-a950-438e2897f1b9" LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e" Printf = "de0858da-6303-5e67-8744-51eddeeeb8d7" -RecipesBase = "3cdcf5f2-1ef4-517c-9805-6587b60abb01" -Requires = "ae029012-a4dd-5104-9daa-d747884805df" [weakdeps] BaseType = "7fbed51b-1ef5-4d67-9085-a4a9b26f478c" @@ -36,7 +34,6 @@ Makie = "0.21, 0.22" Printf = "<0.0.1, 1" QuadGK = "2" RecipesBase = "0.6.0, 0.7, 0.8, 1.0" -Requires = "0.5.0, 1" SpecialFunctions = "0.8, 1, 2" Statistics = "<0.0.1, 1" Test = "<0.0.1, 1" diff --git a/benchmark/Manifest.toml b/benchmark/Manifest.toml index 067de4d1..a1fc4c8c 100644 --- a/benchmark/Manifest.toml +++ b/benchmark/Manifest.toml @@ -1,23 +1,25 @@ # This file is machine-generated - editing it directly is not advised -julia_version = "1.8.5" +julia_version = "1.11.3" manifest_format = "2.0" -project_hash = "5d77b1fe0a156dd5010a4d91bcc6181d737d9109" +project_hash = "0dd843d4e90cfbf4b52999e17f16c49d75e45dab" [[deps.AbstractTrees]] -git-tree-sha1 = "faa260e4cb5aba097a73fab382dd4b5819d8ec8c" +git-tree-sha1 = "2d9c9a55f9c93e8887ad391fbae72f8ef55e1177" uuid = "1520ce14-60c1-5f80-bbc7-55ef81b5835c" -version = "0.4.4" +version = "0.4.5" [[deps.ArgTools]] uuid = "0dad84c5-d112-42e6-8d28-ef12dabb789f" -version = "1.1.1" +version = "1.1.2" [[deps.Artifacts]] uuid = "56f22d72-fd6d-98f1-02f0-08ddc0907c33" +version = "1.11.0" [[deps.Base64]] uuid = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f" +version = "1.11.0" [[deps.BenchmarkCI]] deps = ["Base64", "BenchmarkTools", "CpuId", "Dates", "GitHub", "JSON", "LinearAlgebra", "Logging", "Markdown", "Pkg", "PkgBenchmark", "Setfield", "Tar", "UnPack", "Zstd_jll"] @@ -26,56 +28,63 @@ uuid = "20533458-34a3-403d-a444-e18f38190b5b" version = "0.1.9" [[deps.BenchmarkTools]] -deps = ["JSON", "Logging", "Printf", "Profile", "Statistics", "UUIDs"] -git-tree-sha1 = "d9a9701b899b30332bbcb3e1679c41cce81fb0e8" +deps = ["Compat", "JSON", "Logging", "Printf", "Profile", "Statistics", "UUIDs"] +git-tree-sha1 = "e38fbc49a620f5d0b660d7f543db1009fe0f8336" uuid = "6e4b80f9-dd63-53aa-95a3-0cdb28fa8baf" -version = "1.3.2" +version = "1.6.0" [[deps.BitFlags]] -git-tree-sha1 = "43b1a4a8f797c1cddadf60499a8a077d4af2cd2d" +git-tree-sha1 = "0691e34b3bb8be9307330f88d1a3c3f25466c24d" uuid = "d1d4a3ce-64b1-5f1a-9ba4-7e7e69966f35" -version = "0.1.7" +version = "0.1.9" [[deps.Calculus]] deps = ["LinearAlgebra"] -git-tree-sha1 = "f641eb0a4f00c343bbc32346e1217b86f3ce9dad" +git-tree-sha1 = "9cb23bbb1127eefb022b022481466c0f1127d430" uuid = "49dc2e85-a5d0-5ad3-a950-438e2897f1b9" -version = "0.5.1" - -[[deps.ChainRulesCore]] -deps = ["Compat", "LinearAlgebra", "SparseArrays"] -git-tree-sha1 = "c6d890a52d2c4d55d326439580c3b8d0875a77d9" -uuid = "d360d2e6-b24c-11e9-a2a3-2a2ae2dbcce4" -version = "1.15.7" - -[[deps.ChangesOfVariables]] -deps = ["ChainRulesCore", "LinearAlgebra", "Test"] -git-tree-sha1 = "844b061c104c408b24537482469400af6075aae4" -uuid = "9e997f8a-9a97-42d5-a9f1-ce6bfc15e2c0" -version = "0.1.5" +version = "0.5.2" [[deps.CodecZlib]] deps = ["TranscodingStreams", "Zlib_jll"] -git-tree-sha1 = "9c209fb7536406834aa938fb149964b985de6c83" +git-tree-sha1 = "bce6804e5e6044c6daab27bb533d1295e4a2e759" uuid = "944b1d66-785c-5afd-91f1-9de20f533193" -version = "0.7.1" +version = "0.7.6" [[deps.Compat]] -deps = ["Dates", "LinearAlgebra", "UUIDs"] -git-tree-sha1 = "61fdd77467a5c3ad071ef8277ac6bd6af7dd4c04" +deps = ["TOML", "UUIDs"] +git-tree-sha1 = "8ae8d32e09f0dcf42a36b90d4e17f5dd2e4c4215" uuid = "34da2185-b29b-5c13-b0c7-acf172513d20" -version = "4.6.0" +version = "4.16.0" +weakdeps = ["Dates", "LinearAlgebra"] + + [deps.Compat.extensions] + CompatLinearAlgebraExt = "LinearAlgebra" [[deps.CompilerSupportLibraries_jll]] deps = ["Artifacts", "Libdl"] uuid = "e66e0078-7015-5450-92f7-15fbd957f2ae" -version = "1.0.1+0" +version = "1.1.1+0" + +[[deps.ConcurrentUtilities]] +deps = ["Serialization", "Sockets"] +git-tree-sha1 = "f36e5e8fdffcb5646ea5da81495a5a7566005127" +uuid = "f0e56b4a-5159-44fe-b623-3e5288b988bb" +version = "2.4.3" [[deps.ConstructionBase]] -deps = ["LinearAlgebra"] -git-tree-sha1 = "fb21ddd70a051d882a1686a5a550990bbe371a95" +git-tree-sha1 = "76219f1ed5771adbb096743bff43fb5fdd4c1157" uuid = "187b0558-2788-49d3-abe0-74a17ed4e7c9" -version = "1.4.1" +version = "1.5.8" + + [deps.ConstructionBase.extensions] + ConstructionBaseIntervalSetsExt = "IntervalSets" + ConstructionBaseLinearAlgebraExt = "LinearAlgebra" + ConstructionBaseStaticArraysExt = "StaticArrays" + + [deps.ConstructionBase.weakdeps] + IntervalSets = "8197267c-284f-5f27-9208-e0e47529a953" + LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e" + StaticArrays = "90137ffa-7385-5640-81b9-e52037218182" [[deps.CpuId]] deps = ["Markdown"] @@ -85,13 +94,14 @@ version = "0.3.1" [[deps.DataStructures]] deps = ["Compat", "InteractiveUtils", "OrderedCollections"] -git-tree-sha1 = "d1fff3a548102f48987a52a2e0d114fa97d730f0" +git-tree-sha1 = "1d0a14036acb104d9e89698bd408f63ab58cdc82" uuid = "864edb3b-99cc-5e75-8d2d-829cb0a9cfe8" -version = "0.18.13" +version = "0.18.20" [[deps.Dates]] deps = ["Printf"] uuid = "ade2ca70-3891-5945-98fb-dc099432e06a" +version = "1.11.0" [[deps.DocStringExtensions]] deps = ["LibGit2"] @@ -104,56 +114,54 @@ deps = ["ArgTools", "FileWatching", "LibCURL", "NetworkOptions"] uuid = "f43a241f-c20a-4ad4-852c-f6b1247861c6" version = "1.6.0" +[[deps.ExceptionUnwrapping]] +deps = ["Test"] +git-tree-sha1 = "d36f682e590a83d63d1c7dbd287573764682d12a" +uuid = "460bff9d-24e4-43bc-9d9f-a8973cb893f4" +version = "0.1.11" + [[deps.FileWatching]] uuid = "7b1f6079-737a-58dc-b8bc-7a2ca5c1b5ee" +version = "1.11.0" [[deps.Future]] deps = ["Random"] uuid = "9fa8497b-333b-5362-9e8d-4d0656e87820" +version = "1.11.0" [[deps.GitHub]] deps = ["Base64", "Dates", "HTTP", "JSON", "MbedTLS", "Sockets", "SodiumSeal", "URIs"] -git-tree-sha1 = "5688002de970b9eee14b7af7bbbd1fdac10c9bbe" +git-tree-sha1 = "7ee730a8484d673a8ce21d8536acfe6494475994" uuid = "bc5e4493-9b4d-5f90-b8aa-2b2bcaad7a26" -version = "5.8.2" +version = "5.9.0" [[deps.HTTP]] -deps = ["Base64", "CodecZlib", "Dates", "IniFile", "Logging", "LoggingExtras", "MbedTLS", "NetworkOptions", "OpenSSL", "Random", "SimpleBufferStream", "Sockets", "URIs", "UUIDs"] -git-tree-sha1 = "37e4657cd56b11abe3d10cd4a1ec5fbdb4180263" +deps = ["Base64", "CodecZlib", "ConcurrentUtilities", "Dates", "ExceptionUnwrapping", "Logging", "LoggingExtras", "MbedTLS", "NetworkOptions", "OpenSSL", "PrecompileTools", "Random", "SimpleBufferStream", "Sockets", "URIs", "UUIDs"] +git-tree-sha1 = "c67b33b085f6e2faf8bf79a61962e7339a81129c" uuid = "cd3eb016-35fb-5094-929b-558a96fad6f3" -version = "1.7.4" - -[[deps.IniFile]] -git-tree-sha1 = "f550e6e32074c939295eb5ea6de31849ac2c9625" -uuid = "83e8ac13-25f8-5344-8a64-a9f2b223428f" -version = "0.5.1" +version = "1.10.15" [[deps.InteractiveUtils]] deps = ["Markdown"] uuid = "b77e0a4c-d291-57a0-90e8-8db25a27a240" - -[[deps.InverseFunctions]] -deps = ["Test"] -git-tree-sha1 = "49510dfcb407e572524ba94aeae2fced1f3feb0f" -uuid = "3587e190-3f89-42d0-90ee-14403ec27112" -version = "0.1.8" +version = "1.11.0" [[deps.IrrationalConstants]] -git-tree-sha1 = "7fd44fd4ff43fc60815f8e764c0f352b83c49151" +git-tree-sha1 = "630b497eafcc20001bba38a4651b327dcfc491d2" uuid = "92d709cd-6900-40b7-9082-c6be49f344b6" -version = "0.1.1" +version = "0.2.2" [[deps.JLLWrappers]] -deps = ["Preferences"] -git-tree-sha1 = "abc9885a7ca2052a736a600f7fa66209f96506e1" +deps = ["Artifacts", "Preferences"] +git-tree-sha1 = "a007feb38b422fbdab534406aeca1b86823cb4d6" uuid = "692b3bcd-3c85-4b1f-b108-f13ce0eb3210" -version = "1.4.1" +version = "1.7.0" [[deps.JSON]] deps = ["Dates", "Mmap", "Parsers", "Unicode"] -git-tree-sha1 = "3c837543ddb02250ef42f4738347454f95079d4e" +git-tree-sha1 = "31e996f0a15c7b280ba9f76636b3ff9e2ae58c9a" uuid = "682c06a0-de6a-54ab-a142-c8b1cf79cde6" -version = "0.21.3" +version = "0.21.4" [[deps.LeftChildRightSiblingTrees]] deps = ["AbstractTrees"] @@ -164,77 +172,113 @@ version = "0.2.0" [[deps.LibCURL]] deps = ["LibCURL_jll", "MozillaCACerts_jll"] uuid = "b27032c2-a3e7-50c8-80cd-2d36dbcbfd21" -version = "0.6.3" +version = "0.6.4" [[deps.LibCURL_jll]] deps = ["Artifacts", "LibSSH2_jll", "Libdl", "MbedTLS_jll", "Zlib_jll", "nghttp2_jll"] uuid = "deac9b47-8bc7-5906-a0fe-35ac56dc84c0" -version = "7.84.0+0" +version = "8.6.0+0" [[deps.LibGit2]] -deps = ["Base64", "NetworkOptions", "Printf", "SHA"] +deps = ["Base64", "LibGit2_jll", "NetworkOptions", "Printf", "SHA"] uuid = "76f85450-5226-5b5a-8eaa-529ad045b433" +version = "1.11.0" + +[[deps.LibGit2_jll]] +deps = ["Artifacts", "LibSSH2_jll", "Libdl", "MbedTLS_jll"] +uuid = "e37daf67-58a4-590a-8e99-b0245dd2ffc5" +version = "1.7.2+0" [[deps.LibSSH2_jll]] deps = ["Artifacts", "Libdl", "MbedTLS_jll"] uuid = "29816b5a-b9ab-546f-933c-edad1886dfa8" -version = "1.10.2+0" +version = "1.11.0+1" [[deps.Libdl]] uuid = "8f399da3-3557-5675-b5ff-fb832c97cbdb" +version = "1.11.0" [[deps.LinearAlgebra]] -deps = ["Libdl", "libblastrampoline_jll"] +deps = ["Libdl", "OpenBLAS_jll", "libblastrampoline_jll"] uuid = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e" +version = "1.11.0" [[deps.LogExpFunctions]] -deps = ["ChainRulesCore", "ChangesOfVariables", "DocStringExtensions", "InverseFunctions", "IrrationalConstants", "LinearAlgebra"] -git-tree-sha1 = "680e733c3a0a9cea9e935c8c2184aea6a63fa0b5" +deps = ["DocStringExtensions", "IrrationalConstants", "LinearAlgebra"] +git-tree-sha1 = "13ca9e2586b89836fd20cccf56e57e2b9ae7f38f" uuid = "2ab3a3ac-af41-5b50-aa03-7779005ae688" -version = "0.3.21" +version = "0.3.29" + + [deps.LogExpFunctions.extensions] + LogExpFunctionsChainRulesCoreExt = "ChainRulesCore" + LogExpFunctionsChangesOfVariablesExt = "ChangesOfVariables" + LogExpFunctionsInverseFunctionsExt = "InverseFunctions" + + [deps.LogExpFunctions.weakdeps] + ChainRulesCore = "d360d2e6-b24c-11e9-a2a3-2a2ae2dbcce4" + ChangesOfVariables = "9e997f8a-9a97-42d5-a9f1-ce6bfc15e2c0" + InverseFunctions = "3587e190-3f89-42d0-90ee-14403ec27112" [[deps.Logging]] uuid = "56ddb016-857b-54e1-b83d-db4d58db5568" +version = "1.11.0" [[deps.LoggingExtras]] deps = ["Dates", "Logging"] -git-tree-sha1 = "cedb76b37bc5a6c702ade66be44f831fa23c681e" +git-tree-sha1 = "f02b56007b064fbfddb4c9cd60161b6dd0f40df3" uuid = "e6f89c97-d47a-5376-807f-9c37f3926c36" -version = "1.0.0" +version = "1.1.0" [[deps.MacroTools]] -deps = ["Markdown", "Random"] -git-tree-sha1 = "42324d08725e200c23d4dfb549e0d5d89dede2d2" +git-tree-sha1 = "72aebe0b5051e5143a079a4685a46da330a40472" uuid = "1914dd2f-81c6-5fcd-8719-6d5c9610ff09" -version = "0.5.10" +version = "0.5.15" [[deps.Markdown]] deps = ["Base64"] uuid = "d6f4376e-aef5-505a-96c1-9c027394607a" +version = "1.11.0" [[deps.MbedTLS]] -deps = ["Dates", "MbedTLS_jll", "MozillaCACerts_jll", "Random", "Sockets"] -git-tree-sha1 = "03a9b9718f5682ecb107ac9f7308991db4ce395b" +deps = ["Dates", "MbedTLS_jll", "MozillaCACerts_jll", "NetworkOptions", "Random", "Sockets"] +git-tree-sha1 = "c067a280ddc25f196b5e7df3877c6b226d390aaf" uuid = "739be429-bea8-5141-9913-cc70e7f3736d" -version = "1.1.7" +version = "1.1.9" [[deps.MbedTLS_jll]] deps = ["Artifacts", "Libdl"] uuid = "c8ffd9c3-330d-5841-b78e-0817d7145fa1" -version = "2.28.0+0" +version = "2.28.6+0" [[deps.Measurements]] -deps = ["Calculus", "LinearAlgebra", "Printf", "RecipesBase", "Requires", "Statistics"] +deps = ["Calculus", "LinearAlgebra", "Printf"] path = ".." uuid = "eff96d63-e80a-5855-80a2-b1b0885c5ab7" -version = "2.9.0" +version = "2.12.0" + + [deps.Measurements.extensions] + MeasurementsBaseTypeExt = "BaseType" + MeasurementsJunoExt = "Juno" + MeasurementsMakieExt = "Makie" + MeasurementsRecipesBaseExt = "RecipesBase" + MeasurementsSpecialFunctionsExt = "SpecialFunctions" + MeasurementsUnitfulExt = "Unitful" + + [deps.Measurements.weakdeps] + BaseType = "7fbed51b-1ef5-4d67-9085-a4a9b26f478c" + Juno = "e5e0dc1b-0480-54bc-9374-aad01c23163d" + Makie = "ee78f7c6-11fb-53f2-987a-cfe4a2b5a57a" + RecipesBase = "3cdcf5f2-1ef4-517c-9805-6587b60abb01" + SpecialFunctions = "276daf66-3868-5448-9aa4-cd146d93841b" + Unitful = "1986cc42-f94f-5a68-af5c-568840ba703d" [[deps.Mmap]] uuid = "a63ad114-7e13-5084-954f-fe012c677804" +version = "1.11.0" [[deps.MozillaCACerts_jll]] uuid = "14a3606d-f60d-562e-9121-12d972cd8159" -version = "2022.2.1" +version = "2023.12.12" [[deps.NetworkOptions]] uuid = "ca575930-c2e3-43a9-ace4-1e988b2c1908" @@ -243,46 +287,52 @@ version = "1.2.0" [[deps.OpenBLAS_jll]] deps = ["Artifacts", "CompilerSupportLibraries_jll", "Libdl"] uuid = "4536629a-c528-5b80-bd46-f80d51c5b363" -version = "0.3.20+0" +version = "0.3.27+1" [[deps.OpenLibm_jll]] deps = ["Artifacts", "Libdl"] uuid = "05823500-19ac-5b8b-9628-191a04bc5112" -version = "0.8.1+0" +version = "0.8.1+2" [[deps.OpenSSL]] deps = ["BitFlags", "Dates", "MozillaCACerts_jll", "OpenSSL_jll", "Sockets"] -git-tree-sha1 = "6503b77492fd7fcb9379bf73cd31035670e3c509" +git-tree-sha1 = "38cb508d080d21dc1128f7fb04f20387ed4c0af4" uuid = "4d8831e6-92b7-49fb-bdf8-b643e874388c" -version = "1.3.3" +version = "1.4.3" [[deps.OpenSSL_jll]] -deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] -git-tree-sha1 = "9ff31d101d987eb9d66bd8b176ac7c277beccd09" +deps = ["Artifacts", "JLLWrappers", "Libdl"] +git-tree-sha1 = "7493f61f55a6cce7325f197443aa80d32554ba10" uuid = "458c3c95-2e84-50aa-8efc-19380b2a3a95" -version = "1.1.20+0" +version = "3.0.15+3" [[deps.OpenSpecFun_jll]] -deps = ["Artifacts", "CompilerSupportLibraries_jll", "JLLWrappers", "Libdl", "Pkg"] -git-tree-sha1 = "13652491f6856acfd2db29360e1bbcd4565d04f1" +deps = ["Artifacts", "CompilerSupportLibraries_jll", "JLLWrappers", "Libdl"] +git-tree-sha1 = "1346c9208249809840c91b26703912dff463d335" uuid = "efe28fd5-8261-553b-a9e1-b2916fc3738e" -version = "0.5.5+0" +version = "0.5.6+0" [[deps.OrderedCollections]] -git-tree-sha1 = "85f8e6578bf1f9ee0d11e7bb1b1456435479d47c" +git-tree-sha1 = "12f1439c4f986bb868acda6ea33ebc78e19b95ad" uuid = "bac558e1-5e72-5ebc-8fee-abe8a469f55d" -version = "1.4.1" +version = "1.7.0" [[deps.Parsers]] -deps = ["Dates", "SnoopPrecompile"] -git-tree-sha1 = "6f4fbcd1ad45905a5dee3f4256fabb49aa2110c6" +deps = ["Dates", "PrecompileTools", "UUIDs"] +git-tree-sha1 = "8489905bcdbcfac64d1daa51ca07c0d8f0283821" uuid = "69de0a69-1ddd-5017-9359-2bf0b02dc9f0" -version = "2.5.7" +version = "2.8.1" [[deps.Pkg]] -deps = ["Artifacts", "Dates", "Downloads", "LibGit2", "Libdl", "Logging", "Markdown", "Printf", "REPL", "Random", "SHA", "Serialization", "TOML", "Tar", "UUIDs", "p7zip_jll"] +deps = ["Artifacts", "Dates", "Downloads", "FileWatching", "LibGit2", "Libdl", "Logging", "Markdown", "Printf", "Random", "SHA", "TOML", "Tar", "UUIDs", "p7zip_jll"] uuid = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f" -version = "1.8.0" +version = "1.11.0" + + [deps.Pkg.extensions] + REPLExt = "REPL" + + [deps.Pkg.weakdeps] + REPL = "3fa0cd96-eef1-5676-8a61-b3b8758bbffb" [[deps.PkgBenchmark]] deps = ["BenchmarkTools", "Dates", "InteractiveUtils", "JSON", "LibGit2", "Logging", "Pkg", "Printf", "TerminalLoggers", "UUIDs"] @@ -290,19 +340,26 @@ git-tree-sha1 = "e4a10b7cdb7ec836850e43a4cee196f4e7b02756" uuid = "32113eaa-f34f-5b0d-bd6c-c81e245fc73d" version = "0.2.12" +[[deps.PrecompileTools]] +deps = ["Preferences"] +git-tree-sha1 = "5aa36f7049a63a1528fe8f7c3f2113413ffd4e1f" +uuid = "aea7be01-6a6a-4083-8856-8a6e6704d82a" +version = "1.2.1" + [[deps.Preferences]] deps = ["TOML"] -git-tree-sha1 = "47e5f437cc0e7ef2ce8406ce1e7e24d44915f88d" +git-tree-sha1 = "9306f6085165d270f7e3db02af26a400d580f5c6" uuid = "21216c6a-2e73-6563-6e65-726566657250" -version = "1.3.0" +version = "1.4.3" [[deps.Printf]] deps = ["Unicode"] uuid = "de0858da-6303-5e67-8744-51eddeeeb8d7" +version = "1.11.0" [[deps.Profile]] -deps = ["Printf"] uuid = "9abbd945-dff8-562f-b5e8-e1ebf5ef1b79" +version = "1.11.0" [[deps.ProgressLogging]] deps = ["Logging", "SHA", "UUIDs"] @@ -312,23 +369,20 @@ version = "0.1.4" [[deps.QuadGK]] deps = ["DataStructures", "LinearAlgebra"] -git-tree-sha1 = "786efa36b7eff813723c4849c90456609cf06661" +git-tree-sha1 = "cda3b045cf9ef07a08ad46731f5a3165e56cf3da" uuid = "1fd47b50-473d-5c70-9696-f719f8f3bcdc" -version = "2.8.1" +version = "2.11.1" + + [deps.QuadGK.extensions] + QuadGKEnzymeExt = "Enzyme" -[[deps.REPL]] -deps = ["InteractiveUtils", "Markdown", "Sockets", "Unicode"] -uuid = "3fa0cd96-eef1-5676-8a61-b3b8758bbffb" + [deps.QuadGK.weakdeps] + Enzyme = "7da242da-08ed-463a-9acd-ee780be4f1d9" [[deps.Random]] -deps = ["SHA", "Serialization"] +deps = ["SHA"] uuid = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c" - -[[deps.RecipesBase]] -deps = ["SnoopPrecompile"] -git-tree-sha1 = "261dddd3b862bd2c940cf6ca4d1c8fe593e457c8" -uuid = "3cdcf5f2-1ef4-517c-9805-6587b60abb01" -version = "1.3.3" +version = "1.11.0" [[deps.Requires]] deps = ["UUIDs"] @@ -342,6 +396,7 @@ version = "0.7.0" [[deps.Serialization]] uuid = "9e88b42a-f829-5b0c-bbe9-9e923198166b" +version = "1.11.0" [[deps.Setfield]] deps = ["ConstructionBase", "Future", "MacroTools", "Requires"] @@ -350,18 +405,13 @@ uuid = "efcf1570-3423-57d1-acb7-fd33fddbac46" version = "0.8.2" [[deps.SimpleBufferStream]] -git-tree-sha1 = "874e8867b33a00e784c8a7e4b60afe9e037b74e1" +git-tree-sha1 = "f305871d2f381d21527c770d4788c06c097c9bc1" uuid = "777ac1f9-54b0-4bf8-805c-2214025038e7" -version = "1.1.0" - -[[deps.SnoopPrecompile]] -deps = ["Preferences"] -git-tree-sha1 = "e760a70afdcd461cf01a575947738d359234665c" -uuid = "66db9d55-30c0-4569-8b51-7e840670fc0c" -version = "1.0.3" +version = "1.2.0" [[deps.Sockets]] uuid = "6462fe0b-24de-5631-8697-dd941f90decc" +version = "1.11.0" [[deps.SodiumSeal]] deps = ["Base64", "Libdl", "libsodium_jll"] @@ -369,54 +419,65 @@ git-tree-sha1 = "80cef67d2953e33935b41c6ab0a178b9987b1c99" uuid = "2133526b-2bfb-4018-ac12-889fb3908a75" version = "0.1.1" -[[deps.SparseArrays]] -deps = ["LinearAlgebra", "Random"] -uuid = "2f01184e-e22b-5df5-ae63-d93ebab69eaf" - [[deps.SpecialFunctions]] -deps = ["ChainRulesCore", "IrrationalConstants", "LogExpFunctions", "OpenLibm_jll", "OpenSpecFun_jll"] -git-tree-sha1 = "d75bda01f8c31ebb72df80a46c88b25d1c79c56d" +deps = ["IrrationalConstants", "LogExpFunctions", "OpenLibm_jll", "OpenSpecFun_jll"] +git-tree-sha1 = "64cca0c26b4f31ba18f13f6c12af7c85f478cfde" uuid = "276daf66-3868-5448-9aa4-cd146d93841b" -version = "2.1.7" +version = "2.5.0" + + [deps.SpecialFunctions.extensions] + SpecialFunctionsChainRulesCoreExt = "ChainRulesCore" + + [deps.SpecialFunctions.weakdeps] + ChainRulesCore = "d360d2e6-b24c-11e9-a2a3-2a2ae2dbcce4" [[deps.Statistics]] -deps = ["LinearAlgebra", "SparseArrays"] +deps = ["LinearAlgebra"] +git-tree-sha1 = "ae3bb1eb3bba077cd276bc5cfc337cc65c3075c0" uuid = "10745b16-79ce-11e8-11f9-7d13ad32a3b2" +version = "1.11.1" + + [deps.Statistics.extensions] + SparseArraysExt = ["SparseArrays"] + + [deps.Statistics.weakdeps] + SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf" [[deps.TOML]] deps = ["Dates"] uuid = "fa267f1f-6049-4f14-aa54-33bafae1ed76" -version = "1.0.0" +version = "1.0.3" [[deps.Tar]] deps = ["ArgTools", "SHA"] uuid = "a4e569a6-e804-4fa4-b0f3-eef7a1d5b13e" -version = "1.10.1" +version = "1.10.0" [[deps.TerminalLoggers]] deps = ["LeftChildRightSiblingTrees", "Logging", "Markdown", "Printf", "ProgressLogging", "UUIDs"] -git-tree-sha1 = "f53e34e784ae771eb9ccde4d72e578aa453d0554" +git-tree-sha1 = "f133fab380933d042f6796eda4e130272ba520ca" uuid = "5d786b92-1e48-4d6f-9151-6b4477ca9bed" -version = "0.1.6" +version = "0.1.7" [[deps.Test]] deps = ["InteractiveUtils", "Logging", "Random", "Serialization"] uuid = "8dfed614-e22c-5e08-85e1-65c5234f0b40" +version = "1.11.0" [[deps.TranscodingStreams]] -deps = ["Random", "Test"] -git-tree-sha1 = "94f38103c984f89cf77c402f2a68dbd870f8165f" +git-tree-sha1 = "0c45878dcfdcfa8480052b6ab162cdd138781742" uuid = "3bb67fe8-82b1-5028-8e26-92a6c54297fa" -version = "0.9.11" +version = "0.11.3" [[deps.URIs]] -git-tree-sha1 = "074f993b0ca030848b897beff716d93aca60f06a" +git-tree-sha1 = "67db6cc7b3821e19ebe75791a9dd19c9b1188f2b" uuid = "5c2747f8-b7ea-4ff2-ba2e-563bfd36b1d4" -version = "1.4.2" +version = "1.5.1" [[deps.UUIDs]] deps = ["Random", "SHA"] uuid = "cf7118a7-6976-5b1a-9a39-7adc72f591a4" +version = "1.11.0" [[deps.UnPack]] git-tree-sha1 = "387c1f73762231e86e0c9c5443ce3b4a0a9a0c2b" @@ -425,35 +486,36 @@ version = "1.0.2" [[deps.Unicode]] uuid = "4ec0a83e-493e-50e2-b9ac-8f72acf5a8f5" +version = "1.11.0" [[deps.Zlib_jll]] deps = ["Libdl"] uuid = "83775a58-1f1d-513f-b197-d71354ab007a" -version = "1.2.12+3" +version = "1.2.13+1" [[deps.Zstd_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl"] -git-tree-sha1 = "c6edfe154ad7b313c01aceca188c05c835c67360" +git-tree-sha1 = "622cf78670d067c738667aaa96c553430b65e269" uuid = "3161d3a3-bdf6-5164-811a-617609db77b4" -version = "1.5.4+0" +version = "1.5.7+0" [[deps.libblastrampoline_jll]] -deps = ["Artifacts", "Libdl", "OpenBLAS_jll"] +deps = ["Artifacts", "Libdl"] uuid = "8e850b90-86db-534c-a0d3-1478176c7d93" -version = "5.1.1+0" +version = "5.11.0+0" [[deps.libsodium_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] -git-tree-sha1 = "848ab3d00fe39d6fbc2a8641048f8f272af1c51e" +git-tree-sha1 = "f76d682d87eefadd3f165d8d9fda436464213142" uuid = "a9144af2-ca23-56d9-984f-0d03f7b5ccf8" -version = "1.0.20+0" +version = "1.0.20+3" [[deps.nghttp2_jll]] deps = ["Artifacts", "Libdl"] uuid = "8e850ede-7688-5339-a07c-302acd2aaf8d" -version = "1.48.0+0" +version = "1.59.0+0" [[deps.p7zip_jll]] deps = ["Artifacts", "Libdl"] uuid = "3f19e933-33d8-53b3-aaab-bd5110c3b7a0" -version = "17.4.0+0" +version = "17.4.0+2" diff --git a/benchmark/Project.toml b/benchmark/Project.toml index 683c0adb..c9892cbf 100644 --- a/benchmark/Project.toml +++ b/benchmark/Project.toml @@ -12,3 +12,6 @@ BenchmarkTools = "1" PkgBenchmark = "0.2" QuadGK = "2" SpecialFunctions = "2" + +[sources] +Measurements = {path = ".."} diff --git a/docs/Project.toml b/docs/Project.toml index bcd23546..209741db 100644 --- a/docs/Project.toml +++ b/docs/Project.toml @@ -4,6 +4,7 @@ Calculus = "49dc2e85-a5d0-5ad3-a950-438e2897f1b9" Cuba = "8a292aeb-7a57-582c-b821-06e4c11590b1" Documenter = "e30172f5-a6a5-5a46-863b-614d45cd2de4" LsqFit = "2fda8390-95c7-5789-9bda-21331edee243" +Measurements = "eff96d63-e80a-5855-80a2-b1b0885c5ab7" QuadGK = "1fd47b50-473d-5c70-9696-f719f8f3bcdc" SpecialFunctions = "276daf66-3868-5448-9aa4-cd146d93841b" Statistics = "10745b16-79ce-11e8-11f9-7d13ad32a3b2" @@ -11,3 +12,6 @@ Unitful = "1986cc42-f94f-5a68-af5c-568840ba703d" [compat] Documenter = "1" + +[sources] +Measurements = {path = ".."} diff --git a/ext/MeasurementsBaseTypeExt.jl b/ext/MeasurementsBaseTypeExt.jl index 12c1416f..71bc1025 100644 --- a/ext/MeasurementsBaseTypeExt.jl +++ b/ext/MeasurementsBaseTypeExt.jl @@ -1,12 +1,7 @@ module MeasurementsBaseTypeExt -if isdefined(Base, :get_extension) - using Measurements: Measurement - import BaseType: base_numeric_type -else - using ..Measurements: Measurement - import ..BaseType: base_numeric_type -end +using Measurements: Measurement +import BaseType: base_numeric_type base_numeric_type(::Type{<:Measurement{T}}) where {T} = base_numeric_type(T) diff --git a/ext/MeasurementsJunoExt.jl b/ext/MeasurementsJunoExt.jl index a41b9683..c934e2d4 100644 --- a/ext/MeasurementsJunoExt.jl +++ b/ext/MeasurementsJunoExt.jl @@ -18,13 +18,8 @@ ### Special functions module MeasurementsJunoExt -if isdefined(Base, :get_extension) - using Measurements - using Juno -else - using ..Measurements - using ..Juno -end +using Measurements +using Juno Juno.render(i::Juno.Inline, measure::Measurement) = Juno.render(i, Juno.Row(measure.val, Text(" ± "), measure.err)) diff --git a/ext/MeasurementsMakieExt.jl b/ext/MeasurementsMakieExt.jl index ef672f20..ac06bedf 100644 --- a/ext/MeasurementsMakieExt.jl +++ b/ext/MeasurementsMakieExt.jl @@ -14,13 +14,9 @@ ### Code: module MeasurementsMakieExt -if isdefined(Base, :get_extension) - using Measurements: Measurement, value, uncertainty - using Makie: Makie, PointBased, Errorbars, Band -else - using ..Measurements: Measurement, value, uncertainty - using ..Makie: Makie, PointBased, Errorbars, Band -end +using Measurements: Measurement, value, uncertainty +using Makie: Makie, PointBased, Errorbars, Band + # PointBased plots Makie.convert_arguments(P::PointBased, x::AbstractVector{<:Measurement}, y::AbstractVector{<:Measurement}) = Makie.convert_arguments(P, value.(x), value.(y)) diff --git a/ext/MeasurementsRecipesBaseExt.jl b/ext/MeasurementsRecipesBaseExt.jl index f1449d06..c4567df9 100644 --- a/ext/MeasurementsRecipesBaseExt.jl +++ b/ext/MeasurementsRecipesBaseExt.jl @@ -16,13 +16,8 @@ ### Code: module MeasurementsRecipesBaseExt -if isdefined(Base, :get_extension) - using Measurements: Measurement, value, uncertainty - using RecipesBase -else - using ..Measurements: Measurement, value, uncertainty - using ..RecipesBase -end +using Measurements: Measurement, value, uncertainty +using RecipesBase @recipe function f(y::AbstractArray{<:Measurement}) yerror := uncertainty.(y) diff --git a/ext/MeasurementsSpecialFunctionsExt.jl b/ext/MeasurementsSpecialFunctionsExt.jl index 8879f019..9641254a 100644 --- a/ext/MeasurementsSpecialFunctionsExt.jl +++ b/ext/MeasurementsSpecialFunctionsExt.jl @@ -19,15 +19,10 @@ ### Special functions module MeasurementsSpecialFunctionsExt -if isdefined(Base, :get_extension) - using Measurements - using Measurements: result - using SpecialFunctions -else - using ..Measurements - using ..Measurements: result - using ..SpecialFunctions -end +using Measurements +using Measurements: result +using SpecialFunctions + # Error function: erf, erfinv, erfc, erfcinv, erfcx, erfi, dawson function SpecialFunctions.erf(a::Measurement{T}) where {T<:AbstractFloat} diff --git a/ext/MeasurementsUnitfulExt.jl b/ext/MeasurementsUnitfulExt.jl index 12ba3d29..db1c17ac 100644 --- a/ext/MeasurementsUnitfulExt.jl +++ b/ext/MeasurementsUnitfulExt.jl @@ -17,16 +17,9 @@ module MeasurementsUnitfulExt -if isdefined(Base, :get_extension) - using Measurements - using Measurements: value, uncertainty - import Unitful: AbstractQuantity, unit, ustrip -else - using ..Measurements - using ..Measurements: value, uncertainty - import ..Unitful: AbstractQuantity, unit, ustrip -end - +using Measurements +using Measurements: value, uncertainty +import Unitful: AbstractQuantity, unit, ustrip function Measurements.measurement(a::T, b::T) where {T<:AbstractQuantity} u = unit(a) diff --git a/src/Measurements.jl b/src/Measurements.jl index c75ed50d..31539036 100644 --- a/src/Measurements.jl +++ b/src/Measurements.jl @@ -117,19 +117,4 @@ include("linear_algebra.jl") include("show.jl") include("parsing.jl") -if !isdefined(Base,:get_extension) - using Requires - using RecipesBase - include("../ext/MeasurementsRecipesBaseExt.jl") -end - -@static if !isdefined(Base, :get_extension) - function __init__() - @require BaseType = "7fbed51b-1ef5-4d67-9085-a4a9b26f478c" include("../ext/MeasurementsBaseTypeExt.jl") - @require Unitful="1986cc42-f94f-5a68-af5c-568840ba703d" include("../ext/MeasurementsUnitfulExt.jl") - @require SpecialFunctions="276daf66-3868-5448-9aa4-cd146d93841b" include("../ext/MeasurementsSpecialFunctionsExt.jl") - @require Juno="e5e0dc1b-0480-54bc-9374-aad01c23163d" include("../ext/MeasurementsJunoExt.jl") - end -end - end # module diff --git a/src/conversions.jl b/src/conversions.jl index 753ebfbe..ce960943 100644 --- a/src/conversions.jl +++ b/src/conversions.jl @@ -60,9 +60,3 @@ Base.promote_rule(::Type{Measurement{T}}, ::Type{S}) where {T<:AbstractFloat, S< Base.promote_rule(::Type{Measurement{T}}, ::Type{Measurement{S}}) where {T<:AbstractFloat, S<:AbstractFloat} = Measurement{promote_type(T, S)} - -# adaptation of JuliaLang/julia#30952 -@static if VERSION < v"1.3" - Base._range(a::T, step::T, ::Nothing, len::Integer) where {T<:Measurement} = - Base._rangestyle(Base.OrderStyle(T), Base.ArithmeticStyle(T), a, step, len) -end diff --git a/src/math.jl b/src/math.jl index 3115e7f1..b03b1256 100644 --- a/src/math.jl +++ b/src/math.jl @@ -359,11 +359,9 @@ function Base.sincos(a::Measurement) return (result(s, c, a), result(c, -s, a)) end -if isdefined(Base, :sincospi) - function Base.sincospi(a::Measurement) - s, c = sincospi(a.val) - return (result(s, c * pi, a), result(c, -s * pi, a)) - end +function Base.sincospi(a::Measurement) + s, c = sincospi(a.val) + return (result(s, c * pi, a), result(c, -s * pi, a)) end # Tangent: tan, tand, tanh @@ -747,12 +745,8 @@ Base.round(a::Measurement, r::RoundingMode{:NearestTiesUp}; kwargs...) = Base.round(::Type{T}, a::Measurement, r::RoundingMode{:ToZero}) where {T<:Integer} = measurement(round(T, value(a), r), round(uncertainty(a), r)) Base.round(::Type{Bool}, x::Measurement) = measurement(round(Bool, value(x))) -# https://github.com/JuliaLang/julia/pull/41246 introduced new rounding mode for -# all `AbstractFloat` -if VERSION ≥ v"1.9.0-DEV.369" - Base.round(a::Measurement, r::RoundingMode{:FromZero}; kwargs...) = - measurement(round(value(a), r; kwargs...), round(uncertainty(a), r; kwargs...)) -end +Base.round(a::Measurement, r::RoundingMode{:FromZero}; kwargs...) = + measurement(round(value(a), r; kwargs...), round(uncertainty(a), r; kwargs...)) Base.floor(a::Measurement) = measurement(floor(a.val)) Base.floor(::Type{T}, a::Measurement) where {T<:Integer} = floor(T, a.val) diff --git a/src/show.jl b/src/show.jl index 033e7b46..0fd25f8c 100644 --- a/src/show.jl +++ b/src/show.jl @@ -90,6 +90,4 @@ function Base.alignment(io::IO, measure::Measurement) (length(m.captures[1]), length(m.captures[2])) end -if VERSION >= v"1.6.0-rc1" - Printf.tofloat(measure::Measurement) = Printf.tofloat(measure.val) -end +Printf.tofloat(measure::Measurement) = Printf.tofloat(measure.val) diff --git a/test/runtests.jl b/test/runtests.jl index ff7e43c5..0a65da2b 100644 --- a/test/runtests.jl +++ b/test/runtests.jl @@ -1,12 +1,7 @@ using Measurements, SpecialFunctions, QuadGK, Calculus, BaseType, Makie using Test, LinearAlgebra, Statistics, Unitful, Printf, Aqua -if !isdefined(Base,:get_extension) - Aqua.test_all(Measurements) -else - Aqua.test_all(Measurements; stale_deps=false) - Aqua.test_stale_deps(Measurements; ignore=[:RecipesBase, :Requires]) -end +Aqua.test_all(Measurements) import Base: isapprox import Measurements: value, uncertainty @@ -431,23 +426,19 @@ end @test @inferred(cospi(a))≈ cos(pi * a) atol = 1e-15 @test @inferred(sinc(a)) ≈ (sin(pi * a) / (pi * a)) atol = eps(Float64) @test @inferred(cosc(a)) ≈ ((cos(pi * a) - sin(pi * a) / (pi * a)) / a) atol = 1e-15 - if isdefined(Base, :sincos) - # Check we got the sign of derivatives in `sincos` right. - s, c = @inferred(sincos(a)) - @test s ≈ sin(a) - @test c ≈ cos(a) - @test s + c ≈ sin(a) + cos(a) - @test s - c ≈ sin(a) - cos(a) - @test s ^ 2 + c ^ 2 ≈ oneunit(a) - end - if isdefined(Base, :sincospi) - s, c = @inferred(sincospi(a)) - @test s ≈ sinpi(a) - @test c ≈ cospi(a) - @test s + c ≈ sinpi(a) + cospi(a) - @test s - c ≈ sinpi(a) - cospi(a) - @test s ^ 2 + c ^ 2 ≈ oneunit(a) - end + # Check we got the sign of derivatives in `sincos` right. + s, c = @inferred(sincos(a)) + @test s ≈ sin(a) + @test c ≈ cos(a) + @test s + c ≈ sin(a) + cos(a) + @test s - c ≈ sin(a) - cos(a) + @test s ^ 2 + c ^ 2 ≈ oneunit(a) + s, c = @inferred(sincospi(a)) + @test s ≈ sinpi(a) + @test c ≈ cospi(a) + @test s + c ≈ sinpi(a) + cospi(a) + @test s - c ≈ sinpi(a) - cospi(a) + @test s ^ 2 + c ^ 2 ≈ oneunit(a) end for c in (-1 ± 1, 0 ± 1, 1 ± 1) @test sinc(c) ≈ @uncertain(sinc(c)) rtol = 1e-7 @@ -733,10 +724,8 @@ end @test @inferred(ceil(Int, w)) ≈ ceil(Int, w.val) @test @inferred(trunc(w)) ≈ measurement(trunc(w.val)) @test @inferred(trunc(Int, w)) ≈ trunc(Int, w.val) - if VERSION ≥ v"1.9.0-DEV.369" - @test @inferred(round(w, RoundFromZero)) ≈ measurement(round(w.val, RoundFromZero), - round(w.err, RoundFromZero)) - end + @test @inferred(round(w, RoundFromZero)) ≈ measurement(round(w.val, RoundFromZero), + round(w.err, RoundFromZero)) end @testset "widening" begin @@ -798,15 +787,13 @@ end # the same number (note that the tag will be different, but that's not important here). for a in (w, x, y); @test eval(Meta.parse(repr(a))) == a; end end - if VERSION >= v"1.6.0-rc1" - @testset "@printf" begin - for T in (Float16, Float32, Float64, BigFloat) - m1 = measurement(one(T)) - io = IOBuffer() - @test_nowarn @printf(io, "Testing @printf: %.2e\n", m1) - @test String(take!(io)) == "Testing @printf: 1.00e+00\n" - @test @sprintf("Testing @sprintf: %.2e\n", m1) == "Testing @sprintf: 1.00e+00\n" - end + @testset "@printf" begin + for T in (Float16, Float32, Float64, BigFloat) + m1 = measurement(one(T)) + io = IOBuffer() + @test_nowarn @printf(io, "Testing @printf: %.2e\n", m1) + @test String(take!(io)) == "Testing @printf: 1.00e+00\n" + @test @sprintf("Testing @sprintf: %.2e\n", m1) == "Testing @sprintf: 1.00e+00\n" end end end @@ -897,13 +884,9 @@ end @testset "2-arg functions: $f" for f in (log, hypot, atan) @test @uncertain(f(x, y)) ≈ f(x, y) end - @static if VERSION < v"1.6.0-" || Base.BinaryPlatforms.arch(Base.BinaryPlatforms.HostPlatform()) ∉ ("aarch64", "armv6l", "armv7l", "powerpc64le") + @static if Base.BinaryPlatforms.arch(Base.BinaryPlatforms.HostPlatform()) ∉ ("aarch64", "armv6l", "armv7l", "powerpc64le") # Don't run this test if the platform doesn't allow it, see # https://github.com/JuliaLang/julia/blob/58ffe7e3ed3a93a9d816097548e785284f57fbd4/src/codegen.cpp#L5531-L5536 - # However I don't know how to check the architecture of the current - # system before Julia v1.6 in a sane way: I should copy - # `Base.BinaryPlatforms.CPUID.normalize_arch`, but that's really too - # much work for this simple test, so let's ignore the problem. @testset "ccall" begin f(x) = x * x ptr = @cfunction($f, Cdouble, (Cdouble,))