Skip to content

Commit

Permalink
Merge pull request #311 from mdekstrand/tweak/new-conda-lock
Browse files Browse the repository at this point in the history
Update build environment and deps
  • Loading branch information
mdekstrand committed Mar 11, 2022
2 parents 536ecfd + 5c91b50 commit 0716300
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
4 changes: 3 additions & 1 deletion docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
# ones.
extensions = [
'nbsphinx',
'myst_nb',
'sphinx.ext.napoleon',
'sphinx.ext.autodoc',
'sphinx.ext.autosummary',
Expand Down Expand Up @@ -204,6 +204,8 @@

bibtex_bibfiles = ['lenskit.bib']

jupyter_execute_notebooks = 'off'

# -- Module Canonicalization ------------------------------------------------

# cleanups = {
Expand Down
2 changes: 1 addition & 1 deletion lkbuild/boot-env.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@ dependencies:
- invoke=1
- requests=2
- pip
- conda-lock
- conda-lock=1
- mamba
3 changes: 2 additions & 1 deletion lkbuild/tasks.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
BIBTEX_URL = 'https://paperpile.com/eb/YdOlWmnlit'
BIBTEX_FILE = Path('docs/lenskit.bib')


@task(iterable=['extras', 'mixins'])
def dev_lock(c, platform=None, extras=None, version=None, blas=None, mixins=None, env_file=False):
"Create a development lockfile"
Expand All @@ -30,7 +31,7 @@ def dev_lock(c, platform=None, extras=None, version=None, blas=None, mixins=None
else:
plat_opt = f'-p {plat}'

cmd = f'conda-lock lock --mamba {plat_opt} -f pyproject.toml'
cmd = f'conda-lock lock --mamba {plat_opt} -k explicit --dev-dependencies -f pyproject.toml'
if env_file:
cmd += ' -k env'

Expand Down
5 changes: 1 addition & 4 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -62,17 +62,14 @@ doc = [
"sphinx >= 4.2",
"sphinxcontrib-bibtex >= 2.0",
"sphinx_rtd_theme >= 0.5",
"nbsphinx >= 0.8",
"myst-nb >= 0.13",
]
demo = [
"notebook >= 6",
"nbval >= 0.9",
"matplotlib ~= 3.4",
]
sklearn = ["scikit-learn >= 0.22"]
tf = ["lenskit-tf"]
hpf = ["lenskit-hpf"]
implicit = ["lenskit-implicit"]

[tool.flit.sdist]
exclude = [
Expand Down

0 comments on commit 0716300

Please sign in to comment.