Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# v1.8.3-alpha0

* Added the `America/Coyhaique` time zone, pr #432.

# v1.8.2

* Allow converting `mpdata` to `bytes`, issue #427.
Expand Down
2 changes: 1 addition & 1 deletion gen_timezones.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@


TZ_LINE = re.compile(
'^\s+\{\.name\=\"([\w\_\/\-\+]+)\"\}\,.*')
r'^\s+\{\.name\=\"([\w\_\/\-\+]+)\"\}\,.*')


def update_info(lines):
Expand Down
4 changes: 2 additions & 2 deletions inc/ti/version.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

#define TI_VERSION_MAJOR 1
#define TI_VERSION_MINOR 8
#define TI_VERSION_PATCH 2
#define TI_VERSION_PATCH 3

/* The syntax version is used to test compatibility with functions
* using the `ti_nodes_check_syntax()` function */
Expand All @@ -25,7 +25,7 @@
* "-rc0"
* ""
*/
#define TI_VERSION_PRE_RELEASE ""
#define TI_VERSION_PRE_RELEASE "-alpha0"

#define TI_MAINTAINER \
"Jeroen van der Heijden <jeroen@cesbit.com>"
Expand Down
2 changes: 1 addition & 1 deletion itest/test_datetime.py
Original file line number Diff line number Diff line change
Expand Up @@ -625,7 +625,7 @@ async def test_time_zones_info(self, client):
await client.query('time_zones_info(nil);', scope='@t')

res = await client.query('time_zones_info();', scope='@t')
self.assertEqual(len(res), 596)
self.assertEqual(len(res), 597)

for tz in res:
self.assertIsInstance(tz, str)
Expand Down
17 changes: 9 additions & 8 deletions src/ti/tz.c
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

enum
{
TOTAL_KEYWORDS = 596,
TOTAL_KEYWORDS = 597,
MIN_WORD_LENGTH = 2,
MAX_WORD_LENGTH = 32,
MIN_HASH_VALUE = 26,
Expand All @@ -31,14 +31,14 @@ static inline unsigned int tz__hash(
2702, 2702, 2702, 2702, 2702, 2702, 2702, 2702, 2702, 2702,
2702, 2702, 2702, 2702, 2702, 2702, 2702, 2702, 2702, 2702,
2702, 2702, 2702, 38, 2702, 10, 6, 5, 44, 15,
14, 61, 53, 26, 24, 23, 13, 38, 2702, 2702,
14, 68, 61, 26, 24, 23, 13, 55, 2702, 2702,
2702, 2702, 2702, 2702, 2702, 14, 129, 5, 362, 17,
467, 279, 446, 386, 774, 411, 574, 7, 503, 125,
34, 18, 604, 205, 164, 367, 666, 327, 2702, 342,
16, 2702, 2702, 2702, 2702, 136, 2702, 6, 17, 6,
40, 5, 6, 83, 31, 5, 5, 143, 40, 6,
5, 6, 55, 217, 5, 7, 5, 5, 342, 482,
71, 281, 533, 7, 2702, 2702, 2702, 2702, 2702, 2702,
467, 279, 446, 386, 774, 411, 574, 7, 503, 125,
34, 18, 604, 205, 164, 367, 666, 327, 2702, 342,
16, 2702, 2702, 2702, 2702, 136, 2702, 6, 17, 6,
40, 5, 6, 83, 31, 5, 5, 143, 40, 6,
5, 6, 55, 367, 5, 7, 5, 5, 342, 482,
133, 281, 533, 7, 2702, 2702, 2702, 2702, 2702, 2702,
2702, 2702, 2702, 2702, 2702, 2702, 2702, 2702, 2702, 2702,
2702, 2702, 2702, 2702, 2702, 2702, 2702, 2702, 2702, 2702,
2702, 2702, 2702, 2702, 2702, 2702, 2702, 2702, 2702, 2702,
Expand Down Expand Up @@ -764,6 +764,7 @@ static ti_tz_t tz__list[TOTAL_KEYWORDS] = {
{.name="America/Ciudad_Juarez"},
{.name="Europe/Kyiv"},
{.name="Pacific/Kanton"},
{.name="America/Coyhaique"},
};


Expand Down