remove grpcio-status pin for more versions (#112)

* nits * test * nits * nits * nits * nits
dbt-labs · Dec 13, 2023 · e491263 · e491263
1 parent 37a9cf4
commit e491263
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 10 deletions.
diff --git a/.github/scripts/supported_python_versions.sh b/.github/scripts/supported_python_versions.sh
@@ -9,7 +9,7 @@ minor_version="$2"
 if [[ ${minor_version} == 0 && ${major_version} == 0 ]]
 then
 py_versions='["3.8", "3.9", "3.10", "3.11"]'
-elif [[ ${minor_version} < 4 && ${major_version} == 1  ]]
+elif [[ ${minor_version} < 7 && ${major_version} == 1  ]]
 then
 py_versions='["3.8", "3.9", "3.10"]'
 else

diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
@@ -29,7 +29,7 @@ jobs:
       fail-fast: false
       matrix:
        os: ["macos-latest", "ubuntu-latest"]
-       python-version: ["3.8", "3.11"]
+       python-version: ["3.8", "3.10", "3.11"]
     runs-on: ${{ matrix.os }}
     name: ${{ matrix.os }} ${{ matrix.python-version }} Test
 

diff --git a/release_creation/bundle/requirements/v1.5.latest.requirements.txt b/release_creation/bundle/requirements/v1.5.latest.requirements.txt
@@ -8,7 +8,6 @@ dbt-databricks~=1.5.0
 dbt-trino~=1.5.0
 dbt-rpc~=0.4.0
 json-rpc==1.15.0
-grpcio-status~=1.47.0
 pyarrow~=14.0.1
 pyasn1-modules~=0.2.1
 pyodbc==4.0.39 --no-binary pyodbc

diff --git a/release_creation/bundle/requirements/v1.6.latest.requirements.txt b/release_creation/bundle/requirements/v1.6.latest.requirements.txt
@@ -8,7 +8,6 @@ dbt-databricks~=1.6.0
 dbt-trino~=1.6.0
 dbt-fabric==1.6.0
 dbt-rpc~=0.4.1
-grpcio-status~=1.56.2
 pyasn1-modules~=0.3.0
 pyarrow~=14.0.1
 pyodbc==4.0.39 --no-binary pyodbc

diff --git a/release_creation/bundle/requirements/v1.6.pre.requirements.txt b/release_creation/bundle/requirements/v1.6.pre.requirements.txt
@@ -8,7 +8,6 @@ dbt-databricks~=1.6.0
 dbt-trino~=1.6.0
 dbt-fabric~=1.6.0
 dbt-rpc~=0.4.1
-grpcio-status~=1.56.2
 pyasn1-modules~=0.3.0
 pyarrow~=14.0.1
 pyodbc==4.0.39 --no-binary pyodbc

diff --git a/release_creation/bundle/requirements/v1.7.pre.requirements.txt b/release_creation/bundle/requirements/v1.7.pre.requirements.txt
@@ -8,7 +8,6 @@ dbt-databricks~=1.7.0rc1
 dbt-trino~=1.7.0rc1
 dbt-fabric~=1.7.0
 dbt-rpc~=0.4.1
-grpcio-status~=1.47.0
 pyasn1-modules~=0.2.1
 pyarrow~=14.0.1
 pyodbc==4.0.39 --no-binary pyodbc

diff --git a/test/integration/bundle/test_create.py b/test/integration/bundle/test_create.py
@@ -1,3 +1,4 @@
+import sys
 import subprocess
 
 import pytest
@@ -8,10 +9,16 @@
 import zipfile
 
 
-@pytest.mark.parametrize(argnames="test_version",
-                         argvalues=["0.0.0", "1.3.0", "1.4.0", "1.5.0",
-                                    "1.6.0", "1.7.0b1", "1.7.0"])
-def test_generate_bundle_creates_a_bundle_with_valid_version(test_version):
+@pytest.mark.parametrize("python_version", [sys.version_info])
+@pytest.mark.parametrize(
+    argnames="test_version",
+    argvalues=["0.0.0", "1.3.0", "1.4.0", "1.5.0", "1.6.0", "1.7.0b1", "1.7.0"],
+)
+def test_generate_bundle_creates_a_bundle_with_valid_version(test_version, python_version):
+    if python_version >= (3, 11) and Version.coerce(test_version) < Version.coerce("1.7.0"):
+        pytest.skip("Python 3.11+ requires at least version 1.7.0 of the bundle")
+    if python_version == (3, 10) and Version.coerce(test_version) >= Version.coerce("1.7.0"):
+        pytest.skip("We run test for Python 3.11 with version 1.7.0 of the bundle")
     created_assets = generate_bundle(Version.coerce(test_version))
     for asset_name, asset_location in created_assets.items():
         # check if the file exists