Install cyipopt in 3.13 environment

optimagic-dev · Nov 12, 2024 · 8b2a284 · 8b2a284
1 parent 3ec4a32
commit 8b2a284
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 92 deletions.
diff --git 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
diff --git a/.tools/envs/testenv-others-py313.yml b/.tools/envs/testenv-others-py313.yml
diff --git 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()