From 6e27d4e3178025873aea0c2f48a58edef35952f0 Mon Sep 17 00:00:00 2001 From: cake Date: Fri, 21 Jun 2024 05:22:43 -0500 Subject: [PATCH 1/4] Move TimeZones dependency into an extension --- Project.toml | 15 ++++++++++----- ext/UnixTimesTimeZonesExt.jl | 11 +++++++++++ src/UnixTimes.jl | 4 ---- 3 files changed, 21 insertions(+), 9 deletions(-) create mode 100644 ext/UnixTimesTimeZonesExt.jl diff --git a/Project.toml b/Project.toml index 02d24cb..bf08108 100644 --- a/Project.toml +++ b/Project.toml @@ -1,18 +1,23 @@ name = "UnixTimes" uuid = "ab1a18e7-b408-4913-896c-624bb82ed7f4" authors = ["Christian Rorvik "] -version = "1.3.0" +version = "1.3.1" [deps] Dates = "ade2ca70-3891-5945-98fb-dc099432e06a" -TimeZones = "f269a46b-ccf7-5d73-abea-4c690281aa53" [compat] -julia = "1" -TimeZones = "1" +julia = "1.9" [extras] Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40" +TimeZones = "f269a46b-ccf7-5d73-abea-4c690281aa53" [targets] -test = ["Test"] +test = ["Test", "TimeZones"] + +[weakdeps] +TimeZones = "f269a46b-ccf7-5d73-abea-4c690281aa53" + +[extensions] +UnixTimesTimeZonesExt = "TimeZones" diff --git a/ext/UnixTimesTimeZonesExt.jl b/ext/UnixTimesTimeZonesExt.jl new file mode 100644 index 0000000..f63289a --- /dev/null +++ b/ext/UnixTimesTimeZonesExt.jl @@ -0,0 +1,11 @@ +module UnixTimesTimeZonesExt + +using Dates +using TimeZones +using UnixTimes + +UnixTimes.UnixTime(x::ZonedDateTime) = UnixTime(DateTime(x, UTC)) +TimeZones.ZonedDateTime(x::UnixTime, tz::TimeZone) = + ZonedDateTime(DateTime(x), tz; from_utc = true) + +end diff --git a/src/UnixTimes.jl b/src/UnixTimes.jl index 92cec68..7f2a97a 100644 --- a/src/UnixTimes.jl +++ b/src/UnixTimes.jl @@ -1,7 +1,6 @@ module UnixTimes using Dates -using TimeZones export UnixTime export unix_now @@ -66,9 +65,6 @@ UnixTime(x::Date, y::Time) = Base.convert(::Type{UnixTime}, x::DateTime) = UnixTime(x) -UnixTime(x::ZonedDateTime) = UnixTime(DateTime(x, UTC)) -ZonedDateTime(x::UnixTime, tz::TimeZone) = ZonedDateTime(DateTime(x), tz; from_utc = true) - function Base.show(io::IO, x::UnixTime) xdt = convert(DateTime, x) print(io, Dates.format(xdt, dateformat"yyyy-mm-ddTHH:MM:SS.sss")) From 558f95b5b1d22d92807ab1eb740f63efae11d44f Mon Sep 17 00:00:00 2001 From: cake Date: Fri, 21 Jun 2024 07:07:17 -0500 Subject: [PATCH 2/4] Move TimeZones dependency into an extension --- Project.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/Project.toml b/Project.toml index bf08108..2ae8110 100644 --- a/Project.toml +++ b/Project.toml @@ -7,6 +7,7 @@ version = "1.3.1" Dates = "ade2ca70-3891-5945-98fb-dc099432e06a" [compat] +TimeZones = "f269a46b-ccf7-5d73-abea-4c690281aa53" julia = "1.9" [extras] From 1fc4abbd65891ff85180c87065eb70867fbb16a8 Mon Sep 17 00:00:00 2001 From: cake Date: Fri, 21 Jun 2024 07:09:37 -0500 Subject: [PATCH 3/4] Move TimeZones dependency into an extension --- Project.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Project.toml b/Project.toml index 2ae8110..50e3ee5 100644 --- a/Project.toml +++ b/Project.toml @@ -7,7 +7,7 @@ version = "1.3.1" Dates = "ade2ca70-3891-5945-98fb-dc099432e06a" [compat] -TimeZones = "f269a46b-ccf7-5d73-abea-4c690281aa53" +TimeZones = "1" julia = "1.9" [extras] From 5a65143d1c7ded8702aca0fd6ca3cf676b03f52c Mon Sep 17 00:00:00 2001 From: cake-duke <125920266+cake-duke@users.noreply.github.com> Date: Fri, 21 Jun 2024 07:10:52 -0500 Subject: [PATCH 4/4] Update Project.toml Co-authored-by: Christian Rorvik --- Project.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Project.toml b/Project.toml index 50e3ee5..caaaecd 100644 --- a/Project.toml +++ b/Project.toml @@ -1,7 +1,7 @@ name = "UnixTimes" uuid = "ab1a18e7-b408-4913-896c-624bb82ed7f4" authors = ["Christian Rorvik "] -version = "1.3.1" +version = "1.4.0" [deps] Dates = "ade2ca70-3891-5945-98fb-dc099432e06a"