Merge branch 'main' into group_ps

Author: NoureldinYosri

.github/workflows/ci-daily.yml

@@ -35,12 +35,14 @@ jobs:
           sudo apt-get install libffi7
       - name: Install requirements
         run: |
-          pip install cirq~=1.0.dev &&
-          pip install \
-            -r dev_tools/requirements/deps/format.txt \
-            -r dev_tools/requirements/deps/pylint.txt \
-            -r dev_tools/requirements/deps/pytest.txt \
-            -r dev_tools/requirements/deps/notebook.txt
+          pip install --upgrade cirq~=1.0.dev &&
+            version=$(pip show cirq | sed -n "s/^Version: //p" | grep .) &&
+            pip install "cirq-rigetti==${version}" &&
+            pip install \
+              -r dev_tools/requirements/deps/format.txt \
+              -r dev_tools/requirements/deps/pylint.txt \
+              -r dev_tools/requirements/deps/pytest.txt \
+              -r dev_tools/requirements/deps/notebook.txt
       - name: Run Quil dependencies
         run: docker compose -f cirq-rigetti/docker-compose.test.yaml up -d
       - name: Pytest check
@@ -65,7 +67,8 @@ jobs:
           key: ${{ env.pythonLocation }}-${{ hashFiles('**/requirements.txt', 'dev_tools/requirements/**/*.txt') }}
       - name: Install requirements
         run: |
-          pip install cirq~=1.0.dev &&
+          pip install --upgrade cirq~=1.0.dev &&
+            pip install --upgrade cirq-rigetti~=1.0.dev &&
             pip install -r dev_tools/requirements/deps/format.txt &&
             pip install -r dev_tools/requirements/deps/pylint.txt &&
             pip install -r dev_tools/requirements/deps/pytest.txt &&
@@ -91,11 +94,13 @@ jobs:
           key: ${{ env.pythonLocation }}-${{ hashFiles('**/requirements.txt', 'dev_tools/requirements/**/*.txt') }}
       - name: Install requirements
         run: |
-          pip install cirq~=1.0.dev &&
-          pip install \
-            -r dev_tools/requirements/deps/format.txt \
-            -r dev_tools/requirements/deps/pylint.txt \
-            -r dev_tools/requirements/deps/pytest.txt \
-            -r dev_tools/requirements/deps/notebook.txt
+          pip install --upgrade cirq~=1.0.dev &&
+            version=$(pip show cirq | sed -n "s/^Version: //p" | grep .) &&
+            pip install "cirq-rigetti==${version}" &&
+            pip install \
+              -r dev_tools/requirements/deps/format.txt \
+              -r dev_tools/requirements/deps/pylint.txt \
+              -r dev_tools/requirements/deps/pytest.txt \
+              -r dev_tools/requirements/deps/notebook.txt
       - name: Pytest check
         run: check/pytest -n auto --ignore=cirq-core/cirq/contrib --enable-slow-tests

.github/workflows/ci.yml

@@ -193,7 +193,7 @@ jobs:
           sudo apt-get install libffi7
       - name: Install requirements
         run: |
-          pip install wheel
+          pip install --upgrade setuptools wheel
           pip install --upgrade --upgrade-strategy eager -r dev_tools/requirements/dev.env.txt
       - name: Run Quil dependencies
         run: docker compose -f cirq-rigetti/docker-compose.test.yaml up -d
@@ -230,7 +230,7 @@ jobs:
           pip install wheel
           pip install --upgrade --upgrade-strategy eager -r dev_tools/requirements/dev-np2.env.txt
       - name: Pytest check
-        run: check/pytest -n auto --warn-numpy-data-promotion --durations=20 --ignore=cirq-rigetti
+        run: check/pytest -n auto --durations=20 --ignore=cirq-rigetti
   pip-compile:
     name: Check consistency of requirements
     runs-on: ubuntu-22.04
@@ -289,7 +289,7 @@ jobs:
           sudo apt-get install libffi7
       - name: Install requirements
         run: |
-          pip install wheel
+          pip install --upgrade setuptools wheel
           pip install --upgrade --upgrade-strategy eager -r dev_tools/requirements/dev.env.txt
       - name: Run Quil dependencies
         run: docker compose -f cirq-rigetti/docker-compose.test.yaml up -d
@@ -322,7 +322,7 @@ jobs:
           key: ${{ env.pythonLocation }}-${{ hashFiles('**/requirements.txt', 'dev_tools/requirements/**/*.txt') }}
       - name: Install requirements
         run: |
-          pip install wheel
+          pip install --upgrade setuptools wheel
           pip install --upgrade --upgrade-strategy eager -r dev_tools/requirements/no-contrib.env.txt
       - name: Pytest Windows
         run: |
@@ -350,7 +350,7 @@ jobs:
           key: ${{ env.pythonLocation }}-${{ hashFiles('**/requirements.txt', 'dev_tools/requirements/**/*.txt') }}
       - name: Install requirements
         run: |
-          pip install wheel
+          pip install --upgrade setuptools wheel
           pip install --upgrade --upgrade-strategy eager -r dev_tools/requirements/no-contrib.env.txt
       - name: Pytest check
         run: check/pytest -n auto --durations=20 --ignore=cirq-core/cirq/contrib

.github/workflows/first-interaction.yaml

@@ -14,48 +14,63 @@
 
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 # Label PRs with labels such as size.
+#
+# This workflow is designed not to fail if labeling actions encounter errors;
+# instead, it writes error messages as annotations on the workflow's run summary
+# page. If labels don't seem to be getting applied, check there for errors.
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 name: Pull request labeler
 run-name: >-
   Label pull request ${{github.event.pull_request.number}} by ${{github.actor}}
 
 on:
-  pull_request:
-    types: [opened]
+  # Note: do not copy-paste this workflow with `pull_request_target` left as-is.
+  # Its use here is a special case where security implications are understood.
+  # Workflows should normally use `pull_request` instead.
+  pull_request_target:
+    types:
+      - opened
+      - synchronize
 
   # Allow manual invocation.
   workflow_dispatch:
+    inputs:
+      pr-number:
+        description: 'The PR number of the PR to label:'
+        type: string
+        required: true
+      trace:
+        description: 'Turn on shell script debugging'
+        type: boolean
 
 # Declare default permissions as read only.
 permissions: read-all
 
 jobs:
   label-pr-size:
-    name: Add size label to new pull request
+    name: Update PR size labels
     runs-on: ubuntu-24.04
+    timeout-minutes: 5
     permissions:
       contents: read
-      pull-requests: write
       issues: write
+      pull-requests: write
+    env:
+      PR_NUMBER: ${{inputs.pr-number || github.event.pull_request.number}}
+      # The next var is used by Bash. We add 'xtrace' to the options if this run
+      # is a workflow_dispatch invocation and the user set the 'trace' option.
+      SHELLOPTS: ${{inputs.trace && 'xtrace' || '' }}
     steps:
-      - name: Label the PR with a size label
-        uses: codelytv/pr-size-labeler@c7a55a022747628b50f3eb5bf863b9e796b8f274 # v1
+      - name: Check out a copy of the git repository
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
-          # Don't count file deletions, per suggestion in Small CLs.
-          ignore_file_deletions: 'true'
-
-          xs_label: 'Size: XS'
-          xs_max_size: '10'
+          sparse-checkout: |
+            ./dev_tools/ci/size-labeler.sh
 
-          s_label: 'size: S'
-          s_max_size: '50'
-
-          m_label: 'size: M'
-          m_max_size: '250'
-
-          l_label: 'size: L'
-          l_max_size: '1000'
-
-          xl_label: 'size: XL'
-          fail_if_xl: 'false'
+      - name: Label the PR with a size label
+        id: label
+        continue-on-error: true
+        env:
+          GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
+        run: ./dev_tools/ci/size-labeler.sh