use a TimeZones.jl fork for now

Alternative to #687, which wasn't working well with PackageCompiler due to long paths still. This switches to a fork. A PR to merge this upstream has already been submitted: JuliaTime/TimeZones.jl#450 Clearly this is temporary, but since we use Manifests this should work ok.
Deltares · Oct 25, 2023 · 0ff7678 · 0ff7678
1 parent 14e87c1
commit 0ff7678
Show file tree

Hide file tree

Showing 9 changed files with 14 additions and 38 deletions.
diff --git a/build/create_binaries/Manifest.toml b/build/create_binaries/Manifest.toml
@@ -2,7 +2,7 @@
 
 julia_version = "1.9.3"
 manifest_format = "2.0"
-project_hash = "71b2262fd2a2bd6f9c0ade48d4062e051c3f39eb"
+project_hash = "d99377ff8fe51b02cfd3a3aaf109a7ed1b45b3d2"
 
 [[deps.ArgTools]]
 uuid = "0dad84c5-d112-42e6-8d28-ef12dabb789f"
@@ -191,8 +191,10 @@ uuid = "a4e569a6-e804-4fa4-b0f3-eef7a1d5b13e"
 version = "1.10.0"
 
 [[deps.TimeZones]]
-deps = ["Artifacts", "Dates", "Downloads", "InlineStrings", "LazyArtifacts", "Mocking", "Printf", "Scratch", "TZJData", "Unicode", "p7zip_jll"]
-git-tree-sha1 = "89e64d61ef3cd9e80f7fc12b7d13db2d75a23c03"
+deps = ["Artifacts", "Dates", "Downloads", "InlineStrings", "Mocking", "Printf", "Scratch", "TZJData", "Unicode", "p7zip_jll"]
+git-tree-sha1 = "6f2a9362603a79a916c54a10fc7c9a4ff2ca0848"
+repo-rev = "cldr"
+repo-url = "https://github.com/visr/TimeZones.jl"
 uuid = "f269a46b-ccf7-5d73-abea-4c690281aa53"
 version = "1.13.0"
 

diff --git a/build/create_binaries/Project.toml b/build/create_binaries/Project.toml
@@ -7,5 +7,5 @@ TimeZones = "f269a46b-ccf7-5d73-abea-4c690281aa53"
 
 [compat]
 PackageCompiler = "2"
-TimeZones = "=1.13.0"
+TimeZones = "1.13"
 julia = "1.9"
diff --git a/build/create_binaries/create_app.jl b/build/create_binaries/create_app.jl
@@ -2,8 +2,6 @@ using PackageCompiler
 using TOML
 using LibGit2
 
-include("strip_cldr.jl")
-
 # change directory to this script's location
 cd(@__DIR__)
 

diff --git a/build/create_binaries/create_lib.jl b/build/create_binaries/create_lib.jl
@@ -2,8 +2,6 @@ using PackageCompiler
 using TOML
 using LibGit2
 
-include("strip_cldr.jl")
-
 cd(@__DIR__)
 
 project_dir = "../libribasim"

diff --git a/build/create_binaries/strip_cldr.jl b/build/create_binaries/strip_cldr.jl
diff --git a/build/libribasim/Manifest.toml b/build/libribasim/Manifest.toml
@@ -979,7 +979,7 @@ uuid = "ae029012-a4dd-5104-9daa-d747884805df"
 version = "1.3.0"
 
 [[deps.Ribasim]]
-deps = ["Arrow", "BasicModelInterface", "CodecLz4", "CodecZstd", "ComponentArrays", "Configurations", "DBInterface", "DataInterpolations", "DataStructures", "Dates", "Dictionaries", "DiffEqCallbacks", "FiniteDiff", "ForwardDiff", "Graphs", "HiGHS", "IterTools", "JuMP", "Legolas", "Logging", "LoggingExtras", "OrdinaryDiffEq", "PreallocationTools", "SQLite", "SciMLBase", "SparseArrays", "StructArrays", "Tables", "TerminalLoggers", "TimerOutputs", "TranscodingStreams"]
+deps = ["Arrow", "BasicModelInterface", "CodecLz4", "CodecZstd", "ComponentArrays", "Configurations", "DBInterface", "DataInterpolations", "DataStructures", "Dates", "Dictionaries", "DiffEqCallbacks", "FiniteDiff", "ForwardDiff", "Graphs", "HiGHS", "IterTools", "JuMP", "Legolas", "Logging", "LoggingExtras", "OrdinaryDiffEq", "PreallocationTools", "SQLite", "SciMLBase", "SparseArrays", "StructArrays", "Tables", "TerminalLoggers", "TimeZones", "TimerOutputs", "TranscodingStreams"]
 path = "../../core"
 uuid = "aac5e3d9-0b8f-4d4f-8241-b1a7a9632635"
 version = "0.3.0"

diff --git a/build/ribasim_cli/Manifest.toml b/build/ribasim_cli/Manifest.toml
@@ -979,7 +979,7 @@ uuid = "ae029012-a4dd-5104-9daa-d747884805df"
 version = "1.3.0"
 
 [[deps.Ribasim]]
-deps = ["Arrow", "BasicModelInterface", "CodecLz4", "CodecZstd", "ComponentArrays", "Configurations", "DBInterface", "DataInterpolations", "DataStructures", "Dates", "Dictionaries", "DiffEqCallbacks", "FiniteDiff", "ForwardDiff", "Graphs", "HiGHS", "IterTools", "JuMP", "Legolas", "Logging", "LoggingExtras", "OrdinaryDiffEq", "PreallocationTools", "SQLite", "SciMLBase", "SparseArrays", "StructArrays", "Tables", "TerminalLoggers", "TimerOutputs", "TranscodingStreams"]
+deps = ["Arrow", "BasicModelInterface", "CodecLz4", "CodecZstd", "ComponentArrays", "Configurations", "DBInterface", "DataInterpolations", "DataStructures", "Dates", "Dictionaries", "DiffEqCallbacks", "FiniteDiff", "ForwardDiff", "Graphs", "HiGHS", "IterTools", "JuMP", "Legolas", "Logging", "LoggingExtras", "OrdinaryDiffEq", "PreallocationTools", "SQLite", "SciMLBase", "SparseArrays", "StructArrays", "Tables", "TerminalLoggers", "TimeZones", "TimerOutputs", "TranscodingStreams"]
 path = "../../core"
 uuid = "aac5e3d9-0b8f-4d4f-8241-b1a7a9632635"
 version = "0.3.0"

diff --git a/core/Manifest.toml b/core/Manifest.toml
@@ -2,7 +2,7 @@
 
 julia_version = "1.9.3"
 manifest_format = "2.0"
-project_hash = "c63b237aec6a6bf6314284b2b07a94b93a9f0a36"
+project_hash = "734d92f362e5faf41ff9058fcbfa26406306498c"
 
 [[deps.ADTypes]]
 git-tree-sha1 = "5d2e21d7b0d8c22f67483ef95ebdc39c0e6b6003"
@@ -1257,8 +1257,10 @@ uuid = "8290d209-cae3-49c0-8002-c8c24d57dab5"
 version = "0.5.2"
 
 [[deps.TimeZones]]
-deps = ["Artifacts", "Dates", "Downloads", "InlineStrings", "LazyArtifacts", "Mocking", "Printf", "Scratch", "TZJData", "Unicode", "p7zip_jll"]
-git-tree-sha1 = "89e64d61ef3cd9e80f7fc12b7d13db2d75a23c03"
+deps = ["Artifacts", "Dates", "Downloads", "InlineStrings", "Mocking", "Printf", "Scratch", "TZJData", "Unicode", "p7zip_jll"]
+git-tree-sha1 = "6f2a9362603a79a916c54a10fc7c9a4ff2ca0848"
+repo-rev = "cldr"
+repo-url = "https://github.com/visr/TimeZones.jl"
 uuid = "f269a46b-ccf7-5d73-abea-4c690281aa53"
 version = "1.13.0"
 weakdeps = ["RecipesBase"]

diff --git a/core/Project.toml b/core/Project.toml
@@ -65,7 +65,7 @@ SciMLBase = "1.60, 2"
 StructArrays = "0.6.13"
 Tables = "1"
 TerminalLoggers = "0.1.7"
-TimeZones = "=1.13.0"
+TimeZones = "1.13"
 TimerOutputs = "0.5"
 TranscodingStreams = "0.9, 0.10"
 julia = "1.9"