Skip to content

Commit

Permalink
Merge branch 'main' into dependabot/github_actions/actions/checkout-4…
Browse files Browse the repository at this point in the history
….1.5
  • Loading branch information
AbeCoull authored May 7, 2024
2 parents b45ad79 + b791858 commit 213f44b
Show file tree
Hide file tree
Showing 7 changed files with 40 additions and 13 deletions.
10 changes: 10 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,15 @@
# Changelog

## v1.79.0 (2024-05-06)

### Features

* Direct Reservation context manager

### Documentation Changes

* correct the example in the measure docstring

## v1.78.0 (2024-04-18)

### Features
Expand Down
Binary file removed model.tar.gz
Binary file not shown.
2 changes: 1 addition & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ test=pytest
xfail_strict = true
# https://pytest-xdist.readthedocs.io/en/latest/known-limitations.html
addopts =
--verbose -n logical --durations=0 --durations-min=1
--verbose -n logical --durations=0 --durations-min=1 --dist worksteal
testpaths = test/unit_tests
filterwarnings=
# Issue #557 in `pytest-cov` (currently v4.x) has not moved for a while now,
Expand Down
2 changes: 1 addition & 1 deletion src/braket/_sdk/_version.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@
Version number (major.minor.patch[-label])
"""

__version__ = "1.78.1.dev0"
__version__ = "1.79.1.dev0"
25 changes: 25 additions & 0 deletions test/integ_tests/job_testing_utils.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
# Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License"). You
# may not use this file except in compliance with the License. A copy of
# the License is located at
#
# http://aws.amazon.com/apache2.0/
#
# or in the "license" file accompanying this file. This file is
# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF
# ANY KIND, either express or implied. See the License for the specific
# language governing permissions and limitations under the License.

import re

from braket.aws import AwsSession
from braket.jobs import Framework, retrieve_image


def decorator_python_version():
aws_session = AwsSession()
image_uri = retrieve_image(Framework.BASE, aws_session.region)
tag = aws_session.get_full_image_tag(image_uri)
major_version, minor_version = re.search(r"-py(\d)(\d+)-", tag).groups()
return int(major_version), int(minor_version)
12 changes: 2 additions & 10 deletions test/integ_tests/test_create_quantum_job.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,19 +22,11 @@
import job_test_script
import pytest
from job_test_module.job_test_submodule.job_test_submodule_file import submodule_helper
from job_testing_utils import decorator_python_version

from braket.aws import AwsSession
from braket.aws.aws_quantum_job import AwsQuantumJob
from braket.devices import Devices
from braket.jobs import Framework, get_input_data_dir, hybrid_job, retrieve_image, save_job_result


def decorator_python_version():
aws_session = AwsSession()
image_uri = retrieve_image(Framework.BASE, aws_session.region)
tag = aws_session.get_full_image_tag(image_uri)
major_version, minor_version = re.search(r"-py(\d)(\d+)-", tag).groups()
return int(major_version), int(minor_version)
from braket.jobs import get_input_data_dir, hybrid_job, save_job_result


def test_failed_quantum_job(aws_session, capsys, failed_quantum_job):
Expand Down
2 changes: 1 addition & 1 deletion test/integ_tests/test_reservation_arn.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@

import pytest
from botocore.exceptions import ClientError
from job_testing_utils import decorator_python_version

from braket.aws import AwsDevice, DirectReservation
from braket.circuits import Circuit
from braket.devices import Devices
from braket.jobs import get_job_device_arn, hybrid_job
from braket.test.integ_tests.test_create_quantum_job import decorator_python_version


@pytest.fixture
Expand Down

0 comments on commit 213f44b

Please sign in to comment.