From 876e951c5a608650a8831b791a0117de6814ebb5 Mon Sep 17 00:00:00 2001 From: Brady Planden Date: Tue, 19 Mar 2024 16:42:01 +0000 Subject: [PATCH 1/3] Add ruff import lint, run across codebase --- benchmarks/benchmark_model.py | 4 +++- benchmarks/benchmark_optim_construction.py | 4 +++- benchmarks/benchmark_parameterisation.py | 4 +++- benchmarks/benchmark_track_parameterisation.py | 4 +++- conftest.py | 2 +- .../notebooks/equivalent_circuit_identification.ipynb | 5 +++-- examples/notebooks/spm_Adam.ipynb | 5 +++-- examples/notebooks/spm_CMAES.ipynb | 5 +++-- examples/notebooks/spm_scipy_DifferentialEvolution.ipynb | 5 +++-- examples/scripts/ecm_CMAES.py | 3 ++- examples/scripts/exp_UKF.py | 5 +++-- examples/scripts/spm_CMAES.py | 3 ++- examples/scripts/spm_IRPropMin.py | 3 ++- examples/scripts/spm_MLE.py | 3 ++- examples/scripts/spm_SNES.py | 3 ++- examples/scripts/spm_UKF.py | 3 ++- examples/scripts/spm_XNES.py | 3 ++- examples/scripts/spm_adam.py | 3 ++- examples/scripts/spm_descent.py | 3 ++- examples/scripts/spm_pso.py | 3 ++- examples/scripts/spm_scipymin.py | 3 ++- examples/scripts/spme_max_energy.py | 1 - examples/standalone/cost.py | 3 ++- examples/standalone/problem.py | 1 + noxfile.py | 2 +- pybop/_optimisation.py | 8 +++++--- pybop/costs/_likelihoods.py | 1 + pybop/costs/base_cost.py | 3 ++- pybop/costs/design_costs.py | 3 ++- pybop/models/base_model.py | 8 +++++--- pybop/models/empirical/ecm.py | 1 + pybop/models/lithium_ion/echem.py | 1 + pybop/models/lithium_ion/echem_base.py | 1 + pybop/observers/observer.py | 2 ++ pybop/observers/unscented_kalman.py | 3 ++- pybop/optimisers/pints_optimisers.py | 2 +- pybop/optimisers/scipy_optimisers.py | 5 +++-- pybop/parameters/parameter_set.py | 2 ++ pybop/parameters/priors.py | 2 +- pybop/plotting/plot_convergence.py | 3 ++- pybop/plotting/plot_parameters.py | 3 ++- pybop/plotting/plotly_manager.py | 2 +- pybop/plotting/quick_plot.py | 4 +++- pyproject.toml | 1 + tests/docs/test_docs.py | 5 +++-- tests/examples/test_examples.py | 8 +++++--- tests/integration/test_model_experiment_changes.py | 5 +++-- tests/integration/test_parameterisations.py | 5 +++-- tests/plotting/test_plotly_manager.py | 8 +++++--- tests/unit/test_cost.py | 4 +++- tests/unit/test_dataset.py | 3 ++- tests/unit/test_experiment.py | 3 ++- tests/unit/test_likelihoods.py | 4 +++- tests/unit/test_models.py | 4 ++-- tests/unit/test_observer_unscented_kalman.py | 5 +++-- tests/unit/test_observers.py | 3 ++- tests/unit/test_optimisation.py | 3 ++- tests/unit/test_parameter_sets.py | 3 ++- tests/unit/test_parameters.py | 3 ++- tests/unit/test_plots.py | 3 ++- tests/unit/test_priors.py | 3 ++- tests/unit/test_problem.py | 3 ++- tests/unit/test_standalone.py | 3 ++- 63 files changed, 142 insertions(+), 74 deletions(-) diff --git a/benchmarks/benchmark_model.py b/benchmarks/benchmark_model.py index ed53914c..df0335c2 100644 --- a/benchmarks/benchmark_model.py +++ b/benchmarks/benchmark_model.py @@ -1,5 +1,7 @@ -import pybop import numpy as np + +import pybop + from .benchmark_utils import set_random_seed diff --git a/benchmarks/benchmark_optim_construction.py b/benchmarks/benchmark_optim_construction.py index d92f2ec3..fee5f078 100644 --- a/benchmarks/benchmark_optim_construction.py +++ b/benchmarks/benchmark_optim_construction.py @@ -1,5 +1,7 @@ -import pybop import numpy as np + +import pybop + from .benchmark_utils import set_random_seed diff --git a/benchmarks/benchmark_parameterisation.py b/benchmarks/benchmark_parameterisation.py index 09ee13a3..76976887 100644 --- a/benchmarks/benchmark_parameterisation.py +++ b/benchmarks/benchmark_parameterisation.py @@ -1,5 +1,7 @@ -import pybop import numpy as np + +import pybop + from .benchmark_utils import set_random_seed diff --git a/benchmarks/benchmark_track_parameterisation.py b/benchmarks/benchmark_track_parameterisation.py index 61d63643..793ab462 100644 --- a/benchmarks/benchmark_track_parameterisation.py +++ b/benchmarks/benchmark_track_parameterisation.py @@ -1,5 +1,7 @@ -import pybop import numpy as np + +import pybop + from .benchmark_utils import set_random_seed diff --git a/conftest.py b/conftest.py index fc14a21e..e2d9a55b 100644 --- a/conftest.py +++ b/conftest.py @@ -1,6 +1,6 @@ -import pytest import matplotlib import plotly +import pytest plotly.io.renderers.default = None matplotlib.use("Template") diff --git a/examples/notebooks/equivalent_circuit_identification.ipynb b/examples/notebooks/equivalent_circuit_identification.ipynb index c1a09d98..a2962eef 100644 --- a/examples/notebooks/equivalent_circuit_identification.ipynb +++ b/examples/notebooks/equivalent_circuit_identification.ipynb @@ -72,8 +72,9 @@ "metadata": {}, "outputs": [], "source": [ - "import pybop\n", - "import numpy as np" + "import numpy as np\n", + "\n", + "import pybop" ] }, { diff --git a/examples/notebooks/spm_Adam.ipynb b/examples/notebooks/spm_Adam.ipynb index 312e492c..7ae38a25 100644 --- a/examples/notebooks/spm_Adam.ipynb +++ b/examples/notebooks/spm_Adam.ipynb @@ -82,8 +82,9 @@ }, "outputs": [], "source": [ - "import pybop\n", - "import numpy as np" + "import numpy as np\n", + "\n", + "import pybop" ] }, { diff --git a/examples/notebooks/spm_CMAES.ipynb b/examples/notebooks/spm_CMAES.ipynb index 0b568dc2..43585f7c 100644 --- a/examples/notebooks/spm_CMAES.ipynb +++ b/examples/notebooks/spm_CMAES.ipynb @@ -105,8 +105,9 @@ }, "outputs": [], "source": [ - "import pybop\n", - "import numpy as np" + "import numpy as np\n", + "\n", + "import pybop" ] }, { diff --git a/examples/notebooks/spm_scipy_DifferentialEvolution.ipynb b/examples/notebooks/spm_scipy_DifferentialEvolution.ipynb index 2003c9d4..75ad4099 100644 --- a/examples/notebooks/spm_scipy_DifferentialEvolution.ipynb +++ b/examples/notebooks/spm_scipy_DifferentialEvolution.ipynb @@ -80,8 +80,9 @@ }, "outputs": [], "source": [ - "import pybop\n", - "import numpy as np" + "import numpy as np\n", + "\n", + "import pybop" ] }, { diff --git a/examples/scripts/ecm_CMAES.py b/examples/scripts/ecm_CMAES.py index d60a8a8c..50ece438 100644 --- a/examples/scripts/ecm_CMAES.py +++ b/examples/scripts/ecm_CMAES.py @@ -1,6 +1,7 @@ -import pybop import numpy as np +import pybop + # Import the ECM parameter set from JSON params = pybop.ParameterSet( json_path="examples/scripts/parameters/initial_ecm_parameters.json" diff --git a/examples/scripts/exp_UKF.py b/examples/scripts/exp_UKF.py index e4cf24f3..f9c862c3 100644 --- a/examples/scripts/exp_UKF.py +++ b/examples/scripts/exp_UKF.py @@ -1,6 +1,7 @@ -import pybop -import pybamm import numpy as np +import pybamm + +import pybop from examples.standalone.model import ExponentialDecay # Parameter set and model definition diff --git a/examples/scripts/spm_CMAES.py b/examples/scripts/spm_CMAES.py index f5728019..b0dbb256 100644 --- a/examples/scripts/spm_CMAES.py +++ b/examples/scripts/spm_CMAES.py @@ -1,6 +1,7 @@ -import pybop import numpy as np +import pybop + # Define model parameter_set = pybop.ParameterSet.pybamm("Chen2020") model = pybop.lithium_ion.SPM(parameter_set=parameter_set) diff --git a/examples/scripts/spm_IRPropMin.py b/examples/scripts/spm_IRPropMin.py index 1f5208ce..08df59ea 100644 --- a/examples/scripts/spm_IRPropMin.py +++ b/examples/scripts/spm_IRPropMin.py @@ -1,6 +1,7 @@ -import pybop import numpy as np +import pybop + # Define model parameter_set = pybop.ParameterSet.pybamm("Chen2020") model = pybop.lithium_ion.SPM(parameter_set=parameter_set) diff --git a/examples/scripts/spm_MLE.py b/examples/scripts/spm_MLE.py index 7aa4254a..8ac36908 100644 --- a/examples/scripts/spm_MLE.py +++ b/examples/scripts/spm_MLE.py @@ -1,6 +1,7 @@ -import pybop import numpy as np +import pybop + # Define model parameter_set = pybop.ParameterSet.pybamm("Chen2020") model = pybop.lithium_ion.SPM(parameter_set=parameter_set) diff --git a/examples/scripts/spm_SNES.py b/examples/scripts/spm_SNES.py index 97112dca..d0da2867 100644 --- a/examples/scripts/spm_SNES.py +++ b/examples/scripts/spm_SNES.py @@ -1,6 +1,7 @@ -import pybop import numpy as np +import pybop + # Define model parameter_set = pybop.ParameterSet.pybamm("Chen2020") model = pybop.lithium_ion.SPM(parameter_set=parameter_set) diff --git a/examples/scripts/spm_UKF.py b/examples/scripts/spm_UKF.py index 7128293c..3c4c74d0 100644 --- a/examples/scripts/spm_UKF.py +++ b/examples/scripts/spm_UKF.py @@ -1,6 +1,7 @@ -import pybop import numpy as np +import pybop + # Parameter set and model definition parameter_set = pybop.ParameterSet.pybamm("Chen2020") model = pybop.lithium_ion.SPM(parameter_set=parameter_set) diff --git a/examples/scripts/spm_XNES.py b/examples/scripts/spm_XNES.py index fb79b102..9e199a9b 100644 --- a/examples/scripts/spm_XNES.py +++ b/examples/scripts/spm_XNES.py @@ -1,6 +1,7 @@ -import pybop import numpy as np +import pybop + # Define model parameter_set = pybop.ParameterSet.pybamm("Chen2020") model = pybop.lithium_ion.SPM(parameter_set=parameter_set) diff --git a/examples/scripts/spm_adam.py b/examples/scripts/spm_adam.py index 7d158493..578a960f 100644 --- a/examples/scripts/spm_adam.py +++ b/examples/scripts/spm_adam.py @@ -1,6 +1,7 @@ -import pybop import numpy as np +import pybop + # Parameter set and model definition parameter_set = pybop.ParameterSet.pybamm("Chen2020") model = pybop.lithium_ion.SPMe(parameter_set=parameter_set) diff --git a/examples/scripts/spm_descent.py b/examples/scripts/spm_descent.py index 6bf16329..f74f6b15 100644 --- a/examples/scripts/spm_descent.py +++ b/examples/scripts/spm_descent.py @@ -1,6 +1,7 @@ -import pybop import numpy as np +import pybop + # Parameter set and model definition parameter_set = pybop.ParameterSet.pybamm("Chen2020") model = pybop.lithium_ion.SPMe(parameter_set=parameter_set) diff --git a/examples/scripts/spm_pso.py b/examples/scripts/spm_pso.py index 1a51d80d..31b79135 100644 --- a/examples/scripts/spm_pso.py +++ b/examples/scripts/spm_pso.py @@ -1,6 +1,7 @@ -import pybop import numpy as np +import pybop + # Define model parameter_set = pybop.ParameterSet.pybamm("Chen2020") model = pybop.lithium_ion.SPM(parameter_set=parameter_set) diff --git a/examples/scripts/spm_scipymin.py b/examples/scripts/spm_scipymin.py index 1c57a735..14366658 100644 --- a/examples/scripts/spm_scipymin.py +++ b/examples/scripts/spm_scipymin.py @@ -1,6 +1,7 @@ -import pybop import pandas as pd +import pybop + # Form dataset Measurements = pd.read_csv("examples/scripts/Chen_example.csv", comment="#").to_numpy() dataset = pybop.Dataset( diff --git a/examples/scripts/spme_max_energy.py b/examples/scripts/spme_max_energy.py index ebd5bebf..40c47bef 100644 --- a/examples/scripts/spme_max_energy.py +++ b/examples/scripts/spme_max_energy.py @@ -1,6 +1,5 @@ import pybop - # A design optimisation example loosely based on work by L.D. Couto # available at https://doi.org/10.1016/j.energy.2022.125966. diff --git a/examples/standalone/cost.py b/examples/standalone/cost.py index d632d3f1..149acd56 100644 --- a/examples/standalone/cost.py +++ b/examples/standalone/cost.py @@ -1,6 +1,7 @@ -import pybop import numpy as np +import pybop + class StandaloneCost(pybop.BaseCost): """ diff --git a/examples/standalone/problem.py b/examples/standalone/problem.py index 5a29138e..0b0831d8 100644 --- a/examples/standalone/problem.py +++ b/examples/standalone/problem.py @@ -1,4 +1,5 @@ import numpy as np + from pybop._problem import BaseProblem diff --git a/noxfile.py b/noxfile.py index 0695f011..fb886780 100644 --- a/noxfile.py +++ b/noxfile.py @@ -1,6 +1,6 @@ import os -import nox +import nox # nox options nox.options.reuse_existing_virtualenvs = True diff --git a/pybop/_optimisation.py b/pybop/_optimisation.py index f122535e..cc4853c3 100644 --- a/pybop/_optimisation.py +++ b/pybop/_optimisation.py @@ -1,8 +1,10 @@ -import pybop -import pints -import numpy as np import warnings +import numpy as np +import pints + +import pybop + class Optimisation: """ diff --git a/pybop/costs/_likelihoods.py b/pybop/costs/_likelihoods.py index 03134493..e476ce94 100644 --- a/pybop/costs/_likelihoods.py +++ b/pybop/costs/_likelihoods.py @@ -1,4 +1,5 @@ import numpy as np + from pybop.costs.base_cost import BaseCost diff --git a/pybop/costs/base_cost.py b/pybop/costs/base_cost.py index a13381ae..43246cdf 100644 --- a/pybop/costs/base_cost.py +++ b/pybop/costs/base_cost.py @@ -1,6 +1,7 @@ -from pybop import BaseProblem import numpy as np +from pybop import BaseProblem + class BaseCost: """ diff --git a/pybop/costs/design_costs.py b/pybop/costs/design_costs.py index 8b02f1f2..dae2f51c 100644 --- a/pybop/costs/design_costs.py +++ b/pybop/costs/design_costs.py @@ -1,6 +1,7 @@ -import numpy as np import warnings +import numpy as np + from pybop.costs.base_cost import BaseCost diff --git a/pybop/models/base_model.py b/pybop/models/base_model.py index 5dde68c4..9ed82675 100644 --- a/pybop/models/base_model.py +++ b/pybop/models/base_model.py @@ -1,10 +1,12 @@ from __future__ import annotations + +import copy from dataclasses import dataclass from typing import Any, Dict, Optional -import pybamm -import copy -import numpy as np + import casadi +import numpy as np +import pybamm Inputs = Dict[str, float] diff --git a/pybop/models/empirical/ecm.py b/pybop/models/empirical/ecm.py index 6c0427c8..6926c4d5 100644 --- a/pybop/models/empirical/ecm.py +++ b/pybop/models/empirical/ecm.py @@ -1,4 +1,5 @@ import pybamm + from .ecm_base import ECircuitModel diff --git a/pybop/models/lithium_ion/echem.py b/pybop/models/lithium_ion/echem.py index bb03f658..a690d0de 100644 --- a/pybop/models/lithium_ion/echem.py +++ b/pybop/models/lithium_ion/echem.py @@ -1,4 +1,5 @@ import pybamm + from .echem_base import EChemBaseModel diff --git a/pybop/models/lithium_ion/echem_base.py b/pybop/models/lithium_ion/echem_base.py index 7e5c869f..c0922c0e 100644 --- a/pybop/models/lithium_ion/echem_base.py +++ b/pybop/models/lithium_ion/echem_base.py @@ -1,4 +1,5 @@ import warnings + from ..base_model import BaseModel diff --git a/pybop/observers/observer.py b/pybop/observers/observer.py index 0a93fe8a..a37542de 100644 --- a/pybop/observers/observer.py +++ b/pybop/observers/observer.py @@ -1,5 +1,7 @@ from typing import List, Optional + import numpy as np + from pybop._problem import BaseProblem from pybop.models.base_model import BaseModel, Inputs, TimeSeriesState from pybop.parameters.parameter import Parameter diff --git a/pybop/observers/unscented_kalman.py b/pybop/observers/unscented_kalman.py index ae13acc8..9d5bec40 100644 --- a/pybop/observers/unscented_kalman.py +++ b/pybop/observers/unscented_kalman.py @@ -1,7 +1,8 @@ from dataclasses import dataclass +from typing import List, Tuple, Union + import numpy as np import scipy.linalg as linalg -from typing import List, Tuple, Union from pybop.models.base_model import BaseModel, Inputs from pybop.observers.observer import Observer diff --git a/pybop/optimisers/pints_optimisers.py b/pybop/optimisers/pints_optimisers.py index 8b5a7c2c..1f8b2614 100644 --- a/pybop/optimisers/pints_optimisers.py +++ b/pybop/optimisers/pints_optimisers.py @@ -1,5 +1,5 @@ -import pints import numpy as np +import pints class GradientDescent(pints.GradientDescent): diff --git a/pybop/optimisers/scipy_optimisers.py b/pybop/optimisers/scipy_optimisers.py index 02621364..75dee708 100644 --- a/pybop/optimisers/scipy_optimisers.py +++ b/pybop/optimisers/scipy_optimisers.py @@ -1,6 +1,7 @@ -from scipy.optimize import minimize, differential_evolution -from .base_optimiser import BaseOptimiser import numpy as np +from scipy.optimize import differential_evolution, minimize + +from .base_optimiser import BaseOptimiser class SciPyMinimize(BaseOptimiser): diff --git a/pybop/parameters/parameter_set.py b/pybop/parameters/parameter_set.py index f0afdda4..4f704bf4 100644 --- a/pybop/parameters/parameter_set.py +++ b/pybop/parameters/parameter_set.py @@ -1,6 +1,8 @@ import json import types + import pybamm + import pybop diff --git a/pybop/parameters/priors.py b/pybop/parameters/priors.py index 2acbfc36..bdb64eb2 100644 --- a/pybop/parameters/priors.py +++ b/pybop/parameters/priors.py @@ -1,5 +1,5 @@ -import scipy.stats as stats import numpy as np +import scipy.stats as stats class Gaussian: diff --git a/pybop/plotting/plot_convergence.py b/pybop/plotting/plot_convergence.py index 2640a28d..cf51823a 100644 --- a/pybop/plotting/plot_convergence.py +++ b/pybop/plotting/plot_convergence.py @@ -1,6 +1,7 @@ -import pybop import numpy as np +import pybop + def plot_convergence( optim, xaxis_title="Iteration", yaxis_title="Cost", title="Convergence" diff --git a/pybop/plotting/plot_parameters.py b/pybop/plotting/plot_parameters.py index 84307a72..85b26152 100644 --- a/pybop/plotting/plot_parameters.py +++ b/pybop/plotting/plot_parameters.py @@ -1,6 +1,7 @@ -import pybop import math +import pybop + def plot_parameters( optim, xaxis_titles="Iteration", yaxis_titles=None, title="Convergence" diff --git a/pybop/plotting/plotly_manager.py b/pybop/plotting/plotly_manager.py index 44f551f5..f7a6a3d4 100644 --- a/pybop/plotting/plotly_manager.py +++ b/pybop/plotting/plotly_manager.py @@ -1,6 +1,6 @@ import subprocess -import webbrowser import sys +import webbrowser class PlotlyManager: diff --git a/pybop/plotting/quick_plot.py b/pybop/plotting/quick_plot.py index 56487a8c..f26fb889 100644 --- a/pybop/plotting/quick_plot.py +++ b/pybop/plotting/quick_plot.py @@ -1,5 +1,7 @@ -import numpy as np import textwrap + +import numpy as np + import pybop diff --git a/pyproject.toml b/pyproject.toml index 8f3a0375..fb0fc04d 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -62,6 +62,7 @@ extend-include = ["*.ipynb"] extend-exclude = ["__init__.py"] [tool.ruff.lint] +extend-select = ["I"] ignore = ["E501","E741"] [tool.ruff.lint.per-file-ignores] diff --git a/tests/docs/test_docs.py b/tests/docs/test_docs.py index 8dd52687..d5113d04 100644 --- a/tests/docs/test_docs.py +++ b/tests/docs/test_docs.py @@ -1,9 +1,10 @@ -import sys -import pytest import shutil import subprocess +import sys from pathlib import Path +import pytest + class TestDocs: """A class to test the PyBOP documentation.""" diff --git a/tests/examples/test_examples.py b/tests/examples/test_examples.py index ebc3570a..1c45be84 100644 --- a/tests/examples/test_examples.py +++ b/tests/examples/test_examples.py @@ -1,7 +1,9 @@ -import pybop -import pytest -import runpy import os +import runpy + +import pytest + +import pybop class TestExamples: diff --git a/tests/integration/test_model_experiment_changes.py b/tests/integration/test_model_experiment_changes.py index facac98e..8d648a84 100644 --- a/tests/integration/test_model_experiment_changes.py +++ b/tests/integration/test_model_experiment_changes.py @@ -1,6 +1,7 @@ -import pybop -import pytest import numpy as np +import pytest + +import pybop class TestModelAndExperimentChanges: diff --git a/tests/integration/test_parameterisations.py b/tests/integration/test_parameterisations.py index c4a1f8df..16180c3d 100644 --- a/tests/integration/test_parameterisations.py +++ b/tests/integration/test_parameterisations.py @@ -1,6 +1,7 @@ -import pybop -import pytest import numpy as np +import pytest + +import pybop class TestModelParameterisation: diff --git a/tests/plotting/test_plotly_manager.py b/tests/plotting/test_plotly_manager.py index 159d8f2e..cdd3e648 100644 --- a/tests/plotting/test_plotly_manager.py +++ b/tests/plotting/test_plotly_manager.py @@ -1,10 +1,12 @@ -from importlib.metadata import distributions -from distutils.spawn import find_executable -from pybop import PlotlyManager import subprocess +from distutils.spawn import find_executable +from importlib.metadata import distributions + import plotly import pytest +from pybop import PlotlyManager + # Find the Python executable python_executable = find_executable("python") diff --git a/tests/unit/test_cost.py b/tests/unit/test_cost.py index 49e3d4ee..b5a94f10 100644 --- a/tests/unit/test_cost.py +++ b/tests/unit/test_cost.py @@ -1,7 +1,9 @@ from __future__ import annotations + +import numpy as np import pytest + import pybop -import numpy as np class TestCosts: diff --git a/tests/unit/test_dataset.py b/tests/unit/test_dataset.py index 934e0f4a..f6607afc 100644 --- a/tests/unit/test_dataset.py +++ b/tests/unit/test_dataset.py @@ -1,6 +1,7 @@ +import numpy as np import pytest + import pybop -import numpy as np class TestDataset: diff --git a/tests/unit/test_experiment.py b/tests/unit/test_experiment.py index 0e8603c6..6d18ef50 100644 --- a/tests/unit/test_experiment.py +++ b/tests/unit/test_experiment.py @@ -1,6 +1,7 @@ +import pybamm import pytest + import pybop -import pybamm class TestExperiment: diff --git a/tests/unit/test_likelihoods.py b/tests/unit/test_likelihoods.py index 02db1e87..18422c6a 100644 --- a/tests/unit/test_likelihoods.py +++ b/tests/unit/test_likelihoods.py @@ -1,7 +1,9 @@ from __future__ import annotations + +import numpy as np import pytest + import pybop -import numpy as np class TestLikelihoods: diff --git a/tests/unit/test_models.py b/tests/unit/test_models.py index ce9be93e..965bd6ca 100644 --- a/tests/unit/test_models.py +++ b/tests/unit/test_models.py @@ -1,8 +1,8 @@ -import pybop -import pytest import numpy as np import pybamm +import pytest +import pybop from examples.standalone.model import ExponentialDecay diff --git a/tests/unit/test_observer_unscented_kalman.py b/tests/unit/test_observer_unscented_kalman.py index e89db15b..b886f61b 100644 --- a/tests/unit/test_observer_unscented_kalman.py +++ b/tests/unit/test_observer_unscented_kalman.py @@ -1,9 +1,10 @@ -import pybop import numpy as np import pybamm import pytest -from pybop.observers.unscented_kalman import SquareRootUKF + +import pybop from examples.standalone.model import ExponentialDecay +from pybop.observers.unscented_kalman import SquareRootUKF class TestUKF: diff --git a/tests/unit/test_observers.py b/tests/unit/test_observers.py index ab77428c..47f9a9f4 100644 --- a/tests/unit/test_observers.py +++ b/tests/unit/test_observers.py @@ -1,7 +1,8 @@ -import pybop import numpy as np import pybamm import pytest + +import pybop from examples.standalone.model import ExponentialDecay diff --git a/tests/unit/test_optimisation.py b/tests/unit/test_optimisation.py index e0c077c3..c687c7ff 100644 --- a/tests/unit/test_optimisation.py +++ b/tests/unit/test_optimisation.py @@ -1,7 +1,8 @@ -import pybop import numpy as np import pytest +import pybop + class TestOptimisation: """ diff --git a/tests/unit/test_parameter_sets.py b/tests/unit/test_parameter_sets.py index a7ac703c..931d391a 100644 --- a/tests/unit/test_parameter_sets.py +++ b/tests/unit/test_parameter_sets.py @@ -1,7 +1,8 @@ -import pybop import numpy as np import pytest +import pybop + class TestParameterSets: """ diff --git a/tests/unit/test_parameters.py b/tests/unit/test_parameters.py index 098ef2d3..2ec2fcd5 100644 --- a/tests/unit/test_parameters.py +++ b/tests/unit/test_parameters.py @@ -1,6 +1,7 @@ -import pybop import pytest +import pybop + class TestParameters: """ diff --git a/tests/unit/test_plots.py b/tests/unit/test_plots.py index 8dde39c5..7c59d755 100644 --- a/tests/unit/test_plots.py +++ b/tests/unit/test_plots.py @@ -1,7 +1,8 @@ -import pybop import numpy as np import pytest +import pybop + class TestPlots: """ diff --git a/tests/unit/test_priors.py b/tests/unit/test_priors.py index a4271e0b..4edaea58 100644 --- a/tests/unit/test_priors.py +++ b/tests/unit/test_priors.py @@ -1,7 +1,8 @@ -import pybop import numpy as np import pytest +import pybop + class TestPriors: """ diff --git a/tests/unit/test_problem.py b/tests/unit/test_problem.py index 94f1ff1a..4aed5b88 100644 --- a/tests/unit/test_problem.py +++ b/tests/unit/test_problem.py @@ -1,7 +1,8 @@ -import pybop import numpy as np import pytest +import pybop + class TestProblem: """ diff --git a/tests/unit/test_standalone.py b/tests/unit/test_standalone.py index 430dc925..4997012d 100644 --- a/tests/unit/test_standalone.py +++ b/tests/unit/test_standalone.py @@ -1,6 +1,7 @@ +import numpy as np import pytest + import pybop -import numpy as np from examples.standalone.cost import StandaloneCost from examples.standalone.problem import StandaloneProblem From 5f0df7625a36d7029196483f44ec103bc158ad21 Mon Sep 17 00:00:00 2001 From: Brady Planden Date: Wed, 20 Mar 2024 08:10:35 +0000 Subject: [PATCH 2/3] updt. changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index ecef1e33..180a9465 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ## Features +- [#245](https://github.com/pybop-team/PyBOP/pull/245) - Updates ruff config for import linting. - [#179](https://github.com/pybop-team/PyBOP/pull/203) - Adds `asv` configuration for benchmarking and initial benchmark suite. - [#218](https://github.com/pybop-team/PyBOP/pull/218) - Adds likelihood base class, `GaussianLogLikelihoodKnownSigma`, `GaussianLogLikelihood`, and `ProbabilityBased` cost function. As well as addition of a maximum likelihood estimation (MLE) example. - [#185](https://github.com/pybop-team/PyBOP/pull/185) - Adds a pull request template, additional nox sessions `quick` for standard tests + docs, `pre-commit` for pre-commit, `test` to run all standard tests, `doctest` for docs. From 80514d0655745edb3ad39f4ab195b5cb8212e56c Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Thu, 21 Mar 2024 14:42:55 +0000 Subject: [PATCH 3/3] style: pre-commit fixes --- pybop/_dataset.py | 2 +- pybop/_problem.py | 1 + pybop/plotting/plot2d.py | 4 +++- pybop/plotting/plot_dataset.py | 3 ++- pybop/plotting/plot_problem.py | 4 +++- 5 files changed, 10 insertions(+), 4 deletions(-) diff --git a/pybop/_dataset.py b/pybop/_dataset.py index a084063e..d05f6c6f 100644 --- a/pybop/_dataset.py +++ b/pybop/_dataset.py @@ -1,5 +1,5 @@ -import pybamm import numpy as np +import pybamm class Dataset: diff --git a/pybop/_problem.py b/pybop/_problem.py index 94d2d466..c0f9b00e 100644 --- a/pybop/_problem.py +++ b/pybop/_problem.py @@ -1,4 +1,5 @@ import numpy as np + import pybop diff --git a/pybop/plotting/plot2d.py b/pybop/plotting/plot2d.py index d03fcb59..34e75ddd 100644 --- a/pybop/plotting/plot2d.py +++ b/pybop/plotting/plot2d.py @@ -1,7 +1,9 @@ import sys -import pybop + import numpy as np +import pybop + def plot2d( cost_or_optim, gradient=False, bounds=None, steps=10, show=True, **layout_kwargs diff --git a/pybop/plotting/plot_dataset.py b/pybop/plotting/plot_dataset.py index 71282334..483d7035 100644 --- a/pybop/plotting/plot_dataset.py +++ b/pybop/plotting/plot_dataset.py @@ -1,6 +1,7 @@ -import pybop import sys +import pybop + def plot_dataset( dataset, signal=["Voltage [V]"], trace_names=None, show=True, **layout_kwargs diff --git a/pybop/plotting/plot_problem.py b/pybop/plotting/plot_problem.py index 67f63d75..45ff642d 100644 --- a/pybop/plotting/plot_problem.py +++ b/pybop/plotting/plot_problem.py @@ -1,7 +1,9 @@ import sys -import pybop + import numpy as np +import pybop + def quick_plot(problem, parameter_values=None, show=True, **layout_kwargs): """