Skip to content

Commit

Permalink
Switch to TimeZones release 1.15 (#1432)
Browse files Browse the repository at this point in the history
Since [our
contribution](JuliaTime/TimeZones.jl#450) is
merged upstream and released, we can stop using a fork.
We don't directly depend on this package, but it is an Arrow.jl
dependency. Therefore it can now be removed as a direct dependency,
which was only done to be able to specify compat and point it to a fork.
  • Loading branch information
visr authored Apr 29, 2024
1 parent db517dd commit 2e12d82
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 10 deletions.
12 changes: 5 additions & 7 deletions Manifest.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

julia_version = "1.10.0"
manifest_format = "2.0"
project_hash = "122f7ec8a573942606ded1bed87e60f2356f603a"
project_hash = "045162196d64ccb59bdab2af0422fde0b0e83c77"

[[deps.ADTypes]]
git-tree-sha1 = "016833eb52ba2d6bea9fcb50ca295980e728ee24"
Expand Down Expand Up @@ -1259,7 +1259,7 @@ uuid = "295af30f-e4ad-537b-8983-00126c2a3abe"
version = "3.5.14"

[[deps.Ribasim]]
deps = ["Accessors", "Arrow", "BasicModelInterface", "CodecZstd", "ComponentArrays", "Configurations", "DBInterface", "DataInterpolations", "DataStructures", "Dates", "Dictionaries", "DiffEqCallbacks", "EnumX", "FiniteDiff", "ForwardDiff", "Graphs", "HiGHS", "IterTools", "JuMP", "Legolas", "LinearSolve", "Logging", "LoggingExtras", "MetaGraphsNext", "OrdinaryDiffEq", "PreallocationTools", "SQLite", "SciMLBase", "SparseArrays", "StructArrays", "Tables", "TerminalLoggers", "TimeZones", "TimerOutputs", "TranscodingStreams"]
deps = ["Accessors", "Arrow", "BasicModelInterface", "CodecZstd", "ComponentArrays", "Configurations", "DBInterface", "DataInterpolations", "DataStructures", "Dates", "Dictionaries", "DiffEqCallbacks", "EnumX", "FiniteDiff", "ForwardDiff", "Graphs", "HiGHS", "IterTools", "JuMP", "Legolas", "LinearSolve", "Logging", "LoggingExtras", "MetaGraphsNext", "OrdinaryDiffEq", "PreallocationTools", "SQLite", "SciMLBase", "SparseArrays", "StructArrays", "Tables", "TerminalLoggers", "TimerOutputs", "TranscodingStreams"]
path = "core"
uuid = "aac5e3d9-0b8f-4d4f-8241-b1a7a9632635"
version = "2024.7.0"
Expand Down Expand Up @@ -1582,12 +1582,10 @@ uuid = "8290d209-cae3-49c0-8002-c8c24d57dab5"
version = "0.5.2"

[[deps.TimeZones]]
deps = ["Artifacts", "Dates", "Downloads", "InlineStrings", "Mocking", "Printf", "Scratch", "TZJData", "Unicode", "p7zip_jll"]
git-tree-sha1 = "021f851fb28228de4df641cd128f1ad702cd24df"
repo-rev = "cldr-ribasim"
repo-url = "https://github.com/visr/TimeZones.jl"
deps = ["Dates", "Downloads", "InlineStrings", "Mocking", "Printf", "Scratch", "TZJData", "Unicode", "p7zip_jll"]
git-tree-sha1 = "96793c9316d6c9f9be4641f2e5b1319a205e6f27"
uuid = "f269a46b-ccf7-5d73-abea-4c690281aa53"
version = "1.14.0"
version = "1.15.0"
weakdeps = ["RecipesBase"]

[deps.TimeZones.extensions]
Expand Down
1 change: 0 additions & 1 deletion Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,5 @@ TOML = "fa267f1f-6049-4f14-aa54-33bafae1ed76"
Tables = "bd369af6-aec1-5ad0-b16a-f7cc5008161c"
TerminalLoggers = "5d786b92-1e48-4d6f-9151-6b4477ca9bed"
TestEnv = "1e6cf692-eddd-4d53-88a5-2d735e33781b"
TimeZones = "f269a46b-ccf7-5d73-abea-4c690281aa53"
TimerOutputs = "a759f4b9-e2f1-59dc-863e-4aeb61b1ea8f"
TranscodingStreams = "3bb67fe8-82b1-5028-8e26-92a6c54297fa"
2 changes: 0 additions & 2 deletions core/Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
StructArrays = "09ab397b-f2b6-538f-b94a-2f83cf4a842a"
Tables = "bd369af6-aec1-5ad0-b16a-f7cc5008161c"
TerminalLoggers = "5d786b92-1e48-4d6f-9151-6b4477ca9bed"
TimeZones = "f269a46b-ccf7-5d73-abea-4c690281aa53"
TimerOutputs = "a759f4b9-e2f1-59dc-863e-4aeb61b1ea8f"
TranscodingStreams = "3bb67fe8-82b1-5028-8e26-92a6c54297fa"

Expand Down Expand Up @@ -82,7 +81,6 @@ TOML = "<0.0.1,1"
Tables = "1"
TerminalLoggers = "0.1.7"
Test = "<0.0.1,1"
TimeZones = "=1.14.0"
TimerOutputs = "0.5"
TranscodingStreams = "0.9,0.10"
julia = "1.10"
Expand Down

0 comments on commit 2e12d82

Please sign in to comment.