Skip to content

Commit

Permalink
Merge pull request #315 from mdekstrand/tweak/external-lkbuild
Browse files Browse the repository at this point in the history
Use lenskit-build-helpers instead of local tasks
  • Loading branch information
mdekstrand committed Jul 27, 2022
2 parents 428bae7 + b7b222f commit ca4fba0
Show file tree
Hide file tree
Showing 16 changed files with 27 additions and 327 deletions.
74 changes: 17 additions & 57 deletions .github/workflows/test-suite.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,32 +35,12 @@ jobs:
with:
fetch-depth: 0

- name: Prepare Windows environment
if: runner.os == 'Windows'
shell: pwsh
run: |
choco install wget --no-progress
- name: Prepare Conda environment spec
id: conda-lock
shell: bash
run: |
e_opt=""
if [ $RUNNER = Linux -a $PYVER = 3.8 ]; then
echo "Using most extras"
# we'll test tensorflow in a separate run
e_opt="-e sklearn"
fi
bash lkbuild/lock-for-ci.sh -v $PYVER $e_opt
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: lktest
environment-file: ${{steps.conda-lock.outputs.environment-file}}
extras: sklearn
python-version: ${{matrix.python}}

- name: Inspect environment
run: |
Expand Down Expand Up @@ -106,18 +86,12 @@ jobs:
with:
fetch-depth: 0

- name: Prepare Conda environment
id: conda-lock
run: |
bash lkbuild/lock-for-ci.sh -v $PYVER -e demo
env:
PYVER: '3.8'

- 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: lktest
environment-file: ${{steps.conda-lock.outputs.environment-file}}
python-version: '3.8'
extras: demo

- name: Inspect Conda environment
run: |
Expand All @@ -126,21 +100,20 @@ jobs:
echo "Conda environment package list"
conda list
- name: Cache ML data
uses: actions/cache@v2
with:
path: |
data
!data/*.zip
key: test-mldata-${{ hashFiles('lkbuild/datasets.py') }}
key: test-mldata-000

- name: Download ML Data
run: |
invoke fetch-data -d ml-100k
invoke fetch-data -d ml-1m
invoke fetch-data -d ml-10m
invoke fetch-data -d ml-20m
lkbuild fetch-data -d ml-100k
lkbuild fetch-data -d ml-1m
lkbuild fetch-data -d ml-10m
lkbuild fetch-data -d ml-20m
- name: Install for Testing
run: |
Expand Down Expand Up @@ -192,23 +165,10 @@ jobs:
with:
fetch-depth: 0

- name: Set up Python
uses: actions/setup-python@v1
- name: Set up Python and environment
uses: lenskit/lkbuild/actions/setup-vanilla-env@main
with:
python-version: ${{matrix.python}}
architecture: x64

- name: Set up Python buil deps
env:
PIP_PREFER_BINARY: 'true'
run: |
python -m pip install -U flit wheel
- name: Install LensKit adnd eps
env:
PIP_PREFER_BINARY: 'true'
run: |
python -m pip install .[test,dev]

- name: Run tests
run: |
Expand Down
Empty file removed lkbuild/__init__.py
Empty file.
11 changes: 0 additions & 11 deletions lkbuild/boot-env.yml

This file was deleted.

60 changes: 0 additions & 60 deletions lkbuild/bootstrap-env.sh

This file was deleted.

33 changes: 0 additions & 33 deletions lkbuild/datasets.py

This file was deleted.

22 changes: 0 additions & 22 deletions lkbuild/env.py

This file was deleted.

10 changes: 0 additions & 10 deletions lkbuild/lock-for-ci.sh

This file was deleted.

4 changes: 0 additions & 4 deletions lkbuild/mkl-spec.yml

This file was deleted.

3 changes: 0 additions & 3 deletions lkbuild/openblas-spec.yml

This file was deleted.

3 changes: 0 additions & 3 deletions lkbuild/python-3.10-spec.yml

This file was deleted.

3 changes: 0 additions & 3 deletions lkbuild/python-3.7-spec.yml

This file was deleted.

3 changes: 0 additions & 3 deletions lkbuild/python-3.8-spec.yml

This file was deleted.

3 changes: 0 additions & 3 deletions lkbuild/python-3.9-spec.yml

This file was deleted.

107 changes: 0 additions & 107 deletions lkbuild/tasks.py

This file was deleted.

0 comments on commit ca4fba0

Please sign in to comment.