Skip to content

Commit aaa66f6

Browse files
authored
Decouple cirq package from cirq-rigetti (#7170)
* Exclude cirq-rigetti from cirq requirements Allow installation of the cirq metapackage with numpy-2. cirq-rigetti users may request cirq-rigetti explicitly. * Update installation command in Rigetti demo notebook * Temporarily activate ci-daily, ci-weekly in pull requests Revert this before merge. * Comment tweak * Revert "Temporarily activate ci-daily, ci-weekly in pull requests" This reverts commit 0b04e33.
1 parent 4bdf21f commit aaa66f6

File tree

2 files changed

+9
-4
lines changed

2 files changed

+9
-4
lines changed

docs/hardware/rigetti/getting_started.ipynb

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -109,11 +109,13 @@
109109
"source": [
110110
"try:\n",
111111
" import cirq\n",
112+
" import cirq_rigetti\n",
112113
"except ImportError:\n",
113-
" print(\"installing cirq...\")\n",
114-
" !pip install --quiet cirq\n",
115-
" print(\"installed cirq.\")\n",
116-
" import cirq"
114+
" print(\"installing cirq-rigetti...\")\n",
115+
" !pip install --quiet cirq-rigetti\n",
116+
" print(\"installed cirq-rigetti.\")\n",
117+
" import cirq\n",
118+
" import cirq_rigetti"
117119
]
118120
},
119121
{

setup.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,9 @@
5656
# This is a pure metapackage that installs all our packages
5757
requirements = [f'{p.name}=={p.version}' for p in modules.list_modules()]
5858

59+
# Exclude cirq-rigetti so that cirq can be installed with numpy-2
60+
requirements = [r for r in requirements if not r.startswith("cirq-rigetti")]
61+
5962
dev_requirements = explode('dev_tools/requirements/deps/dev-tools.txt')
6063

6164
# filter out direct urls (https://github.com/pypa/pip/issues/6301)

0 commit comments

Comments
 (0)