From 7adf95961dba373774f2f0876238683377ce04da Mon Sep 17 00:00:00 2001 From: Avik Pal Date: Wed, 13 Nov 2024 13:25:32 -0500 Subject: [PATCH] fix: multiple maintenance updates (#276) --- .github/dependabot.yml | 7 +++ .github/workflows/ci.yml | 8 ++- .github/workflows/docs.yml | 2 +- .github/workflows/downgrade.yml | 26 ++++++++++ Project.toml | 52 ++++++------------- ext/ComponentArraysTruncatedStacktracesExt.jl | 8 --- src/ComponentArrays.jl | 5 -- test/Project.toml | 1 - test/runtests.jl | 1 - 9 files changed, 53 insertions(+), 57 deletions(-) create mode 100644 .github/dependabot.yml create mode 100644 .github/workflows/downgrade.yml delete mode 100644 ext/ComponentArraysTruncatedStacktracesExt.jl diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 00000000..700707ce --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,7 @@ +# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates +version: 2 +updates: + - package-ecosystem: "github-actions" + directory: "/" # Location of package manifests + schedule: + interval: "weekly" diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 96e03ea0..7967fcb6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,22 +15,20 @@ jobs: fail-fast: false matrix: version: - - '1.6' - - '1.8' - - '1.9' - '1.10' - '1' # Leave this line unchanged. '1' will automatically expand to the latest stable 1.x release of Julia. + - 'pre' os: - ubuntu-latest arch: - x64 steps: - uses: actions/checkout@v2 - - uses: julia-actions/setup-julia@v1 + - uses: julia-actions/setup-julia@v2 with: version: ${{ matrix.version }} arch: ${{ matrix.arch }} - - uses: actions/cache@v1 + - uses: actions/cache@v4 env: cache-name: cache-artifacts with: diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 5f87a918..56b69f5a 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -14,7 +14,7 @@ jobs: - uses: actions/checkout@v2 - uses: julia-actions/setup-julia@latest with: - version: '1.6' + version: '1.10' - name: Install dependencies run: julia --project=docs/ -e 'using Pkg; Pkg.develop(PackageSpec(path=pwd())); Pkg.instantiate()' - name: Build and deploy diff --git a/.github/workflows/downgrade.yml b/.github/workflows/downgrade.yml new file mode 100644 index 00000000..dee13289 --- /dev/null +++ b/.github/workflows/downgrade.yml @@ -0,0 +1,26 @@ +name: Downgrade +on: + pull_request: + branches: + - main + paths-ignore: + - 'docs/**' + push: + branches: + - main + paths-ignore: + - 'docs/**' +jobs: + test: + runs-on: ubuntu-latest + strategy: + matrix: + version: ['1.10'] + steps: + - uses: actions/checkout@v4 + - uses: julia-actions/setup-julia@v2 + with: + version: ${{ matrix.version }} + - uses: cjdoris/julia-downgrade-compat-action@v1 + - uses: julia-actions/julia-buildpkg@v1 + - uses: julia-actions/julia-runtest@v1 diff --git a/Project.toml b/Project.toml index ed964167..01a7c1fc 100644 --- a/Project.toml +++ b/Project.toml @@ -1,7 +1,7 @@ name = "ComponentArrays" uuid = "b0b7db55-cfe3-40fc-9ded-d10e2dbeff66" authors = ["Jonnie Diegelman <47193959+jonniedie@users.noreply.github.com>"] -version = "0.15.17" +version = "0.15.18" [deps] ArrayInterface = "4fba245c-0d91-5ea0-9b3e-6abc04ee57a9" @@ -9,7 +9,6 @@ ChainRulesCore = "d360d2e6-b24c-11e9-a2a3-2a2ae2dbcce4" ForwardDiff = "f6369f11-7733-5829-9624-2563aa707210" Functors = "d9f16b24-f501-4c13-a1f2-28368ffc5196" LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e" -PackageExtensionCompat = "65ce6f38-6b18-4e1d-a461-8949797d7930" StaticArrayInterface = "0d7ed370-da01-4f52-bd93-41d350b8b718" StaticArraysCore = "1e83bf80-4336-4d27-bf5d-d5a4f845583c" @@ -22,7 +21,6 @@ RecursiveArrayTools = "731186ca-8d62-57ce-b412-fbd966d074cd" ReverseDiff = "37e2e3b7-166d-5795-8a7a-e32c996b4267" SciMLBase = "0bca4576-84f4-4d90-8ffe-ffa030f20462" Tracker = "9f7883ad-71c0-57eb-9f7f-b5c9e6d3789c" -TruncatedStacktraces = "781d530d-4396-4725-bb49-402e4bee1e77" Zygote = "e88e6eb3-aa80-5325-afca-941959d7151f" [extensions] @@ -34,41 +32,23 @@ ComponentArraysRecursiveArrayToolsExt = "RecursiveArrayTools" ComponentArraysReverseDiffExt = "ReverseDiff" ComponentArraysSciMLBaseExt = "SciMLBase" ComponentArraysTrackerExt = "Tracker" -ComponentArraysTruncatedStacktracesExt = "TruncatedStacktraces" ComponentArraysZygoteExt = "Zygote" [compat] -Adapt = "3, 4" -ArrayInterface = "6, 7" -ChainRulesCore = "0.8, 0.9, 0.10, 1" +Adapt = "4.1" +ArrayInterface = "7.10" +ChainRulesCore = "1.24" ConstructionBase = "1" -ForwardDiff = "0.10" -Functors = "0.4.4" -GPUArrays = "8, 9, 10" -LinearAlgebra = "1" -Optimisers = "0.3" -PackageExtensionCompat = "1" -RecursiveArrayTools = "2, 3" -ReverseDiff = "1" -SciMLBase = "1, 2" +ForwardDiff = "0.10.36" +Functors = "0.4.12, 0.5" +GPUArrays = "10, 11" +LinearAlgebra = "1.10" +Optimisers = "0.3, 0.4" +RecursiveArrayTools = "3.8" +ReverseDiff = "1.15" +SciMLBase = "2" StaticArrayInterface = "1" -StaticArraysCore = "1" -Test = "1" -Tracker = "0.2" -TruncatedStacktraces = "1.4" -Zygote = "0.6" -julia = "1.6" - -[extras] -Adapt = "79e6a3ab-5dfb-504d-930d-738a2a938a0e" -ConstructionBase = "187b0558-2788-49d3-abe0-74a17ed4e7c9" -ForwardDiff = "f6369f11-7733-5829-9624-2563aa707210" -GPUArrays = "0c68f7d7-f131-5f86-a1c3-88cf8149b2d7" -Optimisers = "3bd65402-5787-11e9-1adc-39752487f4e2" -RecursiveArrayTools = "731186ca-8d62-57ce-b412-fbd966d074cd" -ReverseDiff = "37e2e3b7-166d-5795-8a7a-e32c996b4267" -SciMLBase = "0bca4576-84f4-4d90-8ffe-ffa030f20462" -Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40" -Tracker = "9f7883ad-71c0-57eb-9f7f-b5c9e6d3789c" -TruncatedStacktraces = "781d530d-4396-4725-bb49-402e4bee1e77" -Zygote = "e88e6eb3-aa80-5325-afca-941959d7151f" +StaticArraysCore = "1.4" +Tracker = "0.2.34" +Zygote = "0.6.70" +julia = "1.10" diff --git a/ext/ComponentArraysTruncatedStacktracesExt.jl b/ext/ComponentArraysTruncatedStacktracesExt.jl deleted file mode 100644 index 2b9d57e6..00000000 --- a/ext/ComponentArraysTruncatedStacktracesExt.jl +++ /dev/null @@ -1,8 +0,0 @@ -module ComponentArraysTruncatedStacktracesExt - -using ComponentArrays -import TruncatedStacktraces: @truncate_stacktrace - -@truncate_stacktrace ComponentArray 1 - -end \ No newline at end of file diff --git a/src/ComponentArrays.jl b/src/ComponentArrays.jl index 1fcb90f1..0bf6e6ec 100644 --- a/src/ComponentArrays.jl +++ b/src/ComponentArrays.jl @@ -54,9 +54,4 @@ export @static_unpack include("compat/functors.jl") -import PackageExtensionCompat: @require_extensions -function __init__() - @require_extensions -end - end diff --git a/test/Project.toml b/test/Project.toml index 3776b7e2..33e5bf17 100644 --- a/test/Project.toml +++ b/test/Project.toml @@ -15,6 +15,5 @@ ReverseDiff = "37e2e3b7-166d-5795-8a7a-e32c996b4267" StaticArrays = "90137ffa-7385-5640-81b9-e52037218182" Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40" Tracker = "9f7883ad-71c0-57eb-9f7f-b5c9e6d3789c" -TruncatedStacktraces = "781d530d-4396-4725-bb49-402e4bee1e77" Unitful = "1986cc42-f94f-5a68-af5c-568840ba703d" Zygote = "e88e6eb3-aa80-5325-afca-941959d7151f" diff --git a/test/runtests.jl b/test/runtests.jl index 21018ac9..01fa3575 100644 --- a/test/runtests.jl +++ b/test/runtests.jl @@ -10,7 +10,6 @@ using OffsetArrays using Test using Unitful using Functors -import TruncatedStacktraces # This is loaded just to trigger the extension package ## Test setup