infra: onboard to ruff

pyproject.toml

@@ -1,7 +1,12 @@
-[tool.black]
+[tool.ruff]
+target-version = "py39"
 line-length = 100
-extend-exclude = '''
-(
-  generated/*
-)
-'''
+lint.isort = { known-first-party = [
+  "braket",
+] }
+lint.extend-select = ["I", "UP", "PERF"]
+lint.preview = true
+lint.ignore = ["UP045", "UP007"]
+lint.per-file-ignores."src/braket/default_simulator/openqasm/parser/generated/qasm3Parser.py" = ["F405", "F403"] # Imports for classes need to be limited later
+lint.per-file-ignores."src/braket/default_simulator/openqasm/parser/generated/BraketPragmasParser.py" = ["E741", "F405", "F403"]
+lint.per-file-ignores."src/braket/default_simulator/openqasm/parser/generated/BraketPragmasLexer.py" = ["E741", "F405", "F403"]

setup.cfg

@@ -7,29 +7,3 @@ addopts =
     --verbose -n auto
 testpaths = test/unit_tests
 
-[isort]
-line_length = 100
-multi_line_output = 3
-include_trailing_comma = true
-profile=black
-
-[flake8]
-ignore =
-    # not pep8, black adds whitespace before ':'
-    E203,
-    # not pep8, black adds line break before binary operator
-    W503,
-    # Google Python style is not RST until after processed by Napoleon
-    # See https://github.com/peterjc/flake8-rst-docstrings/issues/17
-    RST201,RST203,RST301,
-max_line_length = 100
-max-complexity = 10
-exclude =
-    __pycache__
-    .tox
-    .git
-    bin
-    build
-    venv
-    src/braket/default_simulator/openqasm/parser
-    openqasm

setup.py

@@ -54,17 +54,14 @@
     },
     extras_require={
         "test": [
-            "black",
-            "flake8",
-            "flake8-rst-docstrings",
-            "isort",
             "pre-commit",
             "pylint",
             "pytest==7.2.0",
             "pytest-benchmark",
             "pytest-cov",
             "pytest-rerunfailures",
             "pytest-xdist",
+            "ruff",
             "sphinx",
             "sphinx-rtd-theme",
             "sphinxcontrib-apidoc",

src/braket/analog_hamiltonian_simulator/rydberg/numpy_solver.py

@@ -14,13 +14,13 @@
 import time
 
 import numpy as np
-from braket.ir.ahs.program_v1 import Program
 
 from braket.analog_hamiltonian_simulator.rydberg.rydberg_simulator_helpers import (
     _get_hamiltonian,
     _get_ops_coefs,
     _print_progress_bar,
 )
+from braket.ir.ahs.program_v1 import Program
 
 # define the Butcher tableau
 _ORDER = 6

src/braket/analog_hamiltonian_simulator/rydberg/rydberg_simulator.py

@@ -14,12 +14,6 @@
 import sys
 
 import numpy as np
-from braket.device_schema import DeviceCapabilities
-from braket.ir.ahs.program_v1 import Program
-from braket.task_result.analog_hamiltonian_simulation_task_result_v1 import (
-    AnalogHamiltonianSimulationTaskResult,
-)
-from braket.task_result.task_metadata_v1 import TaskMetadata
 from pydantic.v1 import create_model  # This is temporary for defining properties below
 
 from braket.analog_hamiltonian_simulator.rydberg.constants import (
@@ -49,6 +43,12 @@
 )
 from braket.default_simulator.simulation import Simulation
 from braket.default_simulator.simulator import BaseLocalSimulator
+from braket.device_schema import DeviceCapabilities
+from braket.ir.ahs.program_v1 import Program
+from braket.task_result.analog_hamiltonian_simulation_task_result_v1 import (
+    AnalogHamiltonianSimulationTaskResult,
+)
+from braket.task_result.task_metadata_v1 import TaskMetadata
 
 
 class RydbergAtomSimulator(BaseLocalSimulator):
@@ -71,7 +71,7 @@ def run(
         max_step: int = 0,
         min_step: int = 0,
         *args,
-        **kwargs
+        **kwargs,
     ) -> AnalogHamiltonianSimulationTaskResult:
         """
         Run the simulation for the dynamics of the Rydberg system, and return the result

src/braket/analog_hamiltonian_simulator/rydberg/rydberg_simulator_helpers.py

@@ -17,6 +17,7 @@
 
 import numpy as np
 import scipy.sparse
+
 from braket.ir.ahs.atom_arrangement import AtomArrangement
 from braket.ir.ahs.program_v1 import Program
 

src/braket/analog_hamiltonian_simulator/rydberg/rydberg_simulator_result_converter.py

@@ -12,6 +12,7 @@
 # language governing permissions and limitations under the License.
 
 import numpy as np
+
 from braket.task_result.analog_hamiltonian_simulation_task_result_v1 import (
     AnalogHamiltonianSimulationShotMeasurement,
     AnalogHamiltonianSimulationShotMetadata,

src/braket/analog_hamiltonian_simulator/rydberg/rydberg_simulator_unit_converter.py

@@ -11,11 +11,10 @@
 # ANY KIND, either express or implied. See the License for the specific
 # language governing permissions and limitations under the License.
 
+from braket.analog_hamiltonian_simulator.rydberg.constants import FIELD_UNIT, SPACE_UNIT, TIME_UNIT
 from braket.ir.ahs.physical_field import PhysicalField
 from braket.ir.ahs.program_v1 import Program
 
-from braket.analog_hamiltonian_simulator.rydberg.constants import FIELD_UNIT, SPACE_UNIT, TIME_UNIT
-
 
 def convert_unit(program: Program) -> Program:
     """

src/braket/analog_hamiltonian_simulator/rydberg/scipy_solver.py

@@ -16,13 +16,13 @@
 import numpy as np
 import scipy.integrate
 import scipy.sparse
-from braket.ir.ahs.program_v1 import Program
 
 from braket.analog_hamiltonian_simulator.rydberg.rydberg_simulator_helpers import (
     _apply_hamiltonian,
     _get_ops_coefs,
     _print_progress_bar,
 )
+from braket.ir.ahs.program_v1 import Program
 
 
 def scipy_integrate_ode_run(

src/braket/analog_hamiltonian_simulator/rydberg/validators/atom_arrangement.py

@@ -15,12 +15,12 @@
 from decimal import Decimal
 
 import numpy as np
-from braket.ir.ahs.atom_arrangement import AtomArrangement
 from pydantic.v1.class_validators import root_validator
 
 from braket.analog_hamiltonian_simulator.rydberg.validators.capabilities_constants import (
     CapabilitiesConstants,
 )
+from braket.ir.ahs.atom_arrangement import AtomArrangement
 
 
 def _euclidean_distance(

src/braket/analog_hamiltonian_simulator/rydberg/validators/driving_field.py

@@ -11,7 +11,6 @@
 # ANY KIND, either express or implied. See the License for the specific
 # language governing permissions and limitations under the License.
 
-from braket.ir.ahs.driving_field import DrivingField
 from pydantic.v1 import root_validator
 
 from braket.analog_hamiltonian_simulator.rydberg.validators.capabilities_constants import (
@@ -20,6 +19,7 @@
 from braket.analog_hamiltonian_simulator.rydberg.validators.field_validator_util import (
     validate_value_range_with_warning,
 )
+from braket.ir.ahs.driving_field import DrivingField
 
 
 class DrivingFieldValidator(DrivingField):

src/braket/analog_hamiltonian_simulator/rydberg/validators/field_validator_util.py

@@ -13,14 +13,13 @@
 
 import warnings
 from decimal import Decimal
-from typing import List
 
 import numpy as np
-from braket.ir.ahs.program_v1 import Program
 
 from braket.analog_hamiltonian_simulator.rydberg.validators.capabilities_constants import (
     CapabilitiesConstants,
 )
+from braket.ir.ahs.program_v1 import Program
 
 
 def validate_value_range_with_warning(
@@ -50,7 +49,7 @@ def validate_net_detuning_with_warning(
     program: Program,
     time_points: np.ndarray,
     global_detuning_coefs: np.ndarray,
-    local_detuning_patterns: List,
+    local_detuning_patterns: list,
     local_detuning_coefs: np.ndarray,
     capabilities: CapabilitiesConstants,
 ) -> Program:
@@ -70,7 +69,6 @@ def validate_net_detuning_with_warning(
     """
 
     for time_ind, time in enumerate(time_points):
-
         # Get the contributions from all the global detunings
         # (there could be multiple global driving fields) at the time point
         values_global_detuning = sum(

src/braket/analog_hamiltonian_simulator/rydberg/validators/hamiltonian.py

@@ -11,9 +11,10 @@
 # ANY KIND, either express or implied. See the License for the specific
 # language governing permissions and limitations under the License.
 
-from braket.ir.ahs.hamiltonian import Hamiltonian
 from pydantic.v1 import root_validator
 
+from braket.ir.ahs.hamiltonian import Hamiltonian
+
 
 class HamiltonianValidator(Hamiltonian):
     @root_validator(pre=True, skip_on_failure=True)

src/braket/analog_hamiltonian_simulator/rydberg/validators/ir_validator.py

@@ -11,8 +11,6 @@
 # ANY KIND, either express or implied. See the License for the specific
 # language governing permissions and limitations under the License.
 
-from braket.ir.ahs.program_v1 import Program
-
 from braket.analog_hamiltonian_simulator.rydberg.validators.atom_arrangement import (
     AtomArrangementValidator,
 )
@@ -31,6 +29,7 @@
 )
 from braket.analog_hamiltonian_simulator.rydberg.validators.program import ProgramValidator
 from braket.analog_hamiltonian_simulator.rydberg.validators.times_series import TimeSeriesValidator
+from braket.ir.ahs.program_v1 import Program
 
 
 def validate_program(program: Program, device_capabilities: CapabilitiesConstants) -> None:

src/braket/analog_hamiltonian_simulator/rydberg/validators/local_detuning.py

@@ -11,7 +11,6 @@
 # ANY KIND, either express or implied. See the License for the specific
 # language governing permissions and limitations under the License.
 
-from braket.ir.ahs.local_detuning import LocalDetuning
 from pydantic.v1.class_validators import root_validator
 
 from braket.analog_hamiltonian_simulator.rydberg.validators.capabilities_constants import (
@@ -20,6 +19,7 @@
 from braket.analog_hamiltonian_simulator.rydberg.validators.field_validator_util import (
     validate_value_range_with_warning,
 )
+from braket.ir.ahs.local_detuning import LocalDetuning
 
 
 class LocalDetuningValidator(LocalDetuning):

src/braket/analog_hamiltonian_simulator/rydberg/validators/physical_field.py

@@ -11,9 +11,10 @@
 # ANY KIND, either express or implied. See the License for the specific
 # language governing permissions and limitations under the License.
 
-from braket.ir.ahs.physical_field import PhysicalField
 from pydantic.v1.class_validators import root_validator
 
+from braket.ir.ahs.physical_field import PhysicalField
+
 
 class PhysicalFieldValidator(PhysicalField):
     # Pattern, if string, must be "uniform"

src/braket/analog_hamiltonian_simulator/rydberg/validators/program.py

@@ -13,7 +13,6 @@
 
 from copy import deepcopy
 
-from braket.ir.ahs.program_v1 import Program
 from pydantic.v1 import root_validator
 
 from braket.analog_hamiltonian_simulator.rydberg.rydberg_simulator_helpers import _get_coefs
@@ -23,6 +22,7 @@
 from braket.analog_hamiltonian_simulator.rydberg.validators.field_validator_util import (
     validate_net_detuning_with_warning,
 )
+from braket.ir.ahs.program_v1 import Program
 
 
 class ProgramValidator(Program):

src/braket/analog_hamiltonian_simulator/rydberg/validators/shifting_field.py

@@ -11,7 +11,6 @@
 # ANY KIND, either express or implied. See the License for the specific
 # language governing permissions and limitations under the License.
 
-from braket.ir.ahs.local_detuning import LocalDetuning
 from pydantic.v1.class_validators import root_validator
 
 from braket.analog_hamiltonian_simulator.rydberg.validators.capabilities_constants import (
@@ -20,6 +19,7 @@
 from braket.analog_hamiltonian_simulator.rydberg.validators.field_validator_util import (
     validate_value_range_with_warning,
 )
+from braket.ir.ahs.local_detuning import LocalDetuning
 
 
 class LocalDetuningValidator(LocalDetuning):

src/braket/analog_hamiltonian_simulator/rydberg/validators/times_series.py

@@ -13,12 +13,12 @@
 
 import warnings
 
-from braket.ir.ahs.time_series import TimeSeries
 from pydantic.v1.class_validators import root_validator
 
 from braket.analog_hamiltonian_simulator.rydberg.validators.capabilities_constants import (
     CapabilitiesConstants,
 )
+from braket.ir.ahs.time_series import TimeSeries
 
 
 class TimeSeriesValidator(TimeSeries):

src/braket/default_simulator/density_matrix_simulator.py

@@ -13,14 +13,13 @@
 
 import sys
 
+from braket.default_simulator import DensityMatrixSimulation
+from braket.default_simulator.simulator import BaseLocalSimulator
 from braket.device_schema.simulators import (
     GateModelSimulatorDeviceCapabilities,
     GateModelSimulatorDeviceParameters,
 )
 
-from braket.default_simulator import DensityMatrixSimulation
-from braket.default_simulator.simulator import BaseLocalSimulator
-
 
 class DensityMatrixSimulator(BaseLocalSimulator):
     DEVICE_ID = "braket_dm"

src/braket/default_simulator/gate_operations.py

@@ -17,9 +17,9 @@
 import math
 from collections.abc import Sequence
 
-import braket.ir.jaqcd as braket_instruction
 import numpy as np
 
+import braket.ir.jaqcd as braket_instruction
 from braket.default_simulator.operation import GateOperation
 from braket.default_simulator.operation_helpers import (
     _from_braket_instruction,

src/braket/default_simulator/noise_operations.py

@@ -15,9 +15,9 @@
 
 import itertools
 
-import braket.ir.jaqcd as braket_instruction
 import numpy as np
 
+import braket.ir.jaqcd as braket_instruction
 from braket.default_simulator.operation import KrausOperation
 from braket.default_simulator.operation_helpers import (
     _from_braket_instruction,

src/braket/default_simulator/openqasm/_helpers/casting.py

@@ -48,7 +48,7 @@
 @singledispatch
 def cast_to(into: Union[ClassicalType, type[LiteralType]], variable: LiteralType) -> LiteralType:
     """Cast a variable into a given type. Order of parameters is to enable singledispatch"""
-    if type(variable) == into:
+    if type(variable) is into:
         return variable
     if into == BooleanLiteral or isinstance(into, BoolType):
         return BooleanLiteral(bool(variable.value))

src/braket/default_simulator/openqasm/_helpers/functions.py

@@ -14,6 +14,7 @@
 """
 Evaluating expressions
 """
+
 from ..parser.openqasm_ast import (
     ArrayLiteral,
     AssignmentOperator,