Merge pull request #4 from lenskit/tweak/lkbuild

Use lenskit-build-helpers for build
lenskit · Jul 23, 2022 · 4b27cd5 · 4b27cd5
2 parents 213e041 + 04d4d48
commit 4b27cd5
Show file tree

Hide file tree

Showing 16 changed files with 15 additions and 280 deletions.
diff --git a/.github/workflows/test-suite.yml b/.github/workflows/test-suite.yml
@@ -31,20 +31,12 @@ 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}}
+        conda-type: micromamba
 
     - name: 🔎 Inspect environment
       run: |
@@ -81,7 +73,6 @@ jobs:
     - name: Install Python deps
       run: |
         pip install -U flit
-        flit install --deps=production --extras=dev
 
     - name: Build distribution
       run: flit build

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.*",
     "implicit ==0.4.*"
 ]
 dynamic = ["description", "version"]
@@ -35,13 +35,18 @@ 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",
 ]
+doc = [
+    "sphinx >= 4.2",
+    "sphinxcontrib-bibtex >= 2.0",
+    "sphinx_rtd_theme >= 0.5",
+    "myst-nb >= 0.13",
+]
 
 [tool.flit.module]
 name = "lenskit_implicit"
@@ -59,5 +64,6 @@ exclude = [
 
 [tool.conda-lock]
 channels = [
-    "conda-forge"
+    "conda-forge",
+    "lenskit",
 ]
diff --git a/tasks.py b/tasks.py