From 7a26b3085b171d0fb59a78141f0a249f97a9dd73 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim=20Swe=C3=B1a=20=28Swast=29?= Date: Mon, 13 Jan 2025 13:48:26 -0600 Subject: [PATCH 1/5] chore: test with latest sqlglot in prerelease tests --- noxfile.py | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/noxfile.py b/noxfile.py index 9610c1287e..996ad95fe8 100644 --- a/noxfile.py +++ b/noxfile.py @@ -589,20 +589,16 @@ def prerelease(session: nox.sessions.Session, tests_path, extra_pytest_options=( ) already_installed.add("pandas") - # Ibis has introduced breaking changes. Let's exclude ibis head - # from prerelease install list for now. We should enable the head back - # once bigframes supports the version at HEAD. - # session.install( - # "--upgrade", - # "-e", # Use -e so that py.typed file is included. - # "git+https://github.com/ibis-project/ibis.git#egg=ibis-framework", - # ) + # Tty to avoid a cap on our SQLGlot so that bigframes + # can be integrated with SQLMesh. See: + # https://github.com/googleapis/python-bigquery-dataframes/issues/942 + # If SQLGlot introduces something that breaks us, lets file an issue + # upstream and/or make sure we fix bigframes to work with it. session.install( "--upgrade", - "--pre", - "ibis-framework>=9.0.0,<=9.2.0", + "git+https://github.com/tobymao/sqlglot.git#egg=sqlglot, ) - already_installed.add("ibis-framework") + already_installed.add("sqlglot") # Workaround https://github.com/googleapis/python-db-dtypes-pandas/issues/178 session.install("--no-deps", "db-dtypes") From bc4755931d2462e5e21988f569632eee2be59c52 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim=20Swe=C3=B1a=20=28Swast=29?= Date: Mon, 13 Jan 2025 13:50:07 -0600 Subject: [PATCH 2/5] Update noxfile.py --- noxfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/noxfile.py b/noxfile.py index 996ad95fe8..62dd2ae909 100644 --- a/noxfile.py +++ b/noxfile.py @@ -596,7 +596,7 @@ def prerelease(session: nox.sessions.Session, tests_path, extra_pytest_options=( # upstream and/or make sure we fix bigframes to work with it. session.install( "--upgrade", - "git+https://github.com/tobymao/sqlglot.git#egg=sqlglot, + "git+https://github.com/tobymao/sqlglot.git#egg=sqlglot", ) already_installed.add("sqlglot") From 00b3d417cb4599e521201e81250bc1160911cae1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim=20Swe=C3=B1a=20=28Swast=29?= Date: Mon, 13 Jan 2025 13:50:30 -0600 Subject: [PATCH 3/5] Update noxfile.py --- noxfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/noxfile.py b/noxfile.py index 62dd2ae909..40a8f7beb7 100644 --- a/noxfile.py +++ b/noxfile.py @@ -589,7 +589,7 @@ def prerelease(session: nox.sessions.Session, tests_path, extra_pytest_options=( ) already_installed.add("pandas") - # Tty to avoid a cap on our SQLGlot so that bigframes + # Try to avoid a cap on our SQLGlot so that bigframes # can be integrated with SQLMesh. See: # https://github.com/googleapis/python-bigquery-dataframes/issues/942 # If SQLGlot introduces something that breaks us, lets file an issue From 8ebcd0d6b2358803883c2993c7393d00dec85a16 Mon Sep 17 00:00:00 2001 From: Tim Swena Date: Tue, 14 Jan 2025 10:22:05 -0600 Subject: [PATCH 4/5] add vendored ibis dependencies to constraints --- setup.py | 2 +- testing/constraints-3.9.txt | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/setup.py b/setup.py index e3fda9d36f..744975cb08 100644 --- a/setup.py +++ b/setup.py @@ -68,7 +68,7 @@ "python-dateutil>=2.8.2,<3", "pytz>=2022.7", "toolz>=0.11,<2", - "typing-extensions>=4.3.0,<5", + "typing-extensions>=4.4.0,<5", "rich>=12.4.4,<14", ] extras = { diff --git a/testing/constraints-3.9.txt b/testing/constraints-3.9.txt index c0ffcfaa1c..29932bbc10 100644 --- a/testing/constraints-3.9.txt +++ b/testing/constraints-3.9.txt @@ -26,3 +26,11 @@ tabulate==0.9 ipywidgets==7.7.1 humanize==4.6.0 matplotlib==3.7.1 +# For vendored ibis-framework. +atpublic==2.3 +parsy==2.0 +python-dateutil==2.8.2 +pytz==2022.7 +toolz==0.11 +typing-extensions==4.4.0 +rich==12.4.4 From 357a227978293d6bd7af90ff4ec758c1d715ffce Mon Sep 17 00:00:00 2001 From: Tim Swena Date: Tue, 14 Jan 2025 10:24:18 -0600 Subject: [PATCH 5/5] update minimum typing-extensions --- setup.py | 2 +- testing/constraints-3.9.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index 744975cb08..74a0d5475c 100644 --- a/setup.py +++ b/setup.py @@ -68,7 +68,7 @@ "python-dateutil>=2.8.2,<3", "pytz>=2022.7", "toolz>=0.11,<2", - "typing-extensions>=4.4.0,<5", + "typing-extensions>=4.5.0,<5", "rich>=12.4.4,<14", ] extras = { diff --git a/testing/constraints-3.9.txt b/testing/constraints-3.9.txt index 29932bbc10..015153cb01 100644 --- a/testing/constraints-3.9.txt +++ b/testing/constraints-3.9.txt @@ -32,5 +32,5 @@ parsy==2.0 python-dateutil==2.8.2 pytz==2022.7 toolz==0.11 -typing-extensions==4.4.0 +typing-extensions==4.5.0 rich==12.4.4