Merge branch 'main' into classical_control_docs

Author: NoureldinYosri

.git-blame-ignore-revs

@@ -24,3 +24,6 @@ cb6940a40141dba95cba84f5acc27acbeb65b17c
 
 # Format proto files (#7133)
 5cf0e8df8f3e097b8d496cba1c2d4bd04cb83546
+
+# Sort import statements - no change in the effective code (#7195)
+250f12964f027c68775c5c7989f7b6000f989f06

.github/workflows/stale.yml

@@ -89,7 +89,7 @@ jobs:
         close-pr-label: 'status/stale'
         exempt-issue-labels: ${{steps.converted.outputs.exempt-issue-labels}}
         exempt-pr-labels: ${{steps.converted.outputs.exempt-pr-labels}}
-        stale-issue-message: >
+        stale-issue-message: >-
           This issue has been automatically labeled as stale because
           ${{env.days-before-stale}} days have passed without comments or other
           activity. If no further activity occurs on this issue and the
@@ -98,12 +98,13 @@ jobs:
           would like to restore its status, please leave a comment here; doing
           so will cause the staleness handler to remove the label.
 
+
           If you have questions or feedback about this process, we welcome your
           input. You can open a new issue to let us know (please also reference
           this issue there, for continuity), or reach out to the project
           maintainers at quantum-oss-maintainers@google.com.
 
-        stale-pr-message: >
+        stale-pr-message: >-
           This pull request has been automatically labeled as stale because
           ${{env.days-before-stale}} days have passed without comments or other
           activity. If no further activity occurs and the `status/stale` label
@@ -112,29 +113,32 @@ jobs:
           its active status, please leave a comment here; doing so will cause
           the staleness handler to remove the label.
 
+
           If you have questions or feedback about this process, we welcome your
           input. You can open a new issue to let us know (please also reference
           this issue there, for continuity), or reach out to the project
           maintainers at quantum-oss-maintainers@google.com.
 
-        close-issue-message: >
+        close-issue-message: >-
           This issue has been closed due to inactivity for
           ${{env.days-before-close}} days since the time the `status/stale`
           label was applied. If you believe the issue is still relevant and
           would like to restore its active status, please feel free to reopen
           it.
 
+
           If you have questions or feedback about this process, we welcome your
           input. You can open a new issue to let us know (please also reference
           this issue there, for continuity), or reach out to the project
           maintainers at quantum-oss-maintainers@google.com.
 
-        close-pr-message: >
+        close-pr-message: >-
           This pull request has been closed due to inactivity for
           ${{env.days-before-close}} days since the time the `status/stale`
           label was applied. If you would like to continue working on this PR,
           please feel free to reopen it.
 
+
           If you have questions or feedback about this process, we welcome your
           input. You can open a new issue to let us know (please also reference
           this issue there, for continuity), or reach out to the project

benchmarks/circuit_construction.py

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 import itertools
-from typing import Tuple, Set, Sequence
+from typing import Sequence, Set, Tuple
 
 import cirq
 

benchmarks/parameter_resolution.py

@@ -13,8 +13,10 @@
 # limitations under the License.
 
 import random
+
 import numpy as np
 import sympy
+
 import cirq
 
 

benchmarks/randomized_benchmarking.py

@@ -12,11 +12,13 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from typing import List, Sequence
 import functools
+from typing import List, Sequence
+
 import numpy as np
+
 import cirq
-from cirq.experiments.qubit_characterizations import _single_qubit_cliffords, _find_inv_matrix
+from cirq.experiments.qubit_characterizations import _find_inv_matrix, _single_qubit_cliffords
 
 
 def dot(args: Sequence[np.ndarray]) -> np.ndarray:

check/format-incremental

@@ -57,7 +57,7 @@ for arg in "$@"; do
     fi
 done
 
-typeset -a format_files
+declare -a format_files=()
 if (( only_changed == 1 )); then
     # Figure out which branch to compare against.
     if [ -z "${rev}" ]; then
@@ -82,31 +82,61 @@ if (( only_changed == 1 )); then
 
     # Get the modified, added and moved python files.
     IFS=$'\n' read -r -d '' -a format_files < \
-        <(git diff --name-only --diff-filter=MAR "${rev}" -- '*.py' ':(exclude)cirq-google/cirq_google/cloud/*' ':(exclude)*_pb2.py')
+        <(git diff --name-only --diff-filter=MAR "${rev}" -- \
+        '*.py' ':(exclude)*_pb2.py')
 else
     echo -e "Formatting all python files." >&2
     IFS=$'\n' read -r -d '' -a format_files < \
         <(git ls-files '*.py' ':(exclude)*_pb2.py')
 fi
 
 if (( ${#format_files[@]} == 0 )); then
-    echo -e "\033[32mNo files to format\033[0m."
+    echo -e "\033[32mNo files to format.\033[0m"
     exit 0
 fi
 
-BLACKVERSION="$(black --version)"
+# Exclude __init__.py files from isort targets
+declare -a isort_files=()
+for f in "${format_files[@]}"; do
+    if [[ "${f##*/}" != __init__.py ]]; then
+        isort_files+=("${f}")
+    fi
+done
+
+# Color the output if it goes to a terminal or GitHub Actions log
+arg_color=()
+if [[ -t 1 || "${CI}" == true ]]; then
+    arg_color=("--color")
+fi
+
+ISORTVERSION="$(isort --version-number)"
+
+echo "Sorting imports with isort... (version: $ISORTVERSION)"
+
+args=("${arg_color[@]}")
+if (( only_print == 1 )); then
+    args+=("--check" "--diff")
+fi
+
+ISORTSTATUS=0
+if (( "${#isort_files[@]}" )); then
+    isort "${args[@]}" "${isort_files[@]}"
+    ISORTSTATUS=$?
+fi
+
+BLACKVERSION="$(black --version | head -1)"
 
 echo "Running the black formatter... (version: $BLACKVERSION)"
 
-args=("--color")
+args=("${arg_color[@]}")
 if (( only_print == 1 )); then
     args+=("--check" "--diff")
 fi
 
 black "${args[@]}" "${format_files[@]}"
 BLACKSTATUS=$?
 
-if [[ "$BLACKSTATUS" != "0"  ]]; then
+if (( BLACKSTATUS || ISORTSTATUS )); then
   exit 1
 fi
 exit 0

cirq-aqt/cirq_aqt/_version.py

@@ -14,4 +14,4 @@
 
 """Define version number here, read it from setup.py automatically"""
 
-__version__ = "1.5.0.dev"
+__version__ = "1.5.0.dev0"

cirq-aqt/cirq_aqt/_version_test.py

@@ -3,4 +3,4 @@
 
 
 def test_version():
-    assert cirq_aqt.__version__ == "1.5.0.dev"
+    assert cirq_aqt.__version__ == "1.5.0.dev0"

cirq-aqt/cirq_aqt/aqt_sampler.py

@@ -25,16 +25,15 @@
 import json
 import time
 import uuid
-from typing import Callable, cast, Dict, List, Sequence, Tuple, Union, Literal, TypedDict
+from typing import Callable, cast, Dict, List, Literal, Sequence, Tuple, TypedDict, Union
 from urllib.parse import urljoin
 
 import numpy as np
-from requests import post, get
+from requests import get, post
 
 import cirq
 from cirq_aqt.aqt_device import AQTSimulator, get_op_string, OperationString
 
-
 _DEFAULT_HOST = "https://arnica.aqt.eu/api/v1/"
 
 

cirq-aqt/cirq_aqt/aqt_sampler_test.py

@@ -12,8 +12,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from unittest import mock
 import json
+from unittest import mock
+
 import numpy as np
 import pytest
 import sympy