Merge pull request #119 from JuliaTime/cv/tz2018b

Default to using 2018b tzdata
JuliaTime · Jan 30, 2018 · 0085362 · 0085362
2 parents f82289e + 5536340
commit 0085362
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/deps/build.jl b/deps/build.jl
@@ -3,4 +3,4 @@ import TimeZones: build
 # ENV variable allows users to modify the default to be "latest". Do NOT use "latest"
 # as the default here as can make it difficult to debug to past versions of working code.
 # Note: Also allows us to only download a single tzdata version during CI jobs.
-build(get(ENV, "JULIA_TZ_VERSION", "2017c"))
+build(get(ENV, "JULIA_TZ_VERSION", "2018b"))
diff --git a/deps/local/windowsZones.xml b/deps/local/windowsZones.xml
@@ -299,7 +299,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<mapZone other="Greenwich Standard Time" territory="SH" type="Atlantic/St_Helena"/>
 			<mapZone other="Greenwich Standard Time" territory="SL" type="Africa/Freetown"/>
 			<mapZone other="Greenwich Standard Time" territory="SN" type="Africa/Dakar"/>
-			<mapZone other="Greenwich Standard Time" territory="ST" type="Africa/Sao_Tome"/>
 			<mapZone other="Greenwich Standard Time" territory="TG" type="Africa/Lome"/>
 
 			<!-- (UTC+01:00) Amsterdam, Berlin, Bern, Rome, Stockholm, Vienna -->
@@ -358,6 +357,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<mapZone other="W. Central Africa Standard Time" territory="GQ" type="Africa/Malabo"/>
 			<mapZone other="W. Central Africa Standard Time" territory="NE" type="Africa/Niamey"/>
 			<mapZone other="W. Central Africa Standard Time" territory="NG" type="Africa/Lagos"/>
+			<mapZone other="W. Central Africa Standard Time" territory="ST" type="Africa/Sao_Tome"/>
 			<mapZone other="W. Central Africa Standard Time" territory="TD" type="Africa/Ndjamena"/>
 			<mapZone other="W. Central Africa Standard Time" territory="TN" type="Africa/Tunis"/>
 			<mapZone other="W. Central Africa Standard Time" territory="ZZ" type="Etc/GMT-1"/>

diff --git a/src/tzdata/compile.jl b/src/tzdata/compile.jl
@@ -192,8 +192,8 @@ function ruleparse(from, to, rule_type, month, on, at, save, letter)
     letter = letter == "-" ? "" : letter
 
     # Report unexpected save values that could cause issues during resolve.
-    save_hm < MIN_SAVE && @warn "Discovered save $save_hm less than the expected min $MIN_SAVE"
-    save_hm > MAX_SAVE && @warn "Discovered save $save_hm larger than the expected max $MAX_SAVE"
+    save_hm < MIN_SAVE && @warn "Discovered save \"$save\" less than the expected min $MIN_SAVE"
+    save_hm > MAX_SAVE && @warn "Discovered save \"$save\" larger than the expected max $MAX_SAVE"
 
     # Now we've finally parsed everything we need
     return Rule(

diff --git a/src/tzdata/timeoffset.jl b/src/tzdata/timeoffset.jl
@@ -70,7 +70,7 @@ const MAX_GMT_OFFSET = TimeOffset("15:13:42")   # America/Metlakatla
 
 # min/max save across all zones/rules and all time.
 # Note: A warning is given when we find an Olson rule that exceeds these values.
-const MIN_SAVE = TimeOffset("00:00")
+const MIN_SAVE = TimeOffset("-01:00") # Eire (rule in 2018a)
 const MAX_SAVE = TimeOffset("02:00")  # France, Germany, Port, Spain
 
 const MIN_OFFSET = MIN_GMT_OFFSET + MIN_SAVE