From 181365fb92d5a0b77bd242d5d370b214b8d5c5e1 Mon Sep 17 00:00:00 2001 From: Curtis Vogt Date: Mon, 25 Jan 2021 17:31:27 -0600 Subject: [PATCH 1/2] Update dev manifest --- dev/Manifest.toml | 68 ++++++++++++++++++++++++++++------------------- dev/Project.toml | 2 +- 2 files changed, 41 insertions(+), 29 deletions(-) diff --git a/dev/Manifest.toml b/dev/Manifest.toml index b6a97c17a..3376d0bd6 100644 --- a/dev/Manifest.toml +++ b/dev/Manifest.toml @@ -1,5 +1,11 @@ # This file is machine-generated - editing it directly is not advised +[[Artifacts]] +deps = ["Pkg"] +git-tree-sha1 = "c30985d8821e0cd73870b17b0ed0ce6dc44cb744" +uuid = "56f22d72-fd6d-98f1-02f0-08ddc0907c33" +version = "1.3.0" + [[Base64]] uuid = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f" @@ -12,9 +18,9 @@ deps = ["Random", "Serialization", "Sockets"] uuid = "8ba89e20-285c-5b6f-9357-94700520ee1b" [[ExprTools]] -git-tree-sha1 = "6f0517056812fd6aa3af23d4b70d5325a2ae4e95" +git-tree-sha1 = "10407a39b87f29d47ebaca8edbc75d7c302ff93e" uuid = "e2ba6199-217a-4e67-a87a-7c52f15ade04" -version = "0.1.1" +version = "0.1.3" [[EzXML]] deps = ["Printf", "XML2_jll"] @@ -24,9 +30,9 @@ version = "1.1.0" [[HTTP]] deps = ["Base64", "Dates", "IniFile", "MbedTLS", "Sockets"] -git-tree-sha1 = "eca61b35cdd8cd2fcc5eec1eda766424a995b02f" +git-tree-sha1 = "c7ec02c4c6a039a98a15f955462cd7aea5df4508" uuid = "cd3eb016-35fb-5094-929b-558a96fad6f3" -version = "0.8.16" +version = "0.8.19" [[IniFile]] deps = ["Test"] @@ -38,23 +44,29 @@ version = "0.5.0" deps = ["Markdown"] uuid = "b77e0a4c-d291-57a0-90e8-8db25a27a240" +[[JLLWrappers]] +git-tree-sha1 = "a431f5f2ca3f4feef3bd7a5e94b8b8d4f2f647a0" +uuid = "692b3bcd-3c85-4b1f-b108-f13ce0eb3210" +version = "1.2.0" + [[JSON]] deps = ["Dates", "Mmap", "Parsers", "Unicode"] -git-tree-sha1 = "b34d7cef7b337321e97d22242c3c2b91f476748e" +git-tree-sha1 = "81690084b6198a2e1da36fcfda16eeca9f9f24e4" uuid = "682c06a0-de6a-54ab-a142-c8b1cf79cde6" -version = "0.21.0" +version = "0.21.1" [[LibGit2]] +deps = ["Printf"] uuid = "76f85450-5226-5b5a-8eaa-529ad045b433" [[Libdl]] uuid = "8f399da3-3557-5675-b5ff-fb832c97cbdb" [[Libiconv_jll]] -deps = ["Libdl", "Pkg"] -git-tree-sha1 = "c9d4035d7481bcdff2babf5a55525a818ef8ed8f" +deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] +git-tree-sha1 = "8e924324b2e9275a51407a4e06deb3455b1e359f" uuid = "94ce4f54-9a6c-5748-9c1c-f9c7231a4531" -version = "1.16.0+5" +version = "1.16.0+7" [[Logging]] uuid = "56ddb016-857b-54e1-b83d-db4d58db5568" @@ -65,15 +77,15 @@ uuid = "d6f4376e-aef5-505a-96c1-9c027394607a" [[MbedTLS]] deps = ["Dates", "MbedTLS_jll", "Random", "Sockets"] -git-tree-sha1 = "426a6978b03a97ceb7ead77775a1da066343ec6e" +git-tree-sha1 = "1c38e51c3d08ef2278062ebceade0e46cefc96fe" uuid = "739be429-bea8-5141-9913-cc70e7f3736d" -version = "1.0.2" +version = "1.0.3" [[MbedTLS_jll]] -deps = ["Libdl", "Pkg"] -git-tree-sha1 = "a0cb0d489819fa7ea5f9fa84c7e7eba19d8073af" +deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] +git-tree-sha1 = "0eef589dd1c26a3ac9d753fe1a8bcad63f956fa6" uuid = "c8ffd9c3-330d-5841-b78e-0817d7145fa1" -version = "2.16.6+1" +version = "2.16.8+1" [[Mmap]] uuid = "a63ad114-7e13-5084-954f-fe012c677804" @@ -85,13 +97,13 @@ uuid = "78c3b35d-d492-501b-9361-3d52fe80e533" version = "0.7.1" [[Parsers]] -deps = ["Dates", "Test"] -git-tree-sha1 = "10134f2ee0b1978ae7752c41306e131a684e1f06" +deps = ["Dates"] +git-tree-sha1 = "50c9a9ed8c714945e01cd53a21007ed3865ed714" uuid = "69de0a69-1ddd-5017-9359-2bf0b02dc9f0" -version = "1.0.7" +version = "1.0.15" [[Pkg]] -deps = ["Dates", "LibGit2", "Libdl", "Logging", "Markdown", "Printf", "REPL", "Random", "SHA", "Test", "UUIDs"] +deps = ["Dates", "LibGit2", "Libdl", "Logging", "Markdown", "Printf", "REPL", "Random", "SHA", "UUIDs"] uuid = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f" [[Printf]] @@ -107,9 +119,9 @@ deps = ["Serialization"] uuid = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c" [[RecipesBase]] -git-tree-sha1 = "54f8ceb165a0f6d083f0d12cb4996f5367c6edbc" +git-tree-sha1 = "b3fb709f3c97bfc6e948be68beeecb55a0b340ae" uuid = "3cdcf5f2-1ef4-517c-9805-6587b60abb01" -version = "1.0.1" +version = "1.1.1" [[SHA]] uuid = "ea8e919c-243c-51af-8825-aaa63cd721ce" @@ -125,10 +137,10 @@ deps = ["Distributed", "InteractiveUtils", "Logging", "Random"] uuid = "8dfed614-e22c-5e08-85e1-65c5234f0b40" [[TimeZones]] -deps = ["Dates", "EzXML", "HTTP", "Mocking", "Pkg", "Printf", "RecipesBase", "Serialization", "Unicode"] +deps = ["Dates", "EzXML", "Mocking", "Pkg", "Printf", "RecipesBase", "Serialization", "Unicode"] path = ".." uuid = "f269a46b-ccf7-5d73-abea-4c690281aa53" -version = "1.3.0" +version = "1.5.3" [[UUIDs]] deps = ["Random", "SHA"] @@ -138,13 +150,13 @@ uuid = "cf7118a7-6976-5b1a-9a39-7adc72f591a4" uuid = "4ec0a83e-493e-50e2-b9ac-8f72acf5a8f5" [[XML2_jll]] -deps = ["Libdl", "Libiconv_jll", "Pkg", "Zlib_jll"] -git-tree-sha1 = "432d91f45e950f2f2bda5c0f4e2b938c14493af9" +deps = ["Artifacts", "JLLWrappers", "Libdl", "Libiconv_jll", "Pkg", "Zlib_jll"] +git-tree-sha1 = "be0db24f70aae7e2b89f2f3092e93b8606d659a6" uuid = "02c8fc9c-b97f-50b9-bbe4-9be30ff0a78a" -version = "2.9.10+1" +version = "2.9.10+3" [[Zlib_jll]] -deps = ["Libdl", "Pkg"] -git-tree-sha1 = "622d8b6dc0c7e8029f17127703de9819134d1b71" +deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] +git-tree-sha1 = "320228915c8debb12cb434c59057290f0834dbf6" uuid = "83775a58-1f1d-513f-b197-d71354ab007a" -version = "1.2.11+14" +version = "1.2.11+18" diff --git a/dev/Project.toml b/dev/Project.toml index b22f94e46..4283ba035 100644 --- a/dev/Project.toml +++ b/dev/Project.toml @@ -4,6 +4,6 @@ JSON = "682c06a0-de6a-54ab-a142-c8b1cf79cde6" TimeZones = "f269a46b-ccf7-5d73-abea-4c690281aa53" [compat] -JSON = "0.20.1, 0.21" HTTP = "0.8.1" +JSON = "0.20.1, 0.21" julia = "1.3" From faa208e8a7c4f6f25b9b50668eacc03a4b3e0900 Mon Sep 17 00:00:00 2001 From: Curtis Vogt Date: Mon, 25 Jan 2021 17:31:57 -0600 Subject: [PATCH 2/2] Default to using 2021a tzdata --- Artifacts.toml | 32 ++++++++++++++++++++++++++++++++ src/tzdata/version.jl | 2 +- 2 files changed, 33 insertions(+), 1 deletion(-) diff --git a/Artifacts.toml b/Artifacts.toml index b58b30e2a..3b0021e69 100644 --- a/Artifacts.toml +++ b/Artifacts.toml @@ -1758,6 +1758,30 @@ lazy = true sha256 = "8d813957de363387696f05af8a8889afa282ab5016a764c701a20758d39cbaf3" url = "https://data.iana.org/time-zones/releases/tzdata2020d.tar.gz" +[tzdata2020e] +git-tree-sha1 = "d28cef3bce8ceb2692d4303cd9fcde11859cb39b" +lazy = true + + [[tzdata2020e.download]] + sha256 = "0be1ba329eae29ae1b54057c3547b3e672f73b3ae7643aa87dac85122bec037e" + url = "https://data.iana.org/time-zones/releases/tzdata2020e.tar.gz" + +[tzdata2020f] +git-tree-sha1 = "f4432f9e5f3f7664ca0bc314701faedcf8ce8c7e" +lazy = true + + [[tzdata2020f.download]] + sha256 = "121131918c3ae6dc5d40f0eb87563a2be920b71a76e2392c09519a5e4a666881" + url = "https://data.iana.org/time-zones/releases/tzdata2020f.tar.gz" + +[tzdata2021a] +git-tree-sha1 = "6d94ada27957590cbd0d7678f5ae711232a4d714" +lazy = true + + [[tzdata2021a.download]] + sha256 = "39e7d2ba08c68cbaefc8de3227aab0dec2521be8042cf56855f7dc3a9fb14e08" + url = "https://data.iana.org/time-zones/releases/tzdata2021a.tar.gz" + [tzdata93g] git-tree-sha1 = "e7ddeb4a45080afa6dbdd7c38df81bcf8b9d8f1a" lazy = true @@ -1973,3 +1997,11 @@ lazy = true [[unicode-cldr-release-37.download]] sha256 = "28e1617f70f18cd96162972b1deeb3f2bacc5b9fe02a1494b6dbfcff79ea0f7a" url = "https://github.com/unicode-org/cldr/archive/release-37.tar.gz" + +[unicode-cldr-release-38-1] +git-tree-sha1 = "e3650bb0f45e427653d800ef75558003e7ab4fc0" +lazy = true + + [[unicode-cldr-release-38-1.download]] + sha256 = "923126ef0d459fc4a642514e982d1181472b7a191b82e69929a038a8a469ea7e" + url = "https://github.com/unicode-org/cldr/archive/release-38-1.tar.gz" diff --git a/src/tzdata/version.jl b/src/tzdata/version.jl index 1b668fd51..29df51bcb 100644 --- a/src/tzdata/version.jl +++ b/src/tzdata/version.jl @@ -2,7 +2,7 @@ # We want to use a specific version here to ensure that specific revisions of the # TimeZones.jl package always use the same revision of tzdata. Doing so ensure that we can # always use older revisions of this package and always reproduce the same results. -const DEFAULT_TZDATA_VERSION = "2020d" # Do not use floating revision "latest" here +const DEFAULT_TZDATA_VERSION = "2021a" # Do not use floating revision "latest" here # Note: A tz code or data version consists of a year and letter while a release consists of