From 8b2a2849d8bc28c3eedb2f1ca4cdfeee0abfe0dd Mon Sep 17 00:00:00 2001
From: Tim Mensinger <mensingertim@gmail.com>
Date: Tue, 12 Nov 2024 10:48:22 +0100
Subject: [PATCH] Install cyipopt in 3.13 environment

---
 .github/workflows/main.yml           |  4 +--
 .tools/envs/testenv-linux-py313.yml  | 40 ----------------------------
 .tools/envs/testenv-others-py313.yml | 38 --------------------------
 .tools/update_envs.py                | 13 +--------
 4 files changed, 3 insertions(+), 92 deletions(-)
 delete mode 100644 .tools/envs/testenv-linux-py313.yml
 delete mode 100644 .tools/envs/testenv-others-py313.yml

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 9309acf09..d74e9eeda 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -30,7 +30,7 @@ jobs:
       - name: create build environment
         uses: mamba-org/setup-micromamba@v1
         with:
-          environment-file: ${{ matrix.python-version == '3.13' && './.tools/envs/testenv-linux-py313.yml' || './.tools/envs/testenv-linux.yml' }}  # yamllint disable-line rule:line-length
+          environment-file: ./.tools/envs/testenv-linux.yml
           cache-environment: true
           create-args: |
             python=${{ matrix.python-version }}
@@ -64,7 +64,7 @@ jobs:
         uses: mamba-org/setup-micromamba@v1
         with:
           micromamba-version: 1.5.6-0
-          environment-file: ${{ matrix.python-version == '3.13' && './.tools/envs/testenv-others-py313.yml' || './.tools/envs/testenv-others.yml' }}  # yamllint disable-line rule:line-length
+          environment-file: ./.tools/envs/testenv-others.yml
           cache-environment: true
           create-args: |
             python=${{ matrix.python-version }}
diff --git a/.tools/envs/testenv-linux-py313.yml b/.tools/envs/testenv-linux-py313.yml
deleted file mode 100644
index 728ae6766..000000000
--- a/.tools/envs/testenv-linux-py313.yml
+++ /dev/null
@@ -1,40 +0,0 @@
----
-name: optimagic
-channels:
-  - conda-forge
-  - nodefaults
-dependencies:
-  - petsc4py
-  - jax
-  - pygmo>=2.19.0  # dev, tests
-  - nlopt  # dev, tests, docs
-  - pip  # dev, tests, docs
-  - pytest  # dev, tests
-  - pytest-cov  # tests
-  - pytest-xdist  # dev, tests
-  - statsmodels  # dev, tests
-  - cloudpickle  # run, tests
-  - joblib  # run, tests
-  - numpy >= 2  # run, tests
-  - pandas  # run, tests
-  - plotly  # run, tests
-  - pybaum>=0.1.2  # run, tests
-  - scipy>=1.2.1  # run, tests
-  - sqlalchemy  # run, tests
-  - seaborn  # dev, tests
-  - mypy=1.13  # dev, tests
-  - pyyaml  # dev, tests
-  - jinja2  # dev, tests
-  - annotated-types  # dev, tests
-  - pip:  # dev, tests, docs
-      - DFO-LS>=1.5.3  # dev, tests
-      - Py-BOBYQA  # dev, tests
-      - fides==0.7.4  # dev, tests
-      - kaleido  # dev, tests
-      - pandas-stubs  # dev, tests
-      - types-cffi  # dev, tests
-      - types-openpyxl  # dev, tests
-      - types-jinja2  # dev, tests
-      - sqlalchemy-stubs  # dev, tests
-      - sphinxcontrib-mermaid  # dev, tests, docs
-      - -e ../../
diff --git a/.tools/envs/testenv-others-py313.yml b/.tools/envs/testenv-others-py313.yml
deleted file mode 100644
index ca226175d..000000000
--- a/.tools/envs/testenv-others-py313.yml
+++ /dev/null
@@ -1,38 +0,0 @@
----
-name: optimagic
-channels:
-  - conda-forge
-  - nodefaults
-dependencies:
-  - pygmo>=2.19.0  # dev, tests
-  - nlopt  # dev, tests, docs
-  - pip  # dev, tests, docs
-  - pytest  # dev, tests
-  - pytest-cov  # tests
-  - pytest-xdist  # dev, tests
-  - statsmodels  # dev, tests
-  - cloudpickle  # run, tests
-  - joblib  # run, tests
-  - numpy >= 2  # run, tests
-  - pandas  # run, tests
-  - plotly  # run, tests
-  - pybaum>=0.1.2  # run, tests
-  - scipy>=1.2.1  # run, tests
-  - sqlalchemy  # run, tests
-  - seaborn  # dev, tests
-  - mypy=1.13  # dev, tests
-  - pyyaml  # dev, tests
-  - jinja2  # dev, tests
-  - annotated-types  # dev, tests
-  - pip:  # dev, tests, docs
-      - DFO-LS>=1.5.3  # dev, tests
-      - Py-BOBYQA  # dev, tests
-      - fides==0.7.4  # dev, tests
-      - kaleido  # dev, tests
-      - pandas-stubs  # dev, tests
-      - types-cffi  # dev, tests
-      - types-openpyxl  # dev, tests
-      - types-jinja2  # dev, tests
-      - sqlalchemy-stubs  # dev, tests
-      - sphinxcontrib-mermaid  # dev, tests, docs
-      - -e ../../
diff --git a/.tools/update_envs.py b/.tools/update_envs.py
index ec833d8c4..11d54d3ad 100644
--- a/.tools/update_envs.py
+++ b/.tools/update_envs.py
@@ -50,7 +50,7 @@ def main() -> None:
     docs_env = [line for line in lines if _keep_line(line, "docs")]
     docs_env.append("      - -e ../../")  # add local installation
 
-    # write environments for python < 3.13
+    # write environments
     for name, env in zip(
         ["linux", "others", "pandas", "numpy"],
         [test_env_linux, test_env_others, test_env_pandas, test_env_numpy],
@@ -62,17 +62,6 @@ def main() -> None:
             "\n".join(env) + "\n", newline="\n"
         )
 
-    # write environments for python = 3.13
-    for name, env in zip(
-        ["linux", "others"], [test_env_linux, test_env_others], strict=False
-    ):
-        # Remove cyipopt from the environment
-        env_without_cyipopt = [line for line in env if "cyipopt" not in line]
-        # Write the environment to file
-        Path(f".tools/envs/testenv-{name}-py313.yml").write_text(
-            "\n".join(env_without_cyipopt) + "\n", newline="\n"
-        )
-
 
 if __name__ == "__main__":
     main()