From c5e7813c52598bb26cb884578fba36bca4b729db Mon Sep 17 00:00:00 2001 From: Paul Ganssle Date: Mon, 26 Sep 2022 09:53:22 -0400 Subject: [PATCH] Update to 2022c --- NEWS.md | 10 ++++++++++ VERSION | 2 +- news.d/2022c.md | 7 +++++++ src/tzdata/__init__.py | 4 ++-- src/tzdata/zoneinfo/tzdata.zi | 2 +- src/tzdata/zoneinfo/zone1970.tab | 24 ++++++++++++++++++++++++ 6 files changed, 45 insertions(+), 4 deletions(-) create mode 100644 news.d/2022c.md diff --git a/NEWS.md b/NEWS.md index b07c3cb..89cabee 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,3 +1,13 @@ +# Version 2022.3 +Upstream version 2022c released 2022-08-16T00:47:18+00:00 + +## Briefly: + +Work around awk bug in FreeBSD, macOS, etc. Improve tzselect on intercontinental +Zones. + +--- + # Version 2022.2 Upstream version 2022b released 2022-08-10T22:38:32+00:00 diff --git a/VERSION b/VERSION index bb4b488..b52d9af 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2022.2 \ No newline at end of file +2022.3 \ No newline at end of file diff --git a/news.d/2022c.md b/news.d/2022c.md new file mode 100644 index 0000000..e5ebb43 --- /dev/null +++ b/news.d/2022c.md @@ -0,0 +1,7 @@ +# Version 2022.3 +Upstream version 2022c released 2022-08-16T00:47:18+00:00 + +## Briefly: + +Work around awk bug in FreeBSD, macOS, etc. Improve tzselect on intercontinental +Zones. \ No newline at end of file diff --git a/src/tzdata/__init__.py b/src/tzdata/__init__.py index 9cd0374..5c462c5 100644 --- a/src/tzdata/__init__.py +++ b/src/tzdata/__init__.py @@ -1,6 +1,6 @@ # IANA versions like 2020a are not valid PEP 440 identifiers; the recommended # way to translate the version is to use YYYY.n where `n` is a 0-based index. -__version__ = "2022.2" +__version__ = "2022.3" # This exposes the original IANA version number. -IANA_VERSION = "2022b" +IANA_VERSION = "2022c" diff --git a/src/tzdata/zoneinfo/tzdata.zi b/src/tzdata/zoneinfo/tzdata.zi index 50f4010..8303e0c 100644 --- a/src/tzdata/zoneinfo/tzdata.zi +++ b/src/tzdata/zoneinfo/tzdata.zi @@ -1,4 +1,4 @@ -# version 2022b +# version 2022c # This zic input file is in the public domain. R d 1916 o - Jun 14 23s 1 S R d 1916 1919 - O Su>=1 23s 0 - diff --git a/src/tzdata/zoneinfo/zone1970.tab b/src/tzdata/zoneinfo/zone1970.tab index 3e1948c..19515f7 100644 --- a/src/tzdata/zoneinfo/zone1970.tab +++ b/src/tzdata/zoneinfo/zone1970.tab @@ -351,3 +351,27 @@ VN +1045+10640 Asia/Ho_Chi_Minh Vietnam (south) VU -1740+16825 Pacific/Efate WS -1350-17144 Pacific/Apia ZA,LS,SZ -2615+02800 Africa/Johannesburg +# +# The next section contains experimental tab-separated comments for +# use by user agents like tzselect that identify continents and oceans. +# +# For example, the comment "#@AQAntarctica/" means the country code +# AQ is in the continent Antarctica regardless of the Zone name, +# so Pacific/Auckland should be listed under Antarctica as well as +# under the Pacific because its line's country codes include AQ. +# +# If more than one country code is affected each is listed separated +# by commas, e.g., #@IS,SHAtlantic/". If a country code is in +# more than one continent or ocean, each is listed separated by +# commas, e.g., the second column of "#@CY,TRAsia/,Europe/". +# +# These experimental comments are present only for country codes where +# the continent or ocean is not already obvious from the Zone name. +# For example, there is no such comment for RU since it already +# corresponds to Zone names starting with both "Europe/" and "Asia/". +# +#@AQ Antarctica/ +#@IS,SH Atlantic/ +#@CY,TR Asia/,Europe/ +#@SJ Arctic/ +#@CC,CX,KM,MG,YT Indian/