From edd46607c13fdb904243739a375447e6232679c2 Mon Sep 17 00:00:00 2001 From: Marco Gorelli <33491632+MarcoGorelli@users.noreply.github.com> Date: Mon, 18 Nov 2024 12:29:20 +0000 Subject: [PATCH 1/4] ci: prevent ibis from setting upper bounds --- .github/workflows/pytest.yml | 2 +- noxfile.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pytest.yml b/.github/workflows/pytest.yml index 17fff6b38..e4a8208b7 100644 --- a/.github/workflows/pytest.yml +++ b/.github/workflows/pytest.yml @@ -83,7 +83,7 @@ jobs: - name: show-deps run: uv pip freeze - name: install ibis - run: uv pip install ibis-framework[duckdb]>=6.0.0 --system + run: uv pip install ibis-framework>=6.0.0 --system # Ibis puts upper bounds on dependencies, and requires Python3.10+, # which messes with other dependencies on lower Python versions if: matrix.python-version == '3.11' diff --git a/noxfile.py b/noxfile.py index aec70add4..887382f36 100644 --- a/noxfile.py +++ b/noxfile.py @@ -17,7 +17,7 @@ def run_common(session: Session, coverage_threshold: float) -> None: session.install("-e.", "-r", "requirements-dev.txt") if session.python != "3.8": - session.install("ibis-framework[duckdb]>=6.0.0") + session.install("ibis-framework>=6.0.0") session.run( "pytest", From fd5e8e656fb1ed48dc3ccaed489a84461eb77a86 Mon Sep 17 00:00:00 2001 From: Marco Gorelli <33491632+MarcoGorelli@users.noreply.github.com> Date: Mon, 18 Nov 2024 12:34:41 +0000 Subject: [PATCH 2/4] add other dependencies manually --- .github/workflows/pytest.yml | 2 +- noxfile.py | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pytest.yml b/.github/workflows/pytest.yml index e4a8208b7..1812ffdde 100644 --- a/.github/workflows/pytest.yml +++ b/.github/workflows/pytest.yml @@ -83,7 +83,7 @@ jobs: - name: show-deps run: uv pip freeze - name: install ibis - run: uv pip install ibis-framework>=6.0.0 --system + run: uv pip install ibis-framework>=6.0.0 atpublic parsy python-dateutil pytz sqlglot toolz typing-extensions --system # Ibis puts upper bounds on dependencies, and requires Python3.10+, # which messes with other dependencies on lower Python versions if: matrix.python-version == '3.11' diff --git a/noxfile.py b/noxfile.py index 887382f36..fadc3ca7c 100644 --- a/noxfile.py +++ b/noxfile.py @@ -17,7 +17,9 @@ def run_common(session: Session, coverage_threshold: float) -> None: session.install("-e.", "-r", "requirements-dev.txt") if session.python != "3.8": - session.install("ibis-framework>=6.0.0") + session.install( + "ibis-framework>=6.0.0 atpublic parsy python-dateutil pytz sqlglot toolz typing-extensions" + ) session.run( "pytest", From 9ff5a88e3de1fc33416a84d4bfb963c92c126431 Mon Sep 17 00:00:00 2001 From: Marco Gorelli <33491632+MarcoGorelli@users.noreply.github.com> Date: Mon, 18 Nov 2024 12:35:50 +0000 Subject: [PATCH 3/4] add other dependencies manually --- .github/workflows/pytest.yml | 2 +- noxfile.py | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/pytest.yml b/.github/workflows/pytest.yml index 1812ffdde..9ee31603f 100644 --- a/.github/workflows/pytest.yml +++ b/.github/workflows/pytest.yml @@ -83,7 +83,7 @@ jobs: - name: show-deps run: uv pip freeze - name: install ibis - run: uv pip install ibis-framework>=6.0.0 atpublic parsy python-dateutil pytz sqlglot toolz typing-extensions --system + run: uv pip install ibis-framework>=6.0.0 rich packaging --system # Ibis puts upper bounds on dependencies, and requires Python3.10+, # which messes with other dependencies on lower Python versions if: matrix.python-version == '3.11' diff --git a/noxfile.py b/noxfile.py index fadc3ca7c..b9f53aa03 100644 --- a/noxfile.py +++ b/noxfile.py @@ -17,9 +17,7 @@ def run_common(session: Session, coverage_threshold: float) -> None: session.install("-e.", "-r", "requirements-dev.txt") if session.python != "3.8": - session.install( - "ibis-framework>=6.0.0 atpublic parsy python-dateutil pytz sqlglot toolz typing-extensions" - ) + session.install("ibis-framework>=6.0.0 rich packaging") session.run( "pytest", From 2e2f14177fda98d7d1f928719ee28edf39c43d76 Mon Sep 17 00:00:00 2001 From: Marco Gorelli <33491632+MarcoGorelli@users.noreply.github.com> Date: Mon, 18 Nov 2024 12:38:57 +0000 Subject: [PATCH 4/4] add other dependencies manually --- .github/workflows/pytest.yml | 2 +- noxfile.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pytest.yml b/.github/workflows/pytest.yml index 9ee31603f..f03074762 100644 --- a/.github/workflows/pytest.yml +++ b/.github/workflows/pytest.yml @@ -83,7 +83,7 @@ jobs: - name: show-deps run: uv pip freeze - name: install ibis - run: uv pip install ibis-framework>=6.0.0 rich packaging --system + run: uv pip install ibis-framework>=6.0.0 rich packaging pyarrow_hotfix --system # Ibis puts upper bounds on dependencies, and requires Python3.10+, # which messes with other dependencies on lower Python versions if: matrix.python-version == '3.11' diff --git a/noxfile.py b/noxfile.py index b9f53aa03..76d25bcb6 100644 --- a/noxfile.py +++ b/noxfile.py @@ -17,7 +17,7 @@ def run_common(session: Session, coverage_threshold: float) -> None: session.install("-e.", "-r", "requirements-dev.txt") if session.python != "3.8": - session.install("ibis-framework>=6.0.0 rich packaging") + session.install("ibis-framework>=6.0.0 rich packaging pyarrow_hotfix") session.run( "pytest",