fix rebase

Author: jcjaskula-aws

src/braket/aws/aws_quantum_task.py

@@ -162,15 +162,6 @@ def create(
                 those tasks do not need to be created with the reservation ARN.
                 Default: None.
 
-            quiet (bool): Sets the verbosity of the logger to low and does not report queue
-                position. Default is `False`.
-
-            reservation_arn (str | None): The reservation ARN provided by Braket Direct
-                to reserve exclusive usage for the device to run the quantum task on.
-                Note: If you are creating tasks in a job that itself was created reservation ARN,
-                those tasks do not need to be created with the reservation ARN.
-                Default: None.
-
         Returns:
             AwsQuantumTask: AwsQuantumTask tracking the quantum task execution on the device.
 
@@ -200,18 +191,6 @@ def create(
         inputs = inputs or {}
         gate_definitions = gate_definitions or {}
 
-        if reservation_arn:
-            create_task_kwargs.update(
-                {
-                    "associations": [
-                        {
-                            "arn": reservation_arn,
-                            "type": "RESERVATION_TIME_WINDOW_ARN",
-                        }
-                    ]
-                }
-            )
-
         if reservation_arn:
             create_task_kwargs.update(
                 {

src/braket/pulse/ast/free_parameters.py

@@ -19,9 +19,6 @@
 from oqpy.program import Program
 from oqpy.timing import OQDurationLiteral
 
-    def to_ast(self) -> ast.Identifier:
-        return self
-
 
 class _FreeParameterTransformer(QASMTransformer):
     """Walk the AST and evaluate FreeParameterExpressions."""

src/braket/pulse/pulse_sequence.py

@@ -31,7 +31,7 @@
 from braket.pulse.ast.qasm_transformer import _IRQASMTransformer
 from braket.pulse.frame import Frame
 from braket.pulse.pulse_sequence_trace import PulseSequenceTrace
-from braket.pulse.waveforms import Waveform
+from braket.pulse.waveforms import Waveform, WaveformDict
 from braket.registers.qubit_set import QubitSet
 
 

src/braket/pulse/waveforms.py

@@ -16,7 +16,11 @@
 import random
 import string
 from abc import ABC, abstractmethod
-from typing import Optional, Union
+from copy import deepcopy
+from typing import TYPE_CHECKING, Any, Optional, Union
+
+if TYPE_CHECKING:
+    from braket.pulse.pulse_sequence import PulseSequence
 
 import numpy as np
 import openpulse.ast as ast