diff --git a/noxfile.py b/noxfile.py index 967ced87ab..863c7b26d3 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", - # ) + # 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 + # 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") diff --git a/setup.py b/setup.py index e3fda9d36f..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.3.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 c0ffcfaa1c..015153cb01 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.5.0 +rich==12.4.4