From 1a9dc02abf25d354cdbb055c076076ca7f55e8d3 Mon Sep 17 00:00:00 2001 From: Abdelkader Kouhli Date: Sun, 26 Sep 2021 13:38:22 +0200 Subject: [PATCH 1/4] Fix integration tests --- .../004_simple_snapshot_test/test_simple_snapshot.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/integration/004_simple_snapshot_test/test_simple_snapshot.py b/test/integration/004_simple_snapshot_test/test_simple_snapshot.py index 7bcb1437eb9..e2e4f30a3c4 100644 --- a/test/integration/004_simple_snapshot_test/test_simple_snapshot.py +++ b/test/integration/004_simple_snapshot_test/test_simple_snapshot.py @@ -906,7 +906,7 @@ def _snapshot_and_assert_invalidated(self): for result in snapshotted[10:]: # result is a tuple, the dbt_valid_to column is the latest self.assertIsInstance(result[-1], datetime) - self.assertGreaterEqual(result[-1].astimezone(pytz.UTC), self._invalidated_snapshot_datetime) + self.assertGreaterEqual(result[-1].replace(tzinfo=pytz.UTC), self._invalidated_snapshot_datetime) def _revive_records(self): database = self.default_database @@ -946,7 +946,7 @@ def _snapshot_and_assert_revived(self): for result in invalidated_records: # result is a tuple, the dbt_valid_to column is the latest self.assertIsInstance(result[1], datetime) - self.assertGreaterEqual(result[1].astimezone(pytz.UTC), self._invalidated_snapshot_datetime) + self.assertGreaterEqual(result[1].replace(tzinfo=pytz.UTC), self._invalidated_snapshot_datetime) # records which weren't revived (id != 10, 11) revived_records = self.run_sql( @@ -968,5 +968,5 @@ def _snapshot_and_assert_revived(self): self.assertIsInstance(result[1], datetime) # there are milliseconds (part of microseconds in datetime objects) in the # invalidated_snapshot_datetime and not in result datetime so set the microseconds to 0 - self.assertGreaterEqual(result[1].astimezone(pytz.UTC), self._invalidated_snapshot_datetime.replace(microsecond=0)) + self.assertGreaterEqual(result[1].replace(tzinfo=pytz.UTC), self._invalidated_snapshot_datetime.replace(microsecond=0)) self.assertIsNone(result[2]) From 0d115995ed4acd23895019ff4a67fb92a29e4341 Mon Sep 17 00:00:00 2001 From: Abdelkader Kouhli Date: Sun, 26 Sep 2021 20:45:53 +0200 Subject: [PATCH 2/4] Update changelog.md --- CHANGELOG.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e8732f9f30b..eca27e730f9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,7 +14,6 @@ Contributors: - [@dave-connors-3](https://github.com/dave-connors-3) ([#3920](https://github.com/dbt-labs/dbt/issues/3920)) - ## dbt 0.21.0 (Release TBD) ### Fixes @@ -23,6 +22,10 @@ Contributors: ### Under the hood - Bump artifact schema versions for 0.21.0 ([#3945](https://github.com/dbt-labs/dbt/pull/3945)) +Contributors: + +- [@kadero](https://github.com/kadero) ([#3952](https://github.com/dbt-labs/dbt/issues/3952)) + ## dbt 0.21.0rc1 (September 20, 2021) ### Features From ac7e33827d1304bcc330ead2aea14bc309d118a4 Mon Sep 17 00:00:00 2001 From: Abdelkader Kouhli Date: Sun, 26 Sep 2021 20:46:34 +0200 Subject: [PATCH 3/4] Update changelog.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index eca27e730f9..2bf91fa144e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,7 @@ Contributors: - [@dave-connors-3](https://github.com/dave-connors-3) ([#3920](https://github.com/dbt-labs/dbt/issues/3920)) + ## dbt 0.21.0 (Release TBD) ### Fixes From 8b95be55c475eabed966739da15deadcb4b912f3 Mon Sep 17 00:00:00 2001 From: Jeremy Cohen Date: Wed, 29 Sep 2021 13:44:50 -0700 Subject: [PATCH 4/4] Bump up contributor note to 1.0.0 --- CHANGELOG.md | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2bf91fa144e..4ebc4e3f457 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,7 +13,7 @@ Contributors: - [@dave-connors-3](https://github.com/dave-connors-3) ([#3920](https://github.com/dbt-labs/dbt/issues/3920)) - +- [@kadero](https://github.com/kadero) ([#3952](https://github.com/dbt-labs/dbt/issues/3952)) ## dbt 0.21.0 (Release TBD) @@ -23,10 +23,6 @@ Contributors: ### Under the hood - Bump artifact schema versions for 0.21.0 ([#3945](https://github.com/dbt-labs/dbt/pull/3945)) -Contributors: - -- [@kadero](https://github.com/kadero) ([#3952](https://github.com/dbt-labs/dbt/issues/3952)) - ## dbt 0.21.0rc1 (September 20, 2021) ### Features