Merge pull request #3 from lenskit/tweak/lkbuild

Use LensKit build helpers (#2)
lenskit · Aug 18, 2022 · c66b8ca · c66b8ca
2 parents 7f1366b + 23c9eec
commit c66b8ca
Show file tree

Hide file tree

Showing 16 changed files with 10 additions and 286 deletions.
diff --git a/.github/workflows/test-suite.yml b/.github/workflows/test-suite.yml
@@ -31,20 +31,11 @@ jobs:
         fetch-depth: 0
         submodules: true
 
-    - name: Prepare Conda environment spec
-      id: conda-lock
-      shell: bash
-      run: |
-        bash lkbuild/lock-for-ci.sh -v $PYVER
-      env:
-        RUNNER: ${{runner.os}}
-        PYVER: ${{matrix.python}}
-
-    - name: Initialize Conda
-      uses: conda-incubator/setup-miniconda@v2
+    - name: 👢 Set up Conda environment
+      uses: lenskit/lkbuild/actions/setup-conda-env@main
+      id: setup
       with:
-        activate-environment: lkpy
-        environment-file: ${{steps.conda-lock.outputs.environment-file}}
+        python-version: ${{matrix.python}}
 
     - name: 🔎 Inspect environment
       run: |

diff --git a/lkbuild/__init__.py b/lkbuild/__init__.py
diff --git a/lkbuild/boot-env.yml b/lkbuild/boot-env.yml
diff --git a/lkbuild/bootstrap-env.sh b/lkbuild/bootstrap-env.sh
diff --git a/lkbuild/datasets.py b/lkbuild/datasets.py
diff --git a/lkbuild/env.py b/lkbuild/env.py
diff --git a/lkbuild/lock-for-ci.sh b/lkbuild/lock-for-ci.sh
diff --git a/lkbuild/mkl-spec.yml b/lkbuild/mkl-spec.yml
diff --git a/lkbuild/openblas-spec.yml b/lkbuild/openblas-spec.yml
diff --git a/lkbuild/python-3.10-spec.yml b/lkbuild/python-3.10-spec.yml
diff --git a/lkbuild/python-3.7-spec.yml b/lkbuild/python-3.7-spec.yml
diff --git a/lkbuild/python-3.8-spec.yml b/lkbuild/python-3.8-spec.yml
diff --git a/lkbuild/python-3.9-spec.yml b/lkbuild/python-3.9-spec.yml
diff --git a/lkbuild/tasks.py b/lkbuild/tasks.py
diff --git a/pyproject.toml b/pyproject.toml
@@ -20,7 +20,7 @@ readme = "README.md"
 license = { file="LICENSE.md" }
 requires-python = ">= 3.7"
 dependencies = [
-    "lenskit[doc] @ git+https://github.com/lenskit/lkpy.git#main",
+    "lenskit ==0.14.*",
     "tensorflow >=2,<2.6"
 ]
 dynamic = ["description", "version"]
@@ -35,9 +35,8 @@ test = [
     "pytest-doctestplus >= 0.9",
 ]
 dev = [
+    "lenskit-build-helpers >=0.1",
     "flit >= 3.2",
-    "conda-lock",
-    "invoke",
     "flake8 >= 3",
     "coverage >= 5",
     "pytest-cov >= 2.12",
@@ -59,5 +58,6 @@ exclude = [
 
 [tool.conda-lock]
 channels = [
-    "conda-forge"
+    "conda-forge",
+    "lenskit",
 ]
diff --git a/tests/test_tensorflow.py b/tests/test_tensorflow.py
@@ -8,14 +8,8 @@
 import lenskit.util.test as lktu
 from lenskit.algorithms import Recommender
 
-from lenskit.algorithms import tf as lktf
-try:
-    import tensorflow as tf
-except ImportError:
-    pytestmark = mark.skip('cannot import tensorflow')
-
-if not lktf.TF_AVAILABLE:
-    pytestmark = mark.skip('tensorflow not available')
+import lenskit_tf as lktf
+import tensorflow as tf
 
 _log = logging.getLogger(__name__)