Merge branch 'master' into mh-update-configure-075

mhucka · web-flow · commit 8d88aef23a44 · 2025-12-27T13:48:28.000-08:00
diff --git a/docs/install.md b/docs/install.md
@@ -10,7 +10,7 @@ There are a few ways to set up your environment to use TensorFlow Quantum (TFQ):
   Python's pip package manager.
 * Or build TensorFlow Quantum from source.
 
-TensorFlow Quantum is supported on Python 3.10, 3.11, and 3.12 and depends directly on [Cirq](https://github.com/quantumlib/Cirq).
+TensorFlow Quantum is supported on Python version 3.9 through 3.12 and depends directly on [Cirq](https://github.com/quantumlib/Cirq).
 
 ## Pip package
 
@@ -56,7 +56,7 @@ The following steps are tested for Ubuntu-like systems.
 
 ### 1. Set up a Python 3 development environment
 
-First we need the Python 3.10 development tools.
+We will use Python 3.10 as an example. First, we need the Python 3.10 development tools.
 <!-- common_typos_disable -->
 <pre class="devsite-click-to-copy">
   <code class="devsite-terminal">sudo apt update</code>
@@ -87,7 +87,7 @@ guide, the <a href="https://bazel.build/" class="external">Bazel</a>
 build system will be required.
 
 Our latest source builds use TensorFlow 2.16.2. To ensure compatibility we use
-`bazel` version 6.5.0. To remove any existing version of Bazel:
+the same version of `bazel`, 6.5.0. To remove any existing version of Bazel:
 <!-- common_typos_disable -->
 <pre class="devsite-click-to-copy">
   <code class="devsite-terminal">sudo apt-get remove bazel</code>
diff --git a/docs/tutorials/barren_plateaus.ipynb b/docs/tutorials/barren_plateaus.ipynb
@@ -101,16 +101,7 @@
    "outputs": [],
    "source": [
     "# In Colab, you will be asked to restart the session after this finishes.\n",
-    "!pip install tensorflow==2.16.2"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "!pip install tensorflow-quantum==0.7.4"
+    "!pip install tensorflow==2.16.2 tensorflow-quantum==0.7.5"
    ]
   },
   {
diff --git a/docs/tutorials/gradients.ipynb b/docs/tutorials/gradients.ipynb
@@ -103,16 +103,7 @@
    "outputs": [],
    "source": [
     "# In Colab, you will be asked to restart the session after this finishes.\n",
-    "!pip install tensorflow==2.16.2"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "!pip install tensorflow-quantum==0.7.4"
+    "!pip install tensorflow==2.16.2 tensorflow-quantum==0.7.5"
    ]
   },
   {
diff --git a/docs/tutorials/hello_many_worlds.ipynb b/docs/tutorials/hello_many_worlds.ipynb
@@ -104,16 +104,7 @@
    "outputs": [],
    "source": [
     "# In Colab, you will be asked to restart the session after this finishes.\n",
-    "!pip install tensorflow==2.16.2"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "!pip install tensorflow-quantum==0.7.4"
+    "!pip install tensorflow==2.16.2 tensorflow-quantum==0.7.5"
    ]
   },
   {
diff --git a/docs/tutorials/mnist.ipynb b/docs/tutorials/mnist.ipynb
@@ -101,7 +101,7 @@
    "outputs": [],
    "source": [
     "# In Colab, you will be asked to restart the session after this finishes.\n",
-    "!pip install tensorflow==2.16.2"
+    "!pip install tensorflow==2.16.2 tensorflow-quantum==0.7.5"
    ]
   },
   {
@@ -110,7 +110,8 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "!pip install tensorflow-quantum==0.7.4"
+    "# Install seaborn for use later in this notebook.\n",
+    "!pip install seaborn\n"
    ]
   },
   {
diff --git a/docs/tutorials/noise.ipynb b/docs/tutorials/noise.ipynb
@@ -89,16 +89,7 @@
    "outputs": [],
    "source": [
     "# In Colab, you will be asked to restart the session after this finishes.\n",
-    "!pip install tensorflow==2.16.2"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "!pip install tensorflow-quantum==0.7.4"
+    "!pip install tensorflow==2.16.2 tensorflow-quantum==0.7.5"
    ]
   },
   {
diff --git a/docs/tutorials/qcnn.ipynb b/docs/tutorials/qcnn.ipynb
@@ -106,16 +106,7 @@
    "outputs": [],
    "source": [
     "# In Colab, you will be asked to restart the session after this finishes.\n",
-    "!pip install tensorflow==2.16.2"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "!pip install tensorflow-quantum==0.7.4"
+    "!pip install tensorflow==2.16.2 tensorflow-quantum==0.7.5"
    ]
   },
   {
diff --git a/docs/tutorials/quantum_data.ipynb b/docs/tutorials/quantum_data.ipynb
@@ -103,16 +103,7 @@
    "outputs": [],
    "source": [
     "# In Colab, you will be asked to restart the session after this finishes.\n",
-    "!pip install tensorflow==2.16.2"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "!pip install tensorflow-quantum==0.7.4"
+    "!pip install tensorflow==2.16.2 tensorflow-quantum==0.7.5"
    ]
   },
   {
diff --git a/docs/tutorials/quantum_reinforcement_learning.ipynb b/docs/tutorials/quantum_reinforcement_learning.ipynb
@@ -120,16 +120,7 @@
    "outputs": [],
    "source": [
     "# In Colab, you will be asked to restart the session after this finishes.\n",
-    "!pip install tensorflow==2.16.2"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "!pip install tensorflow-quantum==0.7.4"
+    "!pip install tensorflow==2.16.2 tensorflow-quantum==0.7.5"
    ]
   },
   {
@@ -178,7 +169,7 @@
    },
    "outputs": [],
    "source": [
-    "!pip install gym"
+    "!pip install gym==0.24.1"
    ]
   },
   {
diff --git a/docs/tutorials/research_tools.ipynb b/docs/tutorials/research_tools.ipynb
@@ -96,16 +96,7 @@
    "outputs": [],
    "source": [
     "# In Colab, you will be asked to restart the session after this finishes.\n",
-    "!pip install tensorflow==2.16.2"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "!pip install tensorflow-quantum==0.7.4"
+    "!pip install tensorflow==2.16.2 tensorflow-quantum==0.7.5"
    ]
   },
   {
diff --git a/release/setup.py b/release/setup.py
@@ -48,19 +48,24 @@ def finalize_options(self):
 REQUIRED_PACKAGES = [
     "cirq-core==1.3.0",
     "cirq-google==1.3.0",
+    "numpy<2.0",
+    "protobuf==4.25.8",
+    "scipy<=1.12.0",
     "sympy==1.14",
     "tf-keras~=2.16.0",
+
     # The following are transitive dependencies that need to be constrained to
     # avoid incompatible versions or because some (e.g., contourpy 1.3.3)
-    # require Python 3.11+ and we want to maintain Python 3.10 compatibility.
+    # require Python 3.11+ and we want to maintain Python 3.9 compatibility.
     # TODO: revisit after we reach compatibility with TensorFlow 2.19+.
-    "contourpy<=1.3.2",
-    "jax<=0.5",
-    "numpy<2.0",
-    "scipy<=1.12.0",
-    # The following makes it easier to get the right version on Colab. Once
-    # TFQ works with the latest version of TF, this may become unnecessary.
-    "protobuf==4.25.8",
+    "contourpy<=1.3.0",
+    "h5py==3.10.0",
+    "importlib_metadata<5",
+    "jax<0.4.24",
+    "jaxlib<0.4.24",
+    "matplotlib<3.10",
+    "networkx<3.3",
+    "pillow<=11.0",
 ]
 
 # TF requirement is placed as an extras to avoid overwriting existing nightly TF
@@ -102,7 +107,7 @@ def has_ext_modules(self):
     author_email="tensorflow-quantum-team@google.com",
     url="https://github.com/tensorflow/quantum/",
     packages=find_packages(),
-    python_requires='>=3.10',
+    python_requires='>=3.9',
     install_requires=REQUIRED_PACKAGES,
     extras_require=EXTRA_PACKAGES,
     include_package_data=True,
@@ -114,10 +119,10 @@ def has_ext_modules(self):
         "Intended Audience :: Education",
         "Intended Audience :: Science/Research",
         "Programming Language :: Python :: 3",
+        "Programming Language :: Python :: 3.9",
         "Programming Language :: Python :: 3.10",
         "Programming Language :: Python :: 3.11",
         "Programming Language :: Python :: 3.12",
-        "Programming Language :: Python :: 3.13",
         "Topic :: Scientific/Engineering",
         "Topic :: Scientific/Engineering :: Artificial Intelligence",
         "Topic :: Scientific/Engineering :: Mathematics",

Original file line number	Diff line number	Diff line change
`@@ -101,7 +101,7 @@`
`101`	`101`	`"outputs": [],`
`102`	`102`	`"source": [`
`103`	`103`	`"# In Colab, you will be asked to restart the session after this finishes.\n",`
`104`		`- "!pip install tensorflow==2.16.2"`
	`104`	`+ "!pip install tensorflow==2.16.2 tensorflow-quantum==0.7.5"`
`105`	`105`	`]`
`106`	`106`	`},`
`107`	`107`	`{`
`@@ -110,7 +110,8 @@`
`110`	`110`	`"metadata": {},`
`111`	`111`	`"outputs": [],`
`112`	`112`	`"source": [`
`113`		`- "!pip install tensorflow-quantum==0.7.4"`
	`113`	`+ "# Install seaborn for use later in this notebook.\n",`
	`114`	`+ "!pip install seaborn\n"`
`114`	`115`	`]`
`115`	`116`	`},`
`116`	`117`	`{`