From 477f822d16cd3a86b3bf95cfa28915cb7470a6e4 Mon Sep 17 00:00:00 2001 From: Tom Vogels Date: Thu, 17 Mar 2022 09:08:01 -0400 Subject: [PATCH 01/14] Bump version to 1.61 --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 06bd82a2..12437743 100644 --- a/setup.py +++ b/setup.py @@ -1,6 +1,6 @@ from setuptools import find_packages, setup -ARTHUR_VERSION = "1.60.0" +ARTHUR_VERSION = "1.61.0" setup( From fb5e27d17385f549a3a053ee2a1f151088982d6c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 28 Mar 2022 10:01:53 +0000 Subject: [PATCH 02/14] Bump flake8-bugbear from 22.1.11 to 22.3.23 Bumps [flake8-bugbear](https://github.com/PyCQA/flake8-bugbear) from 22.1.11 to 22.3.23. - [Release notes](https://github.com/PyCQA/flake8-bugbear/releases) - [Commits](https://github.com/PyCQA/flake8-bugbear/compare/22.1.11...22.3.23) --- updated-dependencies: - dependency-name: flake8-bugbear dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- requirements-linters.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-linters.txt b/requirements-linters.txt index a0a3d7c2..fb26392e 100644 --- a/requirements-linters.txt +++ b/requirements-linters.txt @@ -1,7 +1,7 @@ # NOTE When changing versions here, be sure to keep .pre-commit-config.yaml consistent! black==22.1.0 flake8==4.0.1 -flake8-bugbear==22.1.11 +flake8-bugbear==22.3.23 flake8-comprehensions==3.7.0 flake8-docstrings==1.6.0 flake8-fixme==1.1.1 From 8b55d6fc7ca390e0666b620e273fae3e092f67d5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 4 Apr 2022 10:01:59 +0000 Subject: [PATCH 03/14] Bump tqdm from 4.63.0 to 4.64.0 Bumps [tqdm](https://github.com/tqdm/tqdm) from 4.63.0 to 4.64.0. - [Release notes](https://github.com/tqdm/tqdm/releases) - [Commits](https://github.com/tqdm/tqdm/compare/v4.63.0...v4.64.0) --- updated-dependencies: - dependency-name: tqdm dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index bca398e1..12fe3cd3 100644 --- a/requirements.txt +++ b/requirements.txt @@ -11,5 +11,5 @@ PyYAML==6.0 simplejson==3.17.6 tabulate==0.8.9 termcolor==1.1.0 -tqdm==4.63.0 +tqdm==4.64.0 watchtower==3.0.0 From a8e463b9c806ac7dd4ac3976eb6c17cf44a22bce Mon Sep 17 00:00:00 2001 From: Tom Vogels Date: Thu, 7 Apr 2022 08:53:57 -0400 Subject: [PATCH 04/14] Add todo for initialize --dry-run --- python/etl/data_warehouse.py | 1 + 1 file changed, 1 insertion(+) diff --git a/python/etl/data_warehouse.py b/python/etl/data_warehouse.py index 41ad7c33..652503b3 100755 --- a/python/etl/data_warehouse.py +++ b/python/etl/data_warehouse.py @@ -355,6 +355,7 @@ def initial_setup(with_user_creation=False, force=False, dry_run=False) -> None: ) etl.db.drop_and_create_database(conn, database_name, config.owner.name) + # TODO(tom): This fails if database is not actually created. with closing( etl.db.connection(config.dsn_admin_on_etl_db, autocommit=True, readonly=dry_run) ) as conn: From a2c194af8ce46ad1abf18f0c3825b045eb8c0609 Mon Sep 17 00:00:00 2001 From: Tom Vogels Date: Thu, 7 Apr 2022 08:56:34 -0400 Subject: [PATCH 05/14] Update linters --- .pre-commit-config.yaml | 10 +++++----- requirements-linters.txt | 8 ++++---- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 07d11c96..a3e06d97 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -47,20 +47,20 @@ repos: hooks: - id: flake8 additional_dependencies: - - "flake8-bugbear==22.1.11" + - "flake8-bugbear==22.3.23" - "flake8-comprehensions==3.7.0" - "flake8-docstrings==1.6.0" - "flake8-fixme==1.1.1" - repo: https://github.com/pre-commit/mirrors-mypy - rev: v0.931 + rev: v0.942 hooks: - id: mypy additional_dependencies: - "mypy-boto3~=1.21" - - "types-PyYAML==6.0.4" + - "types-PyYAML==6.0.5" - "types-setuptools==57.4.9" - - "types-simplejson==3.17.3" - - "types-tabulate==0.8.5" + - "types-simplejson==3.17.4" + - "types-tabulate==0.8.6" - "types-termcolor==1.1.3" - repo: https://github.com/shellcheck-py/shellcheck-py rev: v0.7.2.1 diff --git a/requirements-linters.txt b/requirements-linters.txt index fb26392e..cc91c988 100644 --- a/requirements-linters.txt +++ b/requirements-linters.txt @@ -6,13 +6,13 @@ flake8-comprehensions==3.7.0 flake8-docstrings==1.6.0 flake8-fixme==1.1.1 isort==5.10.1 -mypy==0.931 +mypy==0.942 mypy-boto3~=1.21 mypy-extensions==0.4.3 pre-commit==2.17.0 pyupgrade==2.31.0 -types-PyYAML==6.0.4 +types-PyYAML==6.0.5 types-setuptools==57.4.9 -types-simplejson==3.17.3 -types-tabulate==0.8.5 +types-simplejson==3.17.4 +types-tabulate==0.8.6 types-termcolor==1.1.3 From d1c82740b75e707592fff79930cadf9039295ffa Mon Sep 17 00:00:00 2001 From: Tom Vogels Date: Thu, 7 Apr 2022 09:01:46 -0400 Subject: [PATCH 06/14] Update black --- .pre-commit-config.yaml | 4 ++-- requirements-linters.txt | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index a3e06d97..84ad77b1 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -39,7 +39,7 @@ repos: hooks: - id: isort - repo: https://github.com/psf/black - rev: 22.1.0 + rev: 22.3.0 hooks: - id: black - repo: https://gitlab.com/pycqa/flake8 @@ -58,7 +58,7 @@ repos: additional_dependencies: - "mypy-boto3~=1.21" - "types-PyYAML==6.0.5" - - "types-setuptools==57.4.9" + - "types-setuptools==57.4.12" - "types-simplejson==3.17.4" - "types-tabulate==0.8.6" - "types-termcolor==1.1.3" diff --git a/requirements-linters.txt b/requirements-linters.txt index cc91c988..dded9792 100644 --- a/requirements-linters.txt +++ b/requirements-linters.txt @@ -1,5 +1,5 @@ # NOTE When changing versions here, be sure to keep .pre-commit-config.yaml consistent! -black==22.1.0 +black==22.3.0 flake8==4.0.1 flake8-bugbear==22.3.23 flake8-comprehensions==3.7.0 @@ -12,7 +12,7 @@ mypy-extensions==0.4.3 pre-commit==2.17.0 pyupgrade==2.31.0 types-PyYAML==6.0.5 -types-setuptools==57.4.9 +types-setuptools==57.4.12 types-simplejson==3.17.4 types-tabulate==0.8.6 types-termcolor==1.1.3 From a4bdb6ffac02ffd932edd0c94cd7ecd0dfe0c42e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 7 Apr 2022 13:14:31 +0000 Subject: [PATCH 07/14] Bump actions/cache from 2 to 3.0.1 Bumps [actions/cache](https://github.com/actions/cache) from 2 to 3.0.1. - [Release notes](https://github.com/actions/cache/releases) - [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md) - [Commits](https://github.com/actions/cache/compare/v2...v3.0.1) --- updated-dependencies: - dependency-name: actions/cache dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/lint.yaml | 4 ++-- .github/workflows/unittest.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml index 5dfb587c..cb186268 100644 --- a/.github/workflows/lint.yaml +++ b/.github/workflows/lint.yaml @@ -22,7 +22,7 @@ jobs: with: python-version: 3.7 - name: Cache pip - uses: actions/cache@v2 + uses: actions/cache@v3.0.1 with: path: ~/.cache/pip key: ${{ runner.os }}-pip-${{ hashFiles('requirements-linters.txt') }} @@ -51,7 +51,7 @@ jobs: with: python-version: 3.7 - name: Cache pip - uses: actions/cache@v2 + uses: actions/cache@v3.0.1 with: path: ~/.cache/pip key: ${{ runner.os }}-pip-${{ hashFiles('requirements-linters.txt') }} diff --git a/.github/workflows/unittest.yaml b/.github/workflows/unittest.yaml index e6317b71..e98c6513 100644 --- a/.github/workflows/unittest.yaml +++ b/.github/workflows/unittest.yaml @@ -20,7 +20,7 @@ jobs: with: python-version: 3.7 - name: Cache pip - uses: actions/cache@v2 + uses: actions/cache@v3.0.1 with: path: ~/.cache/pip key: ${{ runner.os }}-pip-${{ hashFiles('requirements-*.txt') }} From 150c7e8b36362ccfabe19aa269982df4682fd33d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 7 Apr 2022 13:14:50 +0000 Subject: [PATCH 08/14] Bump boto3 from 1.21.13 to 1.21.35 Bumps [boto3](https://github.com/boto/boto3) from 1.21.13 to 1.21.35. - [Release notes](https://github.com/boto/boto3/releases) - [Changelog](https://github.com/boto/boto3/blob/develop/CHANGELOG.rst) - [Commits](https://github.com/boto/boto3/compare/1.21.13...1.21.35) --- updated-dependencies: - dependency-name: boto3 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 12fe3cd3..15bba8ba 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,6 @@ # This is the set of packages need to run the code. All versions are pinned. arrow==1.2.2 -boto3==1.21.13 +boto3==1.21.35 botocore~=1.24 funcy==1.17 jmespath==0.10.0 From a2d785dc180527e441fcba5182297de46effc790 Mon Sep 17 00:00:00 2001 From: Tom Vogels Date: Thu, 7 Apr 2022 09:08:47 -0400 Subject: [PATCH 09/14] Set relation_column_encoding to AUTO by default --- python/etl/config/default_settings.yaml | 2 +- python/etl/dialect/redshift.py | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/python/etl/config/default_settings.yaml b/python/etl/config/default_settings.yaml index 2e69448a..2e33fb90 100644 --- a/python/etl/config/default_settings.yaml +++ b/python/etl/config/default_settings.yaml @@ -16,7 +16,7 @@ "retriable_error_codes": "8001,15001,15005", "concurrent_load_idle_termination_seconds": 3600, "redshift": { - "relation_column_encoding": "ON" + "relation_column_encoding": "AUTO" } }, # Target (Redshift) cluster diff --git a/python/etl/dialect/redshift.py b/python/etl/dialect/redshift.py index f4c34c65..1e536092 100644 --- a/python/etl/dialect/redshift.py +++ b/python/etl/dialect/redshift.py @@ -181,9 +181,7 @@ def add_auto_encoding(table_design: dict) -> None: def build_table_ddl(table_name: TableName, table_design: dict, is_temp=False) -> str: """Assemble the DDL of a table in a Redshift data warehouse.""" - if ( - etl.config.get_config_value("arthur_settings.redshift.relation_column_encoding") or "ON" - ) == "AUTO": + if etl.config.get_config_value("arthur_settings.redshift.relation_column_encoding", "ON") == "AUTO": add_auto_encoding(table_design) columns = build_columns(table_design["columns"], is_temp=is_temp) constraints = build_table_constraints(table_design) @@ -333,7 +331,7 @@ def copy_using_manifest( data_format, format_option, file_compression ) - compupdate = etl.config.get_config_value("arthur_settings.redshift.relation_column_encoding") or "ON" + compupdate = etl.config.get_config_value("arthur_settings.redshift.relation_column_encoding", "ON") if compupdate == "AUTO": compupdate = "OFF" From cdcf1681700222df666c05d44caf5631f4afe684 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 11 Apr 2022 10:02:32 +0000 Subject: [PATCH 10/14] Bump boto3 from 1.21.35 to 1.21.37 Bumps [boto3](https://github.com/boto/boto3) from 1.21.35 to 1.21.37. - [Release notes](https://github.com/boto/boto3/releases) - [Changelog](https://github.com/boto/boto3/blob/develop/CHANGELOG.rst) - [Commits](https://github.com/boto/boto3/compare/1.21.35...1.21.37) --- updated-dependencies: - dependency-name: boto3 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 15bba8ba..394ac1b6 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,6 @@ # This is the set of packages need to run the code. All versions are pinned. arrow==1.2.2 -boto3==1.21.35 +boto3==1.21.37 botocore~=1.24 funcy==1.17 jmespath==0.10.0 From dd0884ecc5bc75f37af7682399ce9948b9184b64 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 11 Apr 2022 10:19:27 +0000 Subject: [PATCH 11/14] Bump actions/cache from 3.0.1 to 3.0.2 Bumps [actions/cache](https://github.com/actions/cache) from 3.0.1 to 3.0.2. - [Release notes](https://github.com/actions/cache/releases) - [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md) - [Commits](https://github.com/actions/cache/compare/v3.0.1...v3.0.2) --- updated-dependencies: - dependency-name: actions/cache dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/lint.yaml | 4 ++-- .github/workflows/unittest.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml index cb186268..c163d212 100644 --- a/.github/workflows/lint.yaml +++ b/.github/workflows/lint.yaml @@ -22,7 +22,7 @@ jobs: with: python-version: 3.7 - name: Cache pip - uses: actions/cache@v3.0.1 + uses: actions/cache@v3.0.2 with: path: ~/.cache/pip key: ${{ runner.os }}-pip-${{ hashFiles('requirements-linters.txt') }} @@ -51,7 +51,7 @@ jobs: with: python-version: 3.7 - name: Cache pip - uses: actions/cache@v3.0.1 + uses: actions/cache@v3.0.2 with: path: ~/.cache/pip key: ${{ runner.os }}-pip-${{ hashFiles('requirements-linters.txt') }} diff --git a/.github/workflows/unittest.yaml b/.github/workflows/unittest.yaml index e98c6513..17b647ff 100644 --- a/.github/workflows/unittest.yaml +++ b/.github/workflows/unittest.yaml @@ -20,7 +20,7 @@ jobs: with: python-version: 3.7 - name: Cache pip - uses: actions/cache@v3.0.1 + uses: actions/cache@v3.0.2 with: path: ~/.cache/pip key: ${{ runner.os }}-pip-${{ hashFiles('requirements-*.txt') }} From 7502f4885de065b8b36ec28efeb36efa0078e08e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 18 Apr 2022 10:01:43 +0000 Subject: [PATCH 12/14] Bump types-simplejson from 3.17.4 to 3.17.5 Bumps [types-simplejson](https://github.com/python/typeshed) from 3.17.4 to 3.17.5. - [Release notes](https://github.com/python/typeshed/releases) - [Commits](https://github.com/python/typeshed/commits) --- updated-dependencies: - dependency-name: types-simplejson dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- requirements-linters.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-linters.txt b/requirements-linters.txt index dded9792..5215e196 100644 --- a/requirements-linters.txt +++ b/requirements-linters.txt @@ -13,6 +13,6 @@ pre-commit==2.17.0 pyupgrade==2.31.0 types-PyYAML==6.0.5 types-setuptools==57.4.12 -types-simplejson==3.17.4 +types-simplejson==3.17.5 types-tabulate==0.8.6 types-termcolor==1.1.3 From fcccf8ed0b44e188fe3d664a898785e46e7f295d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 18 Apr 2022 10:01:48 +0000 Subject: [PATCH 13/14] Bump boto3 from 1.21.37 to 1.21.42 Bumps [boto3](https://github.com/boto/boto3) from 1.21.37 to 1.21.42. - [Release notes](https://github.com/boto/boto3/releases) - [Changelog](https://github.com/boto/boto3/blob/develop/CHANGELOG.rst) - [Commits](https://github.com/boto/boto3/compare/1.21.37...1.21.42) --- updated-dependencies: - dependency-name: boto3 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 394ac1b6..42798c9e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,6 @@ # This is the set of packages need to run the code. All versions are pinned. arrow==1.2.2 -boto3==1.21.37 +boto3==1.21.42 botocore~=1.24 funcy==1.17 jmespath==0.10.0 From f508d005d60faae06bd456a4ee576e529b755448 Mon Sep 17 00:00:00 2001 From: Tom Vogels Date: Mon, 18 Apr 2022 12:23:57 -0400 Subject: [PATCH 14/14] Update pre-commit as well --- .pre-commit-config.yaml | 8 ++++---- requirements-linters.txt | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 84ad77b1..0e901e3a 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -57,10 +57,10 @@ repos: - id: mypy additional_dependencies: - "mypy-boto3~=1.21" - - "types-PyYAML==6.0.5" - - "types-setuptools==57.4.12" - - "types-simplejson==3.17.4" - - "types-tabulate==0.8.6" + - "types-PyYAML==6.0.6" + - "types-setuptools==57.4.14" + - "types-simplejson==3.17.5" + - "types-tabulate==0.8.7" - "types-termcolor==1.1.3" - repo: https://github.com/shellcheck-py/shellcheck-py rev: v0.7.2.1 diff --git a/requirements-linters.txt b/requirements-linters.txt index 5215e196..9fc79ff2 100644 --- a/requirements-linters.txt +++ b/requirements-linters.txt @@ -11,8 +11,8 @@ mypy-boto3~=1.21 mypy-extensions==0.4.3 pre-commit==2.17.0 pyupgrade==2.31.0 -types-PyYAML==6.0.5 -types-setuptools==57.4.12 +types-PyYAML==6.0.6 +types-setuptools==57.4.14 types-simplejson==3.17.5 -types-tabulate==0.8.6 +types-tabulate==0.8.7 types-termcolor==1.1.3