Merge pull request #294 from mdekstrand/tweak/conda-py310

Test Python 3.10 on Conda

mkl-spec.yml

@@ -1,4 +1,4 @@
 # environment mini-spec for ensuring MKL
 dependencies:
   - libblas=*=*mkl
-  - mkl=2020
+  - tbb

tasks.py

@@ -18,9 +18,8 @@
 BIBTEX_URL = 'https://paperpile.com/eb/YdOlWmnlit'
 BIBTEX_FILE = Path('docs/lenskit.bib')
 
-
-@task(iterable=['extras'])
-def dev_lock(c, platform=None, extras=None, version=None, blas=None, env_file=False):
+@task(iterable=['extras', 'mixins'])
+def dev_lock(c, platform=None, extras=None, version=None, blas=None, mixins=None, env_file=False):
     "Create a development lockfile"
     plat = env.conda_platform()
 
@@ -39,6 +38,8 @@ def dev_lock(c, platform=None, extras=None, version=None, blas=None, env_file=Fa
         cmd += f' -f lkbuild/python-{version}-spec.yml'
     if blas:
         cmd += f' -f lkbuild/{blas}-spec.yml'
+    for m in mixins:
+        cmd += f' -f {m}'
     for e in extras:
         cmd += f' -e {e}'