From dcb472e3ddc54524333a591da4dacb01e203630a Mon Sep 17 00:00:00 2001 From: Matthew Wallace Date: Fri, 26 Apr 2024 08:57:43 -0600 Subject: [PATCH 1/3] Fix unicode decode error (#169) * Update setup.py Explicitly defining utf-8 encoding to avoid UnicodeDecodeError on setup.py in Windows environment * Update CHANGELOG.md --------- Co-authored-by: Scott Gunn <99990724+sagunn-echo@users.noreply.github.com> --- CHANGELOG.md | 2 ++ setup.py | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0186095..43451a6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,11 +6,13 @@ ### Fixes - Fix incremental composite keys ([#144](https://github.com/dbeatty10/dbt-mysql/issues/144)) +- Fix UnicodeDecodeErorr on setup.py ([#160](https://github.com/dbeatty10/dbt-mysql/issues/160)) ### Contributors - [@moszutij](https://github.com/moszutij) ([#146](https://github.com/dbeatty10/dbt-mysql/pull/146), [#144](https://github.com/dbeatty10/dbt-mysql/issues/144)) - [@wesen](https://github.com/wesen) ([#146](https://github.com/dbeatty10/dbt-mysql/pull/146)) - [@mwallace582](https://github.com/mwallace582) ([#162](https://github.com/dbeatty10/dbt-mysql/pull/162), [#138](https://github.com/dbeatty10/dbt-mysql/issues/138)) +- [@sagunn-echo](https://github.com/sagunn-echo) ([#160](https://github.com/dbeatty10/dbt-mysql/issues/160)) ## dbt-mysql 1.1.0 (Feb 5, 2023) diff --git a/setup.py b/setup.py index c176ec4..3e60e3d 100644 --- a/setup.py +++ b/setup.py @@ -24,7 +24,7 @@ # pull long description from README this_directory = os.path.abspath(os.path.dirname(__file__)) -with open(os.path.join(this_directory, "README.md")) as f: +with open(os.path.join(this_directory, "README.md"), encoding="utf-8") as f: long_description = f.read() From ec1889cdf5c81873eb4e7f2913b5ea54a1d9badc Mon Sep 17 00:00:00 2001 From: Matthew Wallace Date: Fri, 26 Apr 2024 09:26:36 -0600 Subject: [PATCH 2/3] Pin jsonschema version to fix tests --- dev-requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/dev-requirements.txt b/dev-requirements.txt index 6fff712..bff3b49 100644 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -8,6 +8,7 @@ git+https://github.com/dbt-labs/dbt-core.git@1.4.latest#egg=dbt-tests-adapter&su black~=22.12 bumpversion~=0.6.0 ddtrace~=2.3 +jsonschema<=4.17 flake8~=6.1 flaky~=3.7 freezegun~=1.3 From 05979edd2f3e8e6213a7ce2b01f74201c966f555 Mon Sep 17 00:00:00 2001 From: Matthew Wallace Date: Fri, 26 Apr 2024 10:18:29 -0600 Subject: [PATCH 3/3] Update black to resolve security alert https://github.com/dbeatty10/dbt-mysql/security/dependabot/5 --- dev-requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-requirements.txt b/dev-requirements.txt index 0194aaf..d4f4356 100644 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -5,7 +5,7 @@ git+https://github.com/dbt-labs/dbt-core.git@1.5.latest#egg=dbt-tests-adapter&su # if version 1.x or greater -> pin to major version # if version 0.x -> pin to minor -black~=22.12 +black~=24.3 bumpversion~=0.6.0 ddtrace~=2.3 jsonschema<=4.17