From 50e502674807b9771d7e26c0e784539bed8f9da6 Mon Sep 17 00:00:00 2001
From: Tim Swast <swast@google.com>
Date: Thu, 23 Mar 2023 20:17:02 -0500
Subject: [PATCH] fix: loosen ipywidgets restrictions further to address
 ipython compatibility issues (#1531)

* fix: loosen ipywidgets restrictions further to address ipython compatibility issues

* include ipywidgets in prerelease deps

* show all package versions

* add ipykernel dependency

* ipykernel in noxfile

* oops
---
 noxfile.py                  |  6 +++++-
 setup.py                    | 10 ++++++++--
 testing/constraints-3.7.txt |  3 ++-
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/noxfile.py b/noxfile.py
index f6283abf9..8464e4980 100644
--- a/noxfile.py
+++ b/noxfile.py
@@ -303,6 +303,10 @@ def prerelease_deps(session):
     session.install(
         "--pre",
         "--upgrade",
+        "IPython",
+        "ipykernel",
+        "ipywidgets",
+        "tqdm",
         "git+https://github.com/pypa/packaging.git",
     )
 
@@ -321,7 +325,6 @@ def prerelease_deps(session):
         "google-cloud-datacatalog",
         "google-cloud-storage",
         "google-cloud-testutils",
-        "IPython",
         "mock",
         "psutil",
         "pytest",
@@ -356,6 +359,7 @@ def prerelease_deps(session):
     session.run("python", "-c", "import grpc; print(grpc.__version__)")
     session.run("python", "-c", "import pandas; print(pandas.__version__)")
     session.run("python", "-c", "import pyarrow; print(pyarrow.__version__)")
+    session.run("python", "-m", "pip", "freeze")
 
     # Run all tests, except a few samples tests which require extra dependencies.
     session.run("py.test", "tests/unit")
diff --git a/setup.py b/setup.py
index 2119e0191..51cb6dc75 100644
--- a/setup.py
+++ b/setup.py
@@ -67,9 +67,15 @@
         pyarrow_dependency,
         "db-dtypes>=0.3.0,<2.0.0dev",
     ],
-    "ipywidgets": ["ipywidgets>=7.7.0,<8.0.1"],
+    "ipywidgets": [
+        "ipywidgets>=7.7.0",
+        "ipykernel>=6.0.0",
+    ],
     "geopandas": ["geopandas>=0.9.0, <1.0dev", "Shapely>=1.8.4, <2.0dev"],
-    "ipython": ["ipython>=7.0.1,!=8.1.0"],
+    "ipython": [
+        "ipython>=7.23.1,!=8.1.0",
+        "ipykernel>=6.0.0",
+    ],
     "tqdm": ["tqdm >= 4.7.4, <5.0.0dev"],
     "opentelemetry": [
         "opentelemetry-api >= 1.1.0",
diff --git a/testing/constraints-3.7.txt b/testing/constraints-3.7.txt
index 746656b58..c94d80abf 100644
--- a/testing/constraints-3.7.txt
+++ b/testing/constraints-3.7.txt
@@ -13,7 +13,8 @@ google-cloud-core==1.6.0
 google-resumable-media==0.6.0
 grpcio==1.47.0
 ipywidgets==7.7.1
-ipython==7.0.1
+ipython==7.23.1
+ipykernel==6.0.0
 opentelemetry-api==1.1.0
 opentelemetry-instrumentation==0.20b0
 opentelemetry-sdk==1.1.0