From 6214fb2dcd6d12a0aef15fdb5bc0ab1ba5f02afe Mon Sep 17 00:00:00 2001
From: Michael Ekstrand <mdekstrand@drexel.edu>
Date: Wed, 31 Jul 2024 13:14:08 -0400
Subject: [PATCH] fix conda environment Python versions

---
 .github/workflows/test.yml | 12 ++++++------
 lkdev/workflows/test.py    |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index b6413561b..30eb6ce7d 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -52,7 +52,7 @@ jobs:
       - name: 👢 Generate Conda environment file
         run: |
           pip install -e .
-          python -m lkdev.conda -o ci-environment.yml -e all requirements-test.txt lenskit/pyproject.toml
+          python -m lkdev.conda -o ci-environment.yml -p ${{matrix.python}} -e all requirements-test.txt lenskit/pyproject.toml
       - id: setup
         name: 📦 Set up Conda environment
         uses: mamba-org/setup-micromamba@v1
@@ -273,7 +273,7 @@ jobs:
       - name: 👢 Generate Conda environment file
         run: |
           pip install -e .
-          python -m lkdev.conda -o ci-environment.yml -e all requirements-test.txt lenskit/pyproject.toml lenskit-funksvd/pyproject.toml
+          python -m lkdev.conda -o ci-environment.yml -p ${{matrix.python}} -e all requirements-test.txt lenskit/pyproject.toml lenskit-funksvd/pyproject.toml
       - id: setup
         name: 📦 Set up Conda environment
         uses: mamba-org/setup-micromamba@v1
@@ -381,7 +381,7 @@ jobs:
       - name: 👢 Generate Conda environment file
         run: |
           pip install -e .
-          python -m lkdev.conda -o ci-environment.yml -e all requirements-test.txt lenskit/pyproject.toml lenskit-implicit/pyproject.toml
+          python -m lkdev.conda -o ci-environment.yml -p ${{matrix.python}} -e all requirements-test.txt lenskit/pyproject.toml lenskit-implicit/pyproject.toml
       - id: setup
         name: 📦 Set up Conda environment
         uses: mamba-org/setup-micromamba@v1
@@ -489,7 +489,7 @@ jobs:
       - name: 👢 Generate Conda environment file
         run: |
           pip install -e .
-          python -m lkdev.conda -o ci-environment.yml -e all requirements-test.txt lenskit/pyproject.toml lenskit-hpf/pyproject.toml
+          python -m lkdev.conda -o ci-environment.yml -p ${{matrix.python}} -e all requirements-test.txt lenskit/pyproject.toml lenskit-hpf/pyproject.toml
       - id: setup
         name: 📦 Set up Conda environment
         uses: mamba-org/setup-micromamba@v1
@@ -539,7 +539,7 @@ jobs:
       - name: 👢 Generate Conda environment file
         run: |
           pip install -e .
-          python -m lkdev.conda -o ci-environment.yml -e all requirements-test.txt lenskit/pyproject.toml lenskit-funksvd/pyproject.toml lenskit-implicit/pyproject.toml
+          python -m lkdev.conda -o ci-environment.yml -p 3.10 -e all requirements-test.txt lenskit/pyproject.toml lenskit-funksvd/pyproject.toml lenskit-implicit/pyproject.toml
       - id: setup
         name: 📦 Set up Conda environment
         uses: mamba-org/setup-micromamba@v1
@@ -596,7 +596,7 @@ jobs:
       - name: 👢 Generate Conda environment file
         run: |
           pip install -e .
-          python -m lkdev.conda -o ci-environment.yml -e all requirements-test.txt requirements-demo.txt lenskit/pyproject.toml lenskit-funksvd/pyproject.toml lenskit-implicit/pyproject.toml
+          python -m lkdev.conda -o ci-environment.yml -p 3.10 -e all requirements-test.txt requirements-demo.txt lenskit/pyproject.toml lenskit-funksvd/pyproject.toml lenskit-implicit/pyproject.toml
       - id: setup
         name: 📦 Set up Conda environment
         uses: mamba-org/setup-micromamba@v1
diff --git a/lkdev/workflows/test.py b/lkdev/workflows/test.py
index 672bd1cb7..51a45a51d 100644
--- a/lkdev/workflows/test.py
+++ b/lkdev/workflows/test.py
@@ -112,7 +112,7 @@ def job_strategy(options: JobOptions) -> dict[str, Any]:
 
 
 def steps_setup_conda(options: JobOptions) -> list[GHStep]:
-    ctool = ["python -m lkdev.conda", "-o", "ci-environment.yml"]
+    ctool = ["python -m lkdev.conda", "-o", "ci-environment.yml", "-p", options.python_version]
     if options.extras:
         for e in options.extras:
             ctool += ["-e", e]