Merge pull request #24 from microsoft/v1.4.0-pr.preview

V1.4.0 pr.preview

Author: prdpsvs

.git-blame-ignore-revs

@@ -0,0 +1,5 @@
+# .git-blame-ignore-revs
+# pre-commit-setup
+4eff3237f2bf9d3d206c9234353fb07e70ac6013
+# Updated README.md and blackified the code.
+29bab50f0e7d9e09b9110500f6e41e1255d3f3f6

.github/workflows/integration-tests-azure.yml

@@ -1,22 +1,19 @@
 ---
 name: Integration tests on Azure
 on:  # yamllint disable-line rule:truthy
-  push:
+  workflow_dispatch:
+  pull_request:
     branches:
-      - master
-      - v*
-      - azure-testing
-  pull_request_target:
-    types: [labeled]
+      - main
 
 jobs:
   integration-tests-azure:
-    name: Integration tests on Azure
-    if: contains(github.event.pull_request.labels.*.name, 'safe to test') || github.ref_name == 'master' || github.ref_name == 'azure-testing'
+    name: Regular
     strategy:
+      fail-fast: false
       matrix:
-        python_version: ["3.7", "3.8", "3.9", "3.10"]
-        profile: ["ci_azure_cli", "ci_azure_auto", "ci_azure_environment", "ci_azure_basic"]
+        python_version: ["3.7", "3.8", "3.9", "3.10", "3.11"]
+        profile: ["ci_azure_auto"]
         msodbc_version: ["17", "18"]
       max-parallel: 1
     runs-on: ubuntu-latest
@@ -35,39 +32,15 @@ jobs:
       - name: Install dependencies
         run: pip install -r dev_requirements.txt
 
-      - name: Wake up server
-        env:
-          DBT_AZURESQL_SERVER: ${{ secrets.DBT_AZURESQL_SERVER }}
-          DBT_AZURESQL_DB: ${{ secrets.DBT_AZURESQL_DB }}
-          DBT_AZURESQL_UID: ${{ secrets.DBT_AZURESQL_UID }}
-          DBT_AZURESQL_PWD: ${{ secrets.DBT_AZURESQL_PWD }}
-          MSODBC_VERSION: ${{ matrix.msodbc_version }}
-        run: python devops/scripts/wakeup_azure.py
-
-      - name: Configure test users
-        run: sqlcmd -b -I -i devops/scripts/init.sql
-        env:
-          DBT_TEST_USER_1: DBT_TEST_USER_1
-          DBT_TEST_USER_2: DBT_TEST_USER_2
-          DBT_TEST_USER_3: DBT_TEST_USER_3
-          SQLCMDUSER: ${{ secrets.DBT_AZURESQL_UID }}
-          SQLCMDPASSWORD: ${{ secrets.DBT_AZURESQL_PWD }}
-          SQLCMDSERVER: ${{ secrets.DBT_AZURESQL_SERVER }}
-          SQLCMDDBNAME: ${{ secrets.DBT_AZURESQL_DB }}
-
       - name: Run functional tests
         env:
           DBT_AZURESQL_SERVER: ${{ secrets.DBT_AZURESQL_SERVER }}
           DBT_AZURESQL_DB: ${{ secrets.DBT_AZURESQL_DB }}
-          DBT_AZURESQL_UID: ${{ secrets.DBT_AZURESQL_UID }}
-          DBT_AZURESQL_PWD: ${{ secrets.DBT_AZURESQL_PWD }}
           AZURE_CLIENT_ID: ${{ secrets.DBT_AZURE_SP_NAME }}
           AZURE_CLIENT_SECRET: ${{ secrets.DBT_AZURE_SP_SECRET }}
           AZURE_TENANT_ID: ${{ secrets.DBT_AZURE_TENANT }}
-          DBT_TEST_USER_1: DBT_TEST_USER_1
-          DBT_TEST_USER_2: DBT_TEST_USER_2
-          DBT_TEST_USER_3: DBT_TEST_USER_3
-          DBT_TEST_AAD_PRINCIPAL_1: ${{ secrets.DBT_TEST_AAD_PRINCIPAL_1 }}
-          DBT_TEST_AAD_PRINCIPAL_2: ${{ secrets.DBT_TEST_AAD_PRINCIPAL_2 }}
-          SQLSERVER_TEST_DRIVER: 'ODBC Driver ${{ matrix.msodbc_version }} for SQL Server'
+          FABRIC_TEST_DRIVER: 'ODBC Driver ${{ matrix.msodbc_version }} for SQL Server'
+          DBT_TEST_USER_1: dbo
+          DBT_TEST_USER_2: dbo
+          DBT_TEST_USER_3: dbo
         run: pytest -ra -v tests/functional --profile "${{ matrix.profile }}"

.github/workflows/integration-tests-sqlserver.yml

@@ -6,13 +6,14 @@ on:  # yamllint disable-line rule:truthy
       - 'devops/**'
       - '.github/workflows/publish-docker.yml'
     branches:
-      - 'master'
+      - main
+      - v*
 
 jobs:
   publish-docker-client:
     strategy:
       matrix:
-        python_version: ["3.7", "3.8", "3.9", "3.10"]
+        python_version: ["3.7", "3.8", "3.9", "3.10", "3.11"]
         docker_target: ["msodbc17", "msodbc18"]
     runs-on: ubuntu-latest
     permissions:
@@ -30,7 +31,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Build and push Docker image
-        uses: docker/build-push-action@v3.2.0
+        uses: docker/build-push-action@v4.0.0
         with:
           context: devops
           build-args: PYTHON_VERSION=${{ matrix.python_version }}
@@ -39,32 +40,3 @@ jobs:
           platforms: linux/amd64
           target: ${{ matrix.docker_target }}
           tags: ghcr.io/${{ github.repository }}:CI-${{ matrix.python_version }}-${{ matrix.docker_target }}
-
-  publish-docker-server:
-    strategy:
-      matrix:
-        mssql_version: ["2017", "2019", "2022"]
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      packages: write
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-
-      - name: Log in to the Container registry
-        uses: docker/login-action@v2.1.0
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Build and push Docker image
-        uses: docker/build-push-action@v3.2.0
-        with:
-          context: devops
-          build-args: MSSQL_VERSION=${{ matrix.mssql_version }}
-          file: devops/server.Dockerfile
-          push: true
-          platforms: linux/amd64
-          tags: ghcr.io/${{ github.repository }}:server-${{ matrix.mssql_version }}

.github/workflows/publish-docker.yml

@@ -1,21 +1,22 @@
 ---
 name: Unit tests
 on:  # yamllint disable-line rule:truthy
+  workflow_dispatch:
   push:
     branches:
-      - master
+      - main
       - v*
   pull_request:
     branches:
-      - master
+      - main
       - v*
 
 jobs:
   unit-tests:
     name: Unit tests
     strategy:
       matrix:
-        python_version: ["3.7", "3.8", "3.9", "3.10"]
+        python_version: ["3.7", "3.8", "3.9", "3.10", "3.11"]
     runs-on: ubuntu-latest
     permissions:
       contents: read
@@ -33,4 +34,4 @@ jobs:
         run: pip install -r dev_requirements.txt
 
       - name: Run unit tests
-        run: pytest tests/unit
+        run: pytest -n auto -ra -v tests/unit

.github/workflows/unit-tests.yml

@@ -1,5 +1,5 @@
 default_language_version:
-  python: python3.9
+  python: python3.10.8
 repos:
   - repo: 'https://github.com/pre-commit/pre-commit-hooks'
     rev: v4.4.0
@@ -21,7 +21,7 @@ repos:
       - id: mixed-line-ending
       - id: check-docstring-first
   - repo: 'https://github.com/adrienverge/yamllint'
-    rev: v1.28.0
+    rev: v1.32.0
     hooks:
       - id: yamllint
         args:
@@ -32,13 +32,13 @@ repos:
     hooks:
       - id: absolufy-imports
   - repo: 'https://github.com/hadialqattan/pycln'
-    rev: v2.1.2
+    rev: v2.1.3
     hooks:
       - id: pycln
         args:
           - '--all'
   - repo: 'https://github.com/pycqa/isort'
-    rev: 5.10.1
+    rev: 5.12.0
     hooks:
       - id: isort
         args:
@@ -50,7 +50,7 @@ repos:
           - '--python-version'
           - '39'
   - repo: 'https://github.com/psf/black'
-    rev: 22.10.0
+    rev: 23.3.0
     hooks:
       - id: black
         args:
@@ -65,8 +65,8 @@ repos:
           - '--target-version=py39'
           - '--check'
           - '--diff'
-  - repo: 'https://gitlab.com/pycqa/flake8'
-    rev: 3.9.2
+  - repo: 'https://github.com/pycqa/flake8'
+    rev: 6.0.0
     hooks:
       - id: flake8
         args:
@@ -78,12 +78,13 @@ repos:
         stages:
           - manual
   - repo: 'https://github.com/pre-commit/mirrors-mypy'
-    rev: v0.991
+    rev: v1.3.0
     hooks:
       - id: mypy
         args:
           - '--show-error-codes'
           - '--ignore-missing-imports'
+          - '--explicit-package-bases'
         files: '^dbt/adapters'
       - id: mypy
         alias: mypy-check

.pre-commit-config.yaml

@@ -0,0 +1,14 @@
+{
+    "version": "0.2.0",
+    "configurations": [
+
+        {
+            "name": "Python: Current File",
+            "type": "python",
+            "request": "launch",
+            "program": "${file}",
+            "console": "integratedTerminal",
+            "justMyCode": false
+        }
+    ]
+}

.vscode/launch.json

@@ -0,0 +1,7 @@
+{
+    "python.testing.pytestArgs": [
+        "tests"
+    ],
+    "python.testing.unittestEnabled": false,
+    "python.testing.pytestEnabled": true
+}