Skip to content

Commit

Permalink
Merge branch 'main' into gpi2_fix
Browse files Browse the repository at this point in the history
  • Loading branch information
AbeCoull authored Mar 28, 2024
2 parents bd2fc9b + d6209ee commit 20bdcb5
Show file tree
Hide file tree
Showing 6 changed files with 21 additions and 5 deletions.
16 changes: 16 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,21 @@
# Changelog

## v1.75.0 (2024-03-28)

### Features

* upgrade to pydantic 2.x

### Bug Fixes and Other Changes

* change schemas constraint

## v1.74.1 (2024-03-27)

### Bug Fixes and Other Changes

* temporarily pin the schemas version

## v1.74.0 (2024-03-21)

### Features
Expand Down
Binary file added model.tar.gz
Binary file not shown.
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@
packages=find_namespace_packages(where="src", exclude=("test",)),
package_dir={"": "src"},
install_requires=[
"amazon-braket-schemas>=1.20.2",
"amazon-braket-default-simulator>=1.19.1",
"amazon-braket-schemas>=1.21.0",
"amazon-braket-default-simulator>=1.21.2",
"oqpy~=0.3.5",
"setuptools",
"backoff",
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.74.1.dev0"
__version__ = "1.75.1.dev0"
2 changes: 1 addition & 1 deletion test/unit_tests/braket/circuits/test_angled_gate.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

import numpy as np
import pytest
from pydantic import BaseModel
from pydantic.v1 import BaseModel

from braket.circuits import AngledGate, FreeParameter, FreeParameterExpression, Gate
from braket.circuits.angled_gate import DoubleAngledGate, TripleAngledGate
Expand Down
2 changes: 1 addition & 1 deletion test/unit_tests/braket/devices/test_local_simulator.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
from unittest.mock import Mock, patch

import pytest
from pydantic import create_model # This is temporary for defining properties below
from pydantic.v1 import create_model # This is temporary for defining properties below

import braket.ir as ir
from braket.ahs.analog_hamiltonian_simulation import AnalogHamiltonianSimulation
Expand Down

0 comments on commit 20bdcb5

Please sign in to comment.