diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 30b5b6f..e9b3dd7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -22,7 +22,7 @@ jobs: with: version: ${{ matrix.version }} arch: ${{ matrix.arch }} - - uses: actions/cache@v2 + - uses: actions/cache@v3 env: cache-name: cache-artifacts with: @@ -37,4 +37,4 @@ jobs: - uses: julia-actions/julia-processcoverage@v1 - uses: codecov/codecov-action@v1 with: - file: lcov.info \ No newline at end of file + file: lcov.info diff --git a/metadata.yml b/metadata.yml index f03bec5..3e000df 100644 --- a/metadata.yml +++ b/metadata.yml @@ -1,12 +1,12 @@ myname: - user: "eziegler" + user: "mpeplinski" remote_path: "my remote path new" - time_created: "2024-07-16 16:31:29.083" + time_created: "2025-11-17 12:05:00.143" caller_file: "C:/Program Files/Julia/julia-1.10.0/share/julia/stdlib/v1.10/Test/src/Test.jl" description: "my message new" myname2: - user: "eziegler" + user: "mpeplinski" remote_path: "my remote path" - time_created: "2024-07-16 16:31:29.172" + time_created: "2025-11-17 12:05:00.252" caller_file: "C:/Program Files/Julia/julia-1.10.0/share/julia/stdlib/v1.10/Test/src/Test.jl" description: "my message" diff --git a/src/inflation.jl b/src/inflation.jl index 44dfac0..19df75c 100644 --- a/src/inflation.jl +++ b/src/inflation.jl @@ -93,11 +93,12 @@ const _year2gdp = Dict( 2020=>113.648, 2021=>118.37, 2022=>117.965, - 2023=>122.265 + 2023=>122.265, + 2024=>125.172 ) struct GDP end const gdp = GDP() -maxyear(::GDP) = 2023 +maxyear(::GDP) = 2024 _year2cpi = Dict( 1913=>9.9, @@ -210,12 +211,13 @@ _year2cpi = Dict( 2020=>258.811, 2021=>270.970, 2022=>292.655, - 2023=>304.702 + 2023=>304.702, + 2024=>313.684 ) struct CPI end const cpi = CPI() -maxyear(::CPI) = 2023 +maxyear(::CPI) = 2024 """ usd_cr(y1, y2; source=gdp, future=nothing) -> r diff --git a/test/runtests.jl b/test/runtests.jl index c78b41c..6f4384d 100644 --- a/test/runtests.jl +++ b/test/runtests.jl @@ -19,8 +19,8 @@ import E4STUtil.save_dep_metadata @test usd_cr(2021, 1929, source=cpi) < 1 end @testset "Test future" begin - @test usd_cr(1929, 2024, future=0.02) ≈ usd_cr(1929, 2023)*1.02 - @test usd_cr(1929, 2025, future=0.02) ≈ usd_cr(1929, 2023)*1.02*1.02 + @test usd_cr(1929, 2025, future=0.02) ≈ usd_cr(1929, 2024)*1.02 + @test usd_cr(1929, 2026, future=0.02) ≈ usd_cr(1929, 2024)*1.02*1.02 end end @testset "Test saving metadata" begin