Merge pull request #3 from lenskit/tweak/lkbuild

Use common LK Build tools for building
lenskit · Dec 8, 2022 · 41ce63c · 41ce63c
2 parents 6e461ba + caea768
commit 41ce63c
Show file tree

Hide file tree

Showing 15 changed files with 11 additions and 271 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -28,16 +28,11 @@ jobs:
         fetch-depth: 0
         submodules: true
 
-    - name: Set up Python
-      uses: actions/setup-python@v2
+    - name: Set up Python and environment
+      uses: lenskit/lkbuild/actions/setup-vanilla-env@main
       with:
         python-version: ${{matrix.python}}
 
-    - name: Install Python deps
-      run: |
-        pip install -U flit
-        flit install --pth-file
-
     - name: 🔎 Inspect environment
       run: |
         numba -s

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
@@ -36,14 +36,17 @@ test = [
     "pytest-doctestplus >= 0.9",
 ]
 dev = [
+    "lenskit-build-helpers >=0.1",
     "flit >= 3",
-    "packaging >= 20",
     "flake8 >= 3",
     "coverage >= 5",
     "pytest-cov >= 2.12",
 ]
 doc = [
-    "lenskit[doc]"
+    "sphinx >= 4.2",
+    "sphinxcontrib-bibtex >= 2.0",
+    "sphinx_rtd_theme >= 0.5",
+    "myst-nb >= 0.13",
 ]
 
 [tool.flit.module]
@@ -61,4 +64,7 @@ exclude = [
 ]
 
 [tool.conda-lock]
-channels = ["conda-forge"]
+channels = [
+    "conda-forge",
+    "lenskit",
+]