Merge branch 'main' into only_validation

amazon-braket · Jul 10, 2024 · 8080de7 · 8080de7
2 parents b787222 + bbdbfa6
commit 8080de7
Show file tree

Hide file tree

Showing 18 changed files with 138 additions and 154 deletions.
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
@@ -11,7 +11,7 @@ _Put an `x` in the boxes that apply. You can also fill these out after creating
 #### General
 
 - [ ] I have read the [CONTRIBUTING](https://github.com/amazon-braket/amazon-braket-sdk-python/blob/main/CONTRIBUTING.md) doc
-- [ ] I used the commit message format described in [CONTRIBUTING](https://github.com/amazon-braket/amazon-braket-sdk-python/blob/main/CONTRIBUTING.md#commit-your-change)
+- [ ] I used the PR title format described in [CONTRIBUTING](https://github.com/amazon-braket/amazon-braket-sdk-python/blob/main/CONTRIBUTING.md#PR-title-format)
 - [ ] I have updated any necessary documentation, including [READMEs](https://github.com/amazon-braket/amazon-braket-sdk-python/blob/main/README.md) and [API docs](https://github.com/amazon-braket/amazon-braket-sdk-python/blob/main/CONTRIBUTING.md#documentation-guidelines) (if appropriate)
 
 #### Tests

diff --git a/.github/workflows/check-format.yml b/.github/workflows/check-format.yml
@@ -16,9 +16,9 @@ jobs:
   check-code-format:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+    - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
     - name: Set up Python
-      uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c # v5.0.0
+      uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # v5.1.0
       with:
         python-version: '3.9'
     - name: Install dependencies

diff --git a/.github/workflows/dependent-tests.yml b/.github/workflows/dependent-tests.yml
@@ -21,9 +21,9 @@ jobs:
           - amazon-braket-pennylane-plugin-python
 
     steps:
-    - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+    - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c # v5.0.0
+      uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # v5.1.0
       with:
         python-version: ${{ matrix.python-version }}
     - name: Install dependencies

diff --git a/.github/workflows/pr-title-checker.yml b/.github/workflows/pr-title-checker.yml
@@ -24,7 +24,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: "Check PR Title"
-        uses: thehanimo/[email protected].1
+        uses: thehanimo/[email protected].2
         with:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           pass_on_octokit_error: false

diff --git a/.github/workflows/publish-to-pypi.yml b/.github/workflows/publish-to-pypi.yml
@@ -12,9 +12,9 @@ jobs:
     name: Build and publish distribution to PyPi
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
       - name: Set up Python
-        uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c # v5.0.0
+        uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # v5.1.0
         with:
           python-version: '3.x'
       - name: Install wheel
@@ -26,6 +26,6 @@ jobs:
       - name: Build a binary wheel and a source tarball
         run: python setup.py sdist bdist_wheel
       - name: Publish distribution to PyPI
-        uses: pypa/gh-action-pypi-publish@81e9d935c883d0b210363ab89cf05f3894778450 # release/v1
+        uses: pypa/gh-action-pypi-publish@ec4db0b4ddc65acdf4bff5fa45ac92d78b56bdf0 # release/v1
         with:
           password: ${{ secrets.pypi_token }}
diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml
@@ -24,9 +24,9 @@ jobs:
         python-version: ["3.9", "3.10", "3.11"]
 
     steps:
-    - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+    - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c # v5.0.0
+      uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # v5.1.0
       with:
         python-version: ${{ matrix.python-version }}
     - name: Install dependencies

diff --git a/.github/workflows/twine-check.yml b/.github/workflows/twine-check.yml
@@ -14,9 +14,9 @@ jobs:
     name: Check long description
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
       - name: Set up Python
-        uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c # v5.0.0
+        uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # v5.1.0
         with:
           python-version: '3.x'
       - name: Install wheel

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,29 @@
 # Changelog
 
+## v1.83.0 (2024-06-28)
+
+### Deprecations and Removals
+
+ * Remove OQC
+
+### Features
+
+ * Use `run_multiple` for local batches
+
+### Documentation Changes
+
+ * update PR title instructions
+
+## v1.82.0 (2024-06-27)
+
+### Features
+
+ * Track classical target indices for measurements
+
+### Bug Fixes and Other Changes
+
+ * Add test to check classical indices used in measurement are preserved between Circuit and OpenQASM Translations.
+
 ## v1.81.1 (2024-06-17)
 
 ### Bug Fixes and Other Changes

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -95,10 +95,18 @@ You can also pass in various pytest arguments `tox -e integ-tests -- your-argume
 1. Run `tox`, to run all the unit tests, linters, and documentation creation, and verify that all checks and tests pass.
 1. If your changes include documentation changes, please see the [Documentation Guidelines](#documentation-guidelines).
 
+### Send a Pull Request
+
+GitHub provides additional documentation on [Creating a Pull Request](https://help.github.com/articles/creating-a-pull-request/).
+
+Please remember to:
+* Use PR titles that follow the guidelines under [PR Title Format](#pr-title-format).
+* Send us a pull request, answering any default questions in the pull request interface.
+* Pay attention to any automated CI failures reported in the pull request, and stay involved in the conversation.
 
-### Commit Your Change
+#### PR Title Format
 
-We use commit messages to update the project version number and generate changelog entries, so it's important for them to follow the right format. Valid commit messages include a prefix, separated from the rest of the message by a colon and a space. Here are a few examples:
+We use commit messages to update the project version number and generate changelog entries. The PR title is used as the commit message when merging a PR, so it's important for PR titles to follow the right format. Valid PR titles include a prefix, separated from the rest of the message by a colon and a space. Here are a few examples:
 
 ```
 feature: support new parameter for `xyz`
@@ -122,16 +130,6 @@ Some of the prefixes allow abbreviation ; `break`, `feat`, `depr`, and `doc` are
 For the rest of the message, use imperative style and keep things concise but informative. See [How to Write a Git Commit Message](https://chris.beams.io/posts/git-commit/) for guidance.
 
 
-### Send a Pull Request
-
-GitHub provides additional documentation on [Creating a Pull Request](https://help.github.com/articles/creating-a-pull-request/).
-
-Please remember to:
-* Use commit messages (and PR titles) that follow the guidelines under [Commit Your Change](#commit-your-change).
-* Send us a pull request, answering any default questions in the pull request interface.
-* Pay attention to any automated CI failures reported in the pull request, and stay involved in the conversation.
-
-
 ```mermaid
 timeline
     title Code integration journey (CI)

diff --git a/setup.py b/setup.py
@@ -28,7 +28,7 @@
     package_dir={"": "src"},
     install_requires=[
         "amazon-braket-schemas>=1.21.3",
-        "amazon-braket-default-simulator>=1.25.0",
+        "amazon-braket-default-simulator>=1.26.0",
         "oqpy~=0.3.5",
         "backoff",
         "boltons",

diff --git a/src/braket/_sdk/_version.py b/src/braket/_sdk/_version.py
@@ -15,4 +15,4 @@
 Version number (major.minor.patch[-label])
 """
 
-__version__ = "1.81.2.dev0"
+__version__ = "1.83.1.dev0"
diff --git a/src/braket/devices/device.py b/src/braket/devices/device.py
@@ -131,7 +131,7 @@ def _validate_device_noise_model_support(self, noise_model: NoiseModel) -> None:
 
     def _apply_noise_model_to_circuit(
         self, task_specification: Union[Circuit, Problem, Program, AnalogHamiltonianSimulation]
-    ) -> None:
+    ) -> Union[Circuit, Problem, Program, AnalogHamiltonianSimulation]:
         if isinstance(task_specification, Circuit):
             for instruction in task_specification.instructions:
                 if isinstance(instruction.operator, Noise):

diff --git a/src/braket/devices/devices.py b/src/braket/devices/devices.py
@@ -37,7 +37,7 @@ class _IonQ(str, Enum):
         Forte1 = "arn:aws:braket:us-east-1::device/qpu/ionq/Forte-1"
 
     class _OQC(str, Enum):
-        Lucy = "arn:aws:braket:eu-west-2::device/qpu/oqc/Lucy"
+        _Lucy = "arn:aws:braket:eu-west-2::device/qpu/oqc/Lucy"
 
     class _QuEra(str, Enum):
         Aquila = "arn:aws:braket:us-east-1::device/qpu/quera/Aquila"
@@ -58,7 +58,7 @@ class _Xanadu(str, Enum):
     # DWave = _DWave
     IonQ = _IonQ
     IQM = _IQM
-    OQC = _OQC
+    # OQC = _OQC
     QuEra = _QuEra
     Rigetti = _Rigetti
     # Xanadu = _Xanadu