chore: add .editorconfig and update Pylance (#67)

* Add .editorconfig
* Add __init__ to fix Pylance errors and isort

Author: mattiamatrix

.editorconfig

@@ -0,0 +1,26 @@
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+indent_style = space
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+# 4 space indentation
+[*.py]
+indent_size = 4
+
+# 2 space indentation
+[*.{sql,json}]
+indent_size = 2
+
+[*.{yml,yaml}]
+quote_type = single
+
+[*.md]
+trim_trailing_whitespace = false
+indent_size = 2
+
+[Makefile]
+indent_style = tab

.github/workflows/ci.yml

@@ -10,11 +10,11 @@ jobs:
     name: 'Pre-commit checks'
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
-    - uses: actions/setup-python@v3
-      with:
-        python-version: '3.x'
-    - uses: pre-commit/[email protected]
+      - uses: actions/checkout@v3
+      - uses: actions/setup-python@v3
+        with:
+          python-version: '3.x'
+      - uses: pre-commit/[email protected]
 
   unit_test:
     name: 'Unit tests with coverage'

.github/workflows/python-publish.yml

@@ -10,23 +10,22 @@ permissions:
 
 jobs:
   deploy:
-
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v3
-    - name: Set up Python
-      uses: actions/setup-python@v3
-      with:
-        python-version: '3.x'
-    - name: Install dependencies
-      run: |
-        python -m pip install --upgrade pip
-        pip install build
-    - name: Build package
-      run: python -m build
-    - name: Publish package
-      uses: pypa/gh-action-pypi-publish@release/v1
-      with:
-        user: __token__
-        password: ${{ secrets.PYPI_API_TOKEN }}
+      - uses: actions/checkout@v3
+      - name: Set up Python
+        uses: actions/setup-python@v3
+        with:
+          python-version: '3.x'
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip
+          pip install build
+      - name: Build package
+        run: python -m build
+      - name: Publish package
+        uses: pypa/gh-action-pypi-publish@release/v1
+        with:
+          user: __token__
+          password: ${{ secrets.PYPI_API_TOKEN }}

.pre-commit-config.yaml

@@ -23,7 +23,7 @@ repos:
       # General quality checks
       - id: mixed-line-ending
       - id: trailing-whitespace
-        args: [ --markdown-linebreak-ext=md ]
+        args: [--markdown-linebreak-ext=md]
       - id: end-of-file-fixer
 
   - repo: https://github.com/PyCQA/autoflake
@@ -56,6 +56,6 @@ repos:
     hooks:
       - id: flake8
         additional_dependencies:
-          - "Flake8-pyproject~=1.1"
+          - 'Flake8-pyproject~=1.1'
         args:
           - '.'

dbt/__init__.py

@@ -0,0 +1,3 @@
+from pkgutil import extend_path
+
+__path__ = extend_path(__path__, __name__)

dbt/adapters/__init__.py

@@ -0,0 +1,3 @@
+from pkgutil import extend_path
+
+__path__ = extend_path(__path__, __name__)

dbt/adapters/athena/__init__.py

@@ -1,9 +1,8 @@
-from dbt.adapters.base import AdapterPlugin
-
 import dbt
 from dbt.adapters.athena.connections import AthenaConnectionManager, AthenaCredentials
 from dbt.adapters.athena.impl import AthenaAdapter
 from dbt.adapters.athena.query_headers import _QueryComment
+from dbt.adapters.base import AdapterPlugin
 from dbt.include import athena
 
 Plugin = AdapterPlugin(adapter=AthenaAdapter, credentials=AthenaCredentials, include_path=athena.PACKAGE_PATH)

dbt/adapters/athena/connections.py

@@ -6,11 +6,6 @@
 from typing import Any, ContextManager, Dict, List, Optional, Tuple
 
 import tenacity
-from dbt.adapters.base import Credentials
-from dbt.adapters.sql import SQLConnectionManager
-from dbt.contracts.connection import AdapterResponse, Connection, ConnectionState
-from dbt.events import AdapterLogger
-from dbt.exceptions import FailedToConnectException, RuntimeException
 from pyathena.connection import Connection as AthenaConnection
 from pyathena.cursor import Cursor
 from pyathena.error import OperationalError, ProgrammingError
@@ -31,6 +26,11 @@
 
 from dbt.adapters.athena.config import get_boto3_config
 from dbt.adapters.athena.session import get_boto3_session
+from dbt.adapters.base import Credentials
+from dbt.adapters.sql import SQLConnectionManager
+from dbt.contracts.connection import AdapterResponse, Connection, ConnectionState
+from dbt.events import AdapterLogger
+from dbt.exceptions import FailedToConnectException, RuntimeException
 
 logger = AdapterLogger("Athena")
 

dbt/adapters/athena/impl.py

@@ -7,6 +7,10 @@
 
 import agate
 from botocore.exceptions import ClientError
+
+from dbt.adapters.athena import AthenaConnectionManager
+from dbt.adapters.athena.config import get_boto3_config
+from dbt.adapters.athena.relation import AthenaRelation, AthenaSchemaSearchMap
 from dbt.adapters.base import available
 from dbt.adapters.base.impl import GET_CATALOG_MACRO_NAME
 from dbt.adapters.base.relation import BaseRelation, InformationSchema
@@ -16,10 +20,6 @@
 from dbt.events import AdapterLogger
 from dbt.exceptions import RuntimeException
 
-from dbt.adapters.athena import AthenaConnectionManager
-from dbt.adapters.athena.config import get_boto3_config
-from dbt.adapters.athena.relation import AthenaRelation, AthenaSchemaSearchMap
-
 logger = AdapterLogger("Athena")
 
 boto3_client_lock = Lock()

dbt/adapters/athena/session.py

@@ -1,4 +1,5 @@
 import boto3.session
+
 from dbt.contracts.connection import Connection
 
 

dbt/include/athena/dbt_project.yml

@@ -1,6 +1,5 @@
-
 name: dbt_athena
 version: 1.0
 config-version: 2
 
-macro-paths: ["macros"]
+macro-paths: ['macros']

dbt/include/athena/sample_profiles.yml

@@ -1,6 +1,5 @@
 default:
   outputs:
-
     dev:
       type: athena
       s3_staging_dir: [s3_staging_dir]
@@ -10,9 +9,9 @@ default:
 
     prod:
       type: athena
-      s3_staging_dir: [ s3_staging_dir ]
-      region_name: [ region_name ]
-      database: [ database name ]
-      schema: [ prod_schema ]
+      s3_staging_dir: [s3_staging_dir]
+      region_name: [region_name]
+      database: [database name]
+      schema: [prod_schema]
 
   target: dev

tests/functional/adapter/utils/test_utils.py

@@ -1,4 +1,9 @@
 import pytest
+from tests.functional.adapter.fixture_datediff import (
+    models__test_datediff_sql,
+    seeds__data_datediff_csv,
+)
+
 from dbt.tests.adapter.utils.fixture_datediff import models__test_datediff_yml
 from dbt.tests.adapter.utils.test_any_value import BaseAnyValue
 from dbt.tests.adapter.utils.test_array_append import BaseArrayAppend
@@ -21,10 +26,6 @@
 from dbt.tests.adapter.utils.test_right import BaseRight
 from dbt.tests.adapter.utils.test_split_part import BaseSplitPart
 from dbt.tests.adapter.utils.test_string_literal import BaseStringLiteral
-from tests.functional.adapter.fixture_datediff import (
-    models__test_datediff_sql,
-    seeds__data_datediff_csv,
-)
 
 models__array_concat_expected_sql = """
 select 1 as id, {{ array_construct([1,2,3,4,5,6]) }} as array_col

tests/unit/test_adapter.py

@@ -7,19 +7,19 @@
 import agate
 import boto3
 import pytest
+from moto import mock_athena, mock_glue, mock_s3
+
+from dbt.adapters.athena import AthenaAdapter
+from dbt.adapters.athena import Plugin as AthenaPlugin
+from dbt.adapters.athena.connections import AthenaCursor, AthenaParameterFormatter
+from dbt.adapters.athena.relation import AthenaRelation
 from dbt.clients import agate_helper
 from dbt.contracts.connection import ConnectionState
 from dbt.contracts.files import FileHash
 from dbt.contracts.graph.compiled import CompiledModelNode
 from dbt.contracts.graph.parsed import DependsOn, NodeConfig
 from dbt.exceptions import FailedToConnectException, ValidationException
 from dbt.node_types import NodeType
-from moto import mock_athena, mock_glue, mock_s3
-
-from dbt.adapters.athena import AthenaAdapter
-from dbt.adapters.athena import Plugin as AthenaPlugin
-from dbt.adapters.athena.connections import AthenaCursor, AthenaParameterFormatter
-from dbt.adapters.athena.relation import AthenaRelation
 
 from .constants import AWS_REGION, BUCKET, DATA_CATALOG_NAME, DATABASE_NAME
 from .utils import (

tests/unit/test_connection_manager.py

@@ -1,10 +1,10 @@
 from unittest import mock
 
 import pytest
-from dbt.contracts.connection import AdapterResponse
 from pyathena.model import AthenaQueryExecution
 
 from dbt.adapters.athena import AthenaConnectionManager
+from dbt.contracts.connection import AdapterResponse
 
 
 class TestAthenaConnectionManager:

tests/unit/test_query_headers.py

@@ -1,8 +1,7 @@
 from unittest import mock
 
-from dbt.adapters.base.query_headers import MacroQueryStringSetter
-
 from dbt.adapters.athena import _QueryComment
+from dbt.adapters.base.query_headers import MacroQueryStringSetter
 
 from .constants import AWS_REGION, DATA_CATALOG_NAME, DATABASE_NAME
 from .utils import config_from_parts_or_dicts

tests/unit/test_session.py

@@ -1,9 +1,9 @@
 import botocore.session
 import pytest
-from dbt.contracts.connection import Connection
 
 from dbt.adapters.athena import AthenaCredentials
 from dbt.adapters.athena.session import get_boto3_session
+from dbt.contracts.connection import Connection
 
 
 class TestSession:

tests/unit/utils.py

@@ -3,6 +3,7 @@
 
 import agate
 import boto3
+
 from dbt.config.project import PartialProject
 
 from .constants import AWS_REGION, BUCKET, CATALOG_ID, DATA_CATALOG_NAME, DATABASE_NAME