From c2b78b82e6ed3ecaa834757129e2c9b73090a6ae Mon Sep 17 00:00:00 2001 From: Janos Gabler Date: Thu, 28 Dec 2023 13:05:52 +0100 Subject: [PATCH 1/2] Pin cyipopt in dev environment. --- environment.yml | 2 +- src/estimagic/optimization/tranquilo.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/environment.yml b/environment.yml index f326dc071..4506cb1dd 100644 --- a/environment.yml +++ b/environment.yml @@ -5,7 +5,7 @@ channels: - nodefaults dependencies: - python=3.10 # dev - - cyipopt # dev + - cyipopt<=1.2.0 # dev - jupyterlab # dev, docs - nb_black # dev, docs - nlopt # dev, tests diff --git a/src/estimagic/optimization/tranquilo.py b/src/estimagic/optimization/tranquilo.py index 4c989fb66..6574d936c 100644 --- a/src/estimagic/optimization/tranquilo.py +++ b/src/estimagic/optimization/tranquilo.py @@ -6,7 +6,7 @@ from functools import partial from estimagic.decorators import mark_minimizer - tranquilo_scalar = mark_minimizer( + tranquilo = mark_minimizer( func=partial(_tranquilo, functype="scalar"), name="tranquilo", primary_criterion_entry="value", @@ -24,6 +24,6 @@ is_global=False, ) - __all__ = ["tranquilo_scalar", "tranquilo_ls"] + __all__ = ["tranquilo", "tranquilo_ls"] else: __all__ = [] From 8aa914f7c6eadb3c1c2d99911216c74776930b2e Mon Sep 17 00:00:00 2001 From: Janos Gabler Date: Thu, 28 Dec 2023 13:26:53 +0100 Subject: [PATCH 2/2] Fix? --- .envs/testenv-others.yml | 2 +- .envs/update_envs.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.envs/testenv-others.yml b/.envs/testenv-others.yml index 33093b602..b2c78c5c0 100644 --- a/.envs/testenv-others.yml +++ b/.envs/testenv-others.yml @@ -4,7 +4,7 @@ channels: - conda-forge - nodefaults dependencies: - - cyipopt + - cyipopt<=1.2.0 - nlopt # dev, tests - pip # dev, tests, docs - pytest # dev, tests diff --git a/.envs/update_envs.py b/.envs/update_envs.py index efa8adf13..2d9a3bf07 100644 --- a/.envs/update_envs.py +++ b/.envs/update_envs.py @@ -32,7 +32,7 @@ def main(): ## test environment others test_env_others = deepcopy(test_env) - test_env_others.insert(_insert_idx, " - cyipopt") + test_env_others.insert(_insert_idx, " - cyipopt<=1.2.0") # create docs testing environment