chore: y tho

ibis-project · Sep 25, 2024 · f111b09 · f111b09
1 parent d58803e
commit f111b09
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/.github/workflows/ibis-backends-cloud.yml b/.github/workflows/ibis-backends-cloud.yml
@@ -102,6 +102,12 @@ jobs:
       - name: install poetry
         run: pip install 'poetry==1.8.3'
 
+      - name: remove databricks arrow and numpy upper bounds
+        if: matrix.backend.name != 'databricks'
+        run: |
+          poetry remove databricks-sql-connector
+          poetry update numpy pyarrow
+
       - name: install additional deps
         if: matrix.backend.key == 'snowpark'
         run: poetry add snowflake-snowpark-python --python="==${{ steps.install_python.outputs.python-version }}"

diff --git a/.github/workflows/ibis-backends.yml b/.github/workflows/ibis-backends.yml
@@ -455,6 +455,11 @@ jobs:
       - name: install poetry
         run: pip install 'poetry==1.8.3'
 
+      - name: remove databricks arrow and numpy upper bounds
+        run: |
+          poetry remove databricks-sql-connector
+          poetry update numpy pyarrow
+
       - name: install ibis
         run: poetry install --without dev --without docs --extras "${{ join(matrix.backend.extras, ' ') }} examples"
 
@@ -499,8 +504,7 @@ jobs:
 
       - name: check that no untracked files were produced
         shell: bash
-        run: |
-          ! git status --porcelain | tee /dev/stderr | grep .
+        run: git checkout poetry.lock pyproject.toml && ! git status --porcelain | tee /dev/stderr | grep .
 
       - name: upload code coverage
         if: success()
@@ -609,7 +613,7 @@ jobs:
 
       - name: remove incompatible deps
         # it requires a version of pandas that min versions are not compatible with
-        run: poetry remove lonboard deltalake
+        run: poetry remove lonboard deltalake databricks-sql-connector
 
       - name: install minimum versions of required deps
         run: poetry add --lock ${{ join(matrix.backend.deps.required, ' ') }} --python="==${{ steps.install_python.outputs.python-version }}"
@@ -715,7 +719,7 @@ jobs:
 
       - name: remove lonboard
         # it requires a version of pandas that pyspark is not compatible with
-        run: poetry remove lonboard
+        run: poetry remove lonboard databricks-sql-connector
 
       - name: install exact versions of pyspark, pandas and numpy
         run: poetry add --lock 'pyspark@${{ matrix.pyspark-version }}' ${{ join(matrix.deps, ' ') }}