From 79725baf5860a55fa4a3046efcaefc2d0e5037f8 Mon Sep 17 00:00:00 2001 From: Janos Gabler Date: Sat, 20 May 2023 13:14:17 +0200 Subject: [PATCH] Fix? --- .pre-commit-config.yaml | 10 +--------- src/estimagic/optimization/algo_options.py | 1 + tests/optimization/test_optimize.py | 6 +++--- 3 files changed, 5 insertions(+), 12 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index ff8fd69bc..ec042684b 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -77,19 +77,11 @@ repos: - --wrap-descriptions - '88' - --blank + exclude: src/estimagic/optimization/algo_options.py - repo: https://github.com/charliermarsh/ruff-pre-commit rev: v0.0.263 hooks: - id: ruff - # args: - # - --verbose - # - repo: https://github.com/kynan/nbstripout - # rev: 0.6.1 - # hooks: - # - id: nbstripout - # args: - # - --extra-keys - # - metadata.kernelspec metadata.language_info.version metadata.vscode - repo: https://github.com/nbQA-dev/nbQA rev: 1.7.0 hooks: diff --git a/src/estimagic/optimization/algo_options.py b/src/estimagic/optimization/algo_options.py index f85e84ccb..74085912a 100644 --- a/src/estimagic/optimization/algo_options.py +++ b/src/estimagic/optimization/algo_options.py @@ -1,4 +1,5 @@ import numpy as np + """ The order is the following: diff --git a/tests/optimization/test_optimize.py b/tests/optimization/test_optimize.py index 7bd92d717..f0934ae2e 100644 --- a/tests/optimization/test_optimize.py +++ b/tests/optimization/test_optimize.py @@ -3,7 +3,7 @@ import pandas as pd import pytest from estimagic.examples.criterion_functions import sos_scalar_criterion -from estimagic.exceptions import InvalidKwargsError +from estimagic.exceptions import InvalidKwargsError, InvalidFunctionError from estimagic.optimization.optimize import maximize, minimize @@ -23,9 +23,9 @@ def test_scipy_lbfgsb_actually_calls_criterion_and_derivative(): params = pd.DataFrame(data=np.ones((10, 1)), columns=["value"]) def raising_crit_and_deriv(params): # noqa: ARG001 - raise Exception() + raise NotImplementedError("This should not be called.") - with pytest.raises(Exception): + with pytest.raises(InvalidFunctionError, match="Error while evaluating"): minimize( criterion=sos_scalar_criterion, params=params,