From 3e860e9ef4605ab0dfd2de2dc0e83b2b1c110f89 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 9 Dec 2024 22:20:20 +0000 Subject: [PATCH 1/2] [pre-commit.ci] pre-commit autoupdate MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit updates: - [github.com/pre-commit/pre-commit-hooks: v4.6.0 → v5.0.0](https://github.com/pre-commit/pre-commit-hooks/compare/v4.6.0...v5.0.0) - [github.com/astral-sh/ruff-pre-commit: v0.4.8 → v0.8.2](https://github.com/astral-sh/ruff-pre-commit/compare/v0.4.8...v0.8.2) --- .pre-commit-config.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index cc105d1..5a20436 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,6 +1,6 @@ repos: - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v4.6.0 + rev: v5.0.0 hooks: - id: check-added-large-files args: [--maxkb=8192] @@ -11,7 +11,7 @@ repos: - id: end-of-file-fixer - id: trailing-whitespace - repo: https://github.com/astral-sh/ruff-pre-commit - rev: v0.4.8 + rev: v0.8.2 hooks: - id: ruff args: [--fix, --exit-non-zero-on-fix] From beec24d96cd382b4dcb0ebc35e93fec5b88ff6a6 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 9 Dec 2024 22:20:52 +0000 Subject: [PATCH 2/2] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- tests/test_integration.py | 1 + tests/test_normalization.py | 1 + tests/test_plan.py | 1 + tests/test_plots.py | 1 + tests/test_ub.py | 3 ++- tests/test_workflow.py | 3 ++- 6 files changed, 8 insertions(+), 2 deletions(-) diff --git a/tests/test_integration.py b/tests/test_integration.py index 304525c..c366369 100644 --- a/tests/test_integration.py +++ b/tests/test_integration.py @@ -3,6 +3,7 @@ import numpy as np import pytest + from garnet.reduction.integration import PeakEllipsoid, PeakSphere from garnet.reduction.plan import ReductionPlan diff --git a/tests/test_normalization.py b/tests/test_normalization.py index c133705..1376ff8 100644 --- a/tests/test_normalization.py +++ b/tests/test_normalization.py @@ -2,6 +2,7 @@ import subprocess import pytest + from garnet.reduction.normalization import Normalization from garnet.reduction.plan import ReductionPlan diff --git a/tests/test_plan.py b/tests/test_plan.py index 3782544..8ece664 100644 --- a/tests/test_plan.py +++ b/tests/test_plan.py @@ -1,6 +1,7 @@ import os import pytest + from garnet.reduction.integration import Integration from garnet.reduction.normalization import Normalization from garnet.reduction.plan import ReductionPlan diff --git a/tests/test_plots.py b/tests/test_plots.py index f90edc2..8ea59e4 100644 --- a/tests/test_plots.py +++ b/tests/test_plots.py @@ -3,6 +3,7 @@ import numpy as np import scipy.linalg import scipy.spatial + from garnet.plots.peaks import PeakPlot, RadiusPlot from garnet.plots.volume import SlicePlot from garnet.reduction.integration import PeakEllipsoid, PeakSphere diff --git a/tests/test_ub.py b/tests/test_ub.py index 937123e..2853c30 100644 --- a/tests/test_ub.py +++ b/tests/test_ub.py @@ -1,7 +1,8 @@ import numpy as np -from garnet.reduction.ub import Optimization from mantid.simpleapi import AddPeakHKL, CreatePeaksWorkspace, SetUB +from garnet.reduction.ub import Optimization + def create_peaks(name, a, b, c, alpha, beta, gamma): CreatePeaksWorkspace(NumberOfPeaks=0, OutputType="LeanElasticPeak", OutputWorkspace=name) diff --git a/tests/test_workflow.py b/tests/test_workflow.py index 9dd0231..d76f8a0 100644 --- a/tests/test_workflow.py +++ b/tests/test_workflow.py @@ -2,8 +2,9 @@ import subprocess import sys -import garnet.workflow import pytest + +import garnet.workflow from garnet.workflow import main as main