Merge branch 'main' into pulse_qubit

amazon-braket · Jun 21, 2023 · 8aa4c61 · 8aa4c61
2 parents f7628fb + 15e089b
commit 8aa4c61
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 9 deletions.
diff --git a/.coveragerc b/.coveragerc
@@ -2,18 +2,19 @@
 parallel = True
 branch = True
 source =
-    braket
+    src
 omit = 
     **/braket/ir/*
     **/braket/device_schema/*
     **/braket/schema_common/*
     **/braket/task_result/*
     **/braket/simulator/*
+    */site-packages/braket/*
 
 [paths]
 source =
-    src/braket
-    .tox/*/lib/python*/site-packages/braket
+    src
+    */site-packages/braket
 
 [report]
 show_missing = True

diff --git a/.github/workflows/dependent-tests.yml b/.github/workflows/dependent-tests.yml
@@ -13,10 +13,9 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
-        python-version: ["3.8", "3.9", "3.10"]
+        python-version: ["3.8", "3.9", "3.10", "3.11"]
         dependent:
           - amazon-braket-pennylane-plugin-python
-          - amazon-braket-strawberryfields-plugin-python
 
     steps:
     - uses: actions/checkout@v3

diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml
@@ -18,7 +18,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
-        python-version: ["3.8", "3.9", "3.10"]
+        python-version: ["3.8", "3.9", "3.10", "3.11"]
 
     steps:
     - uses: actions/checkout@v3

diff --git a/setup.py b/setup.py
@@ -79,5 +79,6 @@
         "Programming Language :: Python :: 3.8",
         "Programming Language :: Python :: 3.9",
         "Programming Language :: Python :: 3.10",
+        "Programming Language :: Python :: 3.11",
     ],
 )
diff --git a/src/braket/devices/local_simulator.py b/src/braket/devices/local_simulator.py
@@ -204,7 +204,7 @@ def _run_internal_wrap(
         inputs: Optional[Dict[str, float]] = None,
         *args,
         **kwargs,
-    ) -> Union[GateModelQuantumTaskResult, AnnealingQuantumTaskResult]:
+    ) -> Union[GateModelQuantumTaskResult, AnnealingQuantumTaskResult]:  # pragma: no cover
         """Wraps _run_interal for pickle dump"""
         return self._run_internal(task_specification, shots, inputs=inputs, *args, **kwargs)
 

diff --git a/test/unit_tests/braket/aws/test_aws_quantum_job.py b/test/unit_tests/braket/aws/test_aws_quantum_job.py
@@ -532,7 +532,8 @@ def test_name(quantum_job_arn, quantum_job_name, aws_session):
 
 
 def test_no_arn_setter(quantum_job):
-    with pytest.raises(AttributeError, match="can't set attribute"):
+    # Python 3.11 error output differs from Python 3.10 <=
+    with pytest.raises(AttributeError):
         quantum_job.arn = 123
 
 

diff --git a/tox.ini b/tox.ini
@@ -7,12 +7,13 @@ skip_install = true
 commands = coverage erase
 
 [testenv:unit-tests]
+usedevelop=True
 basepython = python3
 # {posargs} contains additional arguments specified when invoking tox. e.g. tox -- -s -k test_foo.py
 deps =
     {[test-deps]deps}
 commands =
-    pytest {posargs} --cov-report term-missing --cov-report html --cov-report xml --cov=braket
+    pytest {posargs} --cov=braket --cov-report term-missing --cov-report html --cov-report xml --cov-append
 extras = test
 
 [testenv:integ-tests]