Merge pull request #274 from mdekstrand/fix/toml-import

Fix flit-conda build (for now)
lenskit · Oct 19, 2021 · a311984 · a311984
2 parents 91060fc + 0aec03a
commit a311984
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/.github/workflows/test-suite.yml b/.github/workflows/test-suite.yml
@@ -42,7 +42,7 @@ jobs:
         shell: bash
         run: |
           conda clean -i
-          conda install -qy -c conda-forge flit packaging pyyaml
+          conda install -qy -c conda-forge flit packaging pyyaml tomli
           e_opts="-E ${{matrix.blas}}"
           if [ $RUNNER = Linux -a $PYVER = 3.8 ]; then
             echo "Using most extras"
@@ -121,7 +121,7 @@ jobs:
         shell: bash
         run: |
           conda clean -i
-          conda install -qy -c conda-forge flit packaging pyyaml
+          conda install -qy -c conda-forge flit packaging pyyaml tomli
           python build-tools/flit-conda.py -E tf --python-version $PYVER --save-env environment.yml
           cat environment.yml
         env:
@@ -176,7 +176,7 @@ jobs:
         shell: bash
         run: |
           conda clean -i
-          conda install -qy -c conda-forge flit-core packaging pyyaml
+          conda install -qy -c conda-forge flit-core packaging pyyaml tomli
           python build-tools/flit-conda.py -E demo -E mkl --python-version $PYVER --save-env environment.yml
           cat environment.yml
         env:

diff --git a/build-tools/flit-conda.py b/build-tools/flit-conda.py
@@ -9,7 +9,8 @@
 import subprocess
 from pathlib import Path
 import argparse
-from flit_core.config import read_flit_config, toml
+import tomli
+from flit_core.config import read_flit_config
 from packaging.requirements import Requirement
 from packaging.markers import default_environment
 
@@ -45,7 +46,7 @@ def parse_args():
 def load_project():
     tp = Path('pyproject.toml')
     fc = read_flit_config(tp)
-    pyp = toml.loads(tp.read_text())
+    pyp = tomli.loads(tp.read_text())
     return pyp, fc