From f1f0cf13e41434024f87874c02593caa4fc8829a Mon Sep 17 00:00:00 2001 From: Lars Hellemo Date: Wed, 4 Mar 2026 11:43:56 +0100 Subject: [PATCH 1/4] Update Project.toml to meet registration requirements. --- Project.toml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Project.toml b/Project.toml index 58e7831..3b0ed27 100644 --- a/Project.toml +++ b/Project.toml @@ -20,8 +20,12 @@ TimeStruct = "f9ed5ce0-9f41-4eaa-96da-f38ab8df101c" EnergyModelsBase = {rev = "enhance/transfer_energy_potentials", url = "https://github.com/EnergyModelsX/EnergyModelsBase.jl.git"} [compat] +julia = "1.12" Documenter = "1.17.0" +EnergyModelsBase = "0.9.3" JSON3 = "1.14.3" JuMP = "1.28.0" +LinearAlgebra = "1.12" PiecewiseAffineApprox = "0.6.4" -TimeStruct = "0.9.5" +Scratch = "1.3" +TimeStruct = "0.9.8" From 492b35b48fac097e9f770bbeac3ee0c6fe1ab0fc Mon Sep 17 00:00:00 2001 From: Lars Hellemo Date: Thu, 26 Mar 2026 10:17:16 +0100 Subject: [PATCH 2/4] Move from emb branch to newest release after merging the branch merge --- Project.toml | 5 +---- test/Project.toml | 3 --- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/Project.toml b/Project.toml index 3b0ed27..12fdbb3 100644 --- a/Project.toml +++ b/Project.toml @@ -16,13 +16,10 @@ PiecewiseAffineApprox = "029c5f1c-0dc4-4551-8b87-a10b73fe3713" Scratch = "6c6a2e73-6563-6170-7368-637461726353" TimeStruct = "f9ed5ce0-9f41-4eaa-96da-f38ab8df101c" -[sources] -EnergyModelsBase = {rev = "enhance/transfer_energy_potentials", url = "https://github.com/EnergyModelsX/EnergyModelsBase.jl.git"} - [compat] julia = "1.12" Documenter = "1.17.0" -EnergyModelsBase = "0.9.3" +EnergyModelsBase = "0.9.5" JSON3 = "1.14.3" JuMP = "1.28.0" LinearAlgebra = "1.12" diff --git a/test/Project.toml b/test/Project.toml index 08d2ba1..b6c1836 100644 --- a/test/Project.toml +++ b/test/Project.toml @@ -13,12 +13,9 @@ TestItems = "1c621080-faea-4a02-84b6-bbd5e436b8fe" TimeStruct = "f9ed5ce0-9f41-4eaa-96da-f38ab8df101c" Xpress_jll = "308bddfa-7f95-4fa6-a557-f2c7addc1869" -[sources] -EnergyModelsBase = {rev = "enhance/transfer_energy_potentials", url = "https://github.com/EnergyModelsX/EnergyModelsBase.jl.git"} [compat] Alpine = "0.5.7" -EnergyModelsBase = "0.9.2" JuMP = "1.28.0" PiecewiseAffineApprox = "0.6.4" TimeStruct = "0.9.5" From 4412d155e2cac88c71b225aed3e96d04c440fa5f Mon Sep 17 00:00:00 2001 From: Lars Hellemo Date: Thu, 26 Mar 2026 13:01:23 +0100 Subject: [PATCH 3/4] Update to JSON (vs JSON2) and newest Alpine for tests. --- Project.toml | 8 ++++---- src/EnergyModelsGasNetworks.jl | 2 +- src/scratch.jl | 4 ++-- test/Project.toml | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Project.toml b/Project.toml index 5a3aa8e..0b70171 100644 --- a/Project.toml +++ b/Project.toml @@ -9,7 +9,7 @@ projects = ["docs"] [deps] Documenter = "e30172f5-a6a5-5a46-863b-614d45cd2de4" EnergyModelsBase = "5d7e687e-f956-46f3-9045-6f5a5fd49f50" -JSON3 = "0f8b85d8-7281-11e9-16c2-39a750bddbf1" +JSON = "682c06a0-de6a-54ab-a142-c8b1cf79cde6" JuMP = "4076af6c-e467-56ae-b986-b466b2749572" LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e" PiecewiseAffineApprox = "029c5f1c-0dc4-4551-8b87-a10b73fe3713" @@ -17,12 +17,12 @@ Scratch = "6c6a2e73-6563-6170-7368-637461726353" TimeStruct = "f9ed5ce0-9f41-4eaa-96da-f38ab8df101c" [compat] -julia = "1.12" Documenter = "1.17.0" EnergyModelsBase = "0.9.5" -JSON3 = "1.14.3" +JSON = "1.4.0" JuMP = "1.28.0" LinearAlgebra = "1.12" -PiecewiseAffineApprox = "0.6.4" +PiecewiseAffineApprox = "0.6.6" Scratch = "1.3" TimeStruct = "0.9.8" +julia = "1.12" diff --git a/src/EnergyModelsGasNetworks.jl b/src/EnergyModelsGasNetworks.jl index 1c9c2d8..db18ea5 100644 --- a/src/EnergyModelsGasNetworks.jl +++ b/src/EnergyModelsGasNetworks.jl @@ -9,7 +9,7 @@ using PiecewiseAffineApprox using LinearAlgebra using Scratch -using JSON3 +using JSON ### PARAMETERS const _STEP_PRESSURE = Ref(10) # Pressure step for PWA approximation diff --git a/src/scratch.jl b/src/scratch.jl index ea8aad2..1a6ab87 100644 --- a/src/scratch.jl +++ b/src/scratch.jl @@ -12,14 +12,14 @@ get_input_fn(x, y) = joinpath(@get_scratch!("curve_cache"), string(hash((x, y)), Reads the `PiecewiseAffineApprox.PWAFunc` objects from a JSON file `fn`. """ -read_from_json(fn) = JSON3.read(fn, PiecewiseAffineApprox.PWAFunc) +read_from_json(fn) = JSON.parsefile(fn, PiecewiseAffineApprox.PWAFunc) """ write_to_json(fn, pwa) Writes the `PiecewiseAffineApprox.PWAFunc` object `pwa` to a JSON file `fn`. """ -write_to_json(fn, pwa) = JSON3.write(fn, pwa) +write_to_json(fn, pwa) = JSON.json(fn, pwa) """ delete_cache() diff --git a/test/Project.toml b/test/Project.toml index b6c1836..13b936e 100644 --- a/test/Project.toml +++ b/test/Project.toml @@ -15,7 +15,7 @@ Xpress_jll = "308bddfa-7f95-4fa6-a557-f2c7addc1869" [compat] -Alpine = "0.5.7" +Alpine = "0.5.8" JuMP = "1.28.0" PiecewiseAffineApprox = "0.6.4" TimeStruct = "0.9.5" From 816cffd1fe080aa898e822be88ae0c85a97122ab Mon Sep 17 00:00:00 2001 From: Lars Hellemo Date: Thu, 26 Mar 2026 13:30:30 +0100 Subject: [PATCH 4/4] Reenable LTS tests --- .github/workflows/CI.yml | 12 ++++++------ Project.toml | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 616d472..1bb42d3 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -22,12 +22,12 @@ jobs: - version: '1' # The latest point-release (Windows) os: windows-latest arch: x64 - # - version: 'lts' # Long term stable version (Linux) - # os: ubuntu-latest - # arch: x64 - # - version: 'lts' # Long term stable version (Windows) - # os: windows-latest - # arch: x64 + - version: 'lts' # Long term stable version (Linux) + os: ubuntu-latest + arch: x64 + - version: 'lts' # Long term stable version (Windows) + os: windows-latest + arch: x64 steps: - uses: actions/checkout@v4 - uses: julia-actions/setup-julia@v2 diff --git a/Project.toml b/Project.toml index 0b70171..a4c1251 100644 --- a/Project.toml +++ b/Project.toml @@ -21,8 +21,8 @@ Documenter = "1.17.0" EnergyModelsBase = "0.9.5" JSON = "1.4.0" JuMP = "1.28.0" -LinearAlgebra = "1.12" +LinearAlgebra = "1.10" PiecewiseAffineApprox = "0.6.6" Scratch = "1.3" TimeStruct = "0.9.8" -julia = "1.12" +julia = "1.10" # LTS