Update to latest EMB

.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

Project.toml

@@ -9,23 +9,20 @@ 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"
 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"
-JSON3 = "1.14.3"
+EnergyModelsBase = "0.9.5"
+JSON = "1.4.0"
 JuMP = "1.28.0"
-LinearAlgebra = "1.12"
-PiecewiseAffineApprox = "0.6.4"
+LinearAlgebra = "1.10"
+PiecewiseAffineApprox = "0.6.6"
 Scratch = "1.3"
 TimeStruct = "0.9.8"
+julia = "1.10" # LTS

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

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()

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"
+Alpine = "0.5.8"
 JuMP = "1.28.0"
 PiecewiseAffineApprox = "0.6.4"
 TimeStruct = "0.9.5"