From 750fae3843510979c9186ca9bfb8cdba0d6585a3 Mon Sep 17 00:00:00 2001 From: Benoit Pasquier Date: Thu, 16 May 2024 21:20:57 +1000 Subject: [PATCH] update compat and workflows --- .github/workflows/CompatHelper.yml | 2 +- .github/workflows/docs.yml | 4 ++-- .github/workflows/linux.yml | 4 ++-- .github/workflows/linux_nightly.yml | 4 ++-- .github/workflows/mac.yml | 4 ++-- .github/workflows/mac_nightly.yml | 4 ++-- .github/workflows/windows.yml | 4 ++-- .github/workflows/windows_nightly.yml | 4 ++-- .gitignore | 1 + Project.toml | 28 ++++++++++++++------------- docs/Project.toml | 2 +- src/Parameters.jl | 2 +- test/parameters.jl | 2 +- test/runtests.jl | 1 + 14 files changed, 35 insertions(+), 31 deletions(-) diff --git a/.github/workflows/CompatHelper.yml b/.github/workflows/CompatHelper.yml index 3dfba52e..1f74cd19 100644 --- a/.github/workflows/CompatHelper.yml +++ b/.github/workflows/CompatHelper.yml @@ -15,7 +15,7 @@ jobs: run: which julia continue-on-error: true - name: Install Julia, but only if it is not already available in the PATH - uses: julia-actions/setup-julia@v1 + uses: julia-actions/setup-julia@v2 with: version: '1' arch: ${{ runner.arch }} diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 59e9d983..5df605ee 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -11,8 +11,8 @@ jobs: name: Documentation runs-on: macOS-latest steps: - - uses: actions/checkout@v2 - - uses: julia-actions/setup-julia@v1 + - uses: actions/checkout@v4 + - uses: julia-actions/setup-julia@v2 with: version: "1" - run: julia --project=docs -e ' diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 8b2fecc2..b49eb081 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -17,8 +17,8 @@ jobs: arch: - x64 steps: - - uses: actions/checkout@v2 - - uses: julia-actions/setup-julia@v1 + - uses: actions/checkout@v4 + - uses: julia-actions/setup-julia@v2 with: version: ${{ matrix.version }} arch: ${{ matrix.arch }} diff --git a/.github/workflows/linux_nightly.yml b/.github/workflows/linux_nightly.yml index 15005c04..65724dc4 100644 --- a/.github/workflows/linux_nightly.yml +++ b/.github/workflows/linux_nightly.yml @@ -17,8 +17,8 @@ jobs: arch: - x64 steps: - - uses: actions/checkout@v2 - - uses: julia-actions/setup-julia@v1 + - uses: actions/checkout@v4 + - uses: julia-actions/setup-julia@v2 with: version: ${{ matrix.version }} arch: ${{ matrix.arch }} diff --git a/.github/workflows/mac.yml b/.github/workflows/mac.yml index 8bcfc02c..558c7d10 100644 --- a/.github/workflows/mac.yml +++ b/.github/workflows/mac.yml @@ -17,8 +17,8 @@ jobs: arch: - x64 steps: - - uses: actions/checkout@v2 - - uses: julia-actions/setup-julia@v1 + - uses: actions/checkout@v4 + - uses: julia-actions/setup-julia@v2 with: version: ${{ matrix.version }} arch: ${{ matrix.arch }} diff --git a/.github/workflows/mac_nightly.yml b/.github/workflows/mac_nightly.yml index b21ac1a1..b6efd4b5 100644 --- a/.github/workflows/mac_nightly.yml +++ b/.github/workflows/mac_nightly.yml @@ -17,8 +17,8 @@ jobs: arch: - x64 steps: - - uses: actions/checkout@v2 - - uses: julia-actions/setup-julia@v1 + - uses: actions/checkout@v4 + - uses: julia-actions/setup-julia@v2 with: version: ${{ matrix.version }} arch: ${{ matrix.arch }} diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index e8754989..55ab4eda 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -17,8 +17,8 @@ jobs: arch: - x64 steps: - - uses: actions/checkout@v2 - - uses: julia-actions/setup-julia@v1 + - uses: actions/checkout@v4 + - uses: julia-actions/setup-julia@v2 with: version: ${{ matrix.version }} arch: ${{ matrix.arch }} diff --git a/.github/workflows/windows_nightly.yml b/.github/workflows/windows_nightly.yml index 5a104e59..10d3d798 100644 --- a/.github/workflows/windows_nightly.yml +++ b/.github/workflows/windows_nightly.yml @@ -17,8 +17,8 @@ jobs: arch: - x64 steps: - - uses: actions/checkout@v2 - - uses: julia-actions/setup-julia@v1 + - uses: actions/checkout@v4 + - uses: julia-actions/setup-julia@v2 with: version: ${{ matrix.version }} arch: ${{ matrix.arch }} diff --git a/.gitignore b/.gitignore index 8a76fcc9..f9e5362a 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ docs/build/ docs/src/tutorials/ docs/src/howtos/ docs/src/notebooks/ +settings.json \ No newline at end of file diff --git a/Project.toml b/Project.toml index ff646935..7cd8d42b 100644 --- a/Project.toml +++ b/Project.toml @@ -1,7 +1,7 @@ name = "AIBECS" uuid = "ace601d6-714c-11e9-04e5-89b7fad23838" authors = ["Benoit Pasquier "] -version = "0.13.2" +version = "0.13.3" [deps] Bijectors = "76274a88-744f-5084-9051-94815aaf08c4" @@ -36,30 +36,32 @@ UnPack = "3a884ed6-31ef-47d7-9d2a-63182c4928ed" Unitful = "1986cc42-f94f-5a68-af5c-568840ba703d" [compat] -Bijectors = "0.8, 0.9, 0.10" +Bijectors = "0.13" CodecZlib = "0.7" DataDeps = "0.7" -DataFrames = "0.20, 0.21, 0.22, 1.0" -Distances = "0.9, 0.10" -Distributions = "0.23, 0.24, 0.25" +DataFrames = "1" +Distances = "0.10" +Distributions = "0.25" FieldMetadata = "0.3" -Flatten = "0.3, 0.4" +Flatten = "0.4" ForwardDiff = "0.10" -ImageFiltering = "0.6, 0.7" -Interpolations = "0.12, 0.13, 0.14" +ImageFiltering = "0.7" +Interpolations = "0.15" JLD2 = "0.4" MAT = "0.10" MetadataArrays = "0.1" -NCDatasets = "0.10, 0.11, 0.12" +NCDatasets = "0.14" NearestNeighbors = "0.4" OceanGrids = "0.4" RecipesBase = "1" -Reexport = "0.2, 1.0" -SciMLBase = "1" -Shapefile = "0.6, 0.7, 0.8" -StringDistances = "0.10, 0.11" +Reexport = "1" +SciMLBase = "2" +Shapefile = "0.13" +StringDistances = "0.11" UnPack = "1" Unitful = "1" +Downloads = "1" +SparseArrays = "1" julia = "1" [extras] diff --git a/docs/Project.toml b/docs/Project.toml index e858c647..356341b1 100644 --- a/docs/Project.toml +++ b/docs/Project.toml @@ -7,4 +7,4 @@ Plots = "91a5bcdd-55d7-5caf-9e0b-520d859cae80" Unitful = "1986cc42-f94f-5a68-af5c-568840ba703d" [compat] -Documenter = "0.27" +Documenter = "1" diff --git a/src/Parameters.jl b/src/Parameters.jl index 623de9f5..0d65ada5 100644 --- a/src/Parameters.jl +++ b/src/Parameters.jl @@ -437,7 +437,7 @@ Note that the instance of your parameters type `T` is required here because it contains information on non-optimizable parameters and priors of optimizable parameters """ function λ2p(::Type{T}, λs) where {T<:APar} - ps = [inv(bijector(T,k))(λ) for (k,λ) in zip(flattenable_symbols(T), λs)] + ps = [inverse(bijector(T,k))(λ) for (k,λ) in zip(flattenable_symbols(T), λs)] reconstruct(T, ps) end export p2λ, λ2p diff --git a/test/parameters.jl b/test/parameters.jl index eba40ecf..16e7f5b0 100644 --- a/test/parameters.jl +++ b/test/parameters.jl @@ -81,7 +81,7 @@ p = TestParameters() b = bijector(D) @test b(lb) == -Inf @test b(ub) == +Inf - b⁻¹ = inv(b) + b⁻¹ = inverse(b) @test b⁻¹(-Inf) == lb @test b⁻¹(+Inf) == ub end diff --git a/test/runtests.jl b/test/runtests.jl index 40f989a8..5451f44c 100644 --- a/test/runtests.jl +++ b/test/runtests.jl @@ -9,6 +9,7 @@ using SciMLBase using ForwardDiff, DualNumbers using DataFrames using Distributions +using Bijectors using DataDeps using Plots