Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,12 @@ Read the tutorial [here](https://ws3.readthedocs.io/en/latest/index.html).

We recommend installing `ws3` package into a Python venv (virtual environment) to minimize interactions with system-level packages.

Optional CBM support available via `pip install libcbm`.

Optional Gurobi support available via `pip install ws3[gurobi]` or `conda install -c gurobi gurobi`.

Optional PuLP support available via `pip install pulp`.

In [**000_venv_python_kernel_setup.ipynb**](https://github.com/UBC-FRESH/ws3/blob/dev/examples/000_venv_python_kernel_setup.ipynb) we provide the instructions for how to set up a new venv-sandboxed Python kernel and make it available in your JupyterLab environment, assuming that you are running this notebook in a standard linux-based environment and a regular (non-root) using running commands in a bash terminal.

## Modules
Expand Down
10 changes: 6 additions & 4 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,8 @@ dependencies = [
"rasterio",
"fiona",
"profilehooks",
"libcbm",
"pulp",
"dill",
"highspy",
"gurobipy"
"highspy"
]
authors = [
{name = "Gregory Paradis", email = "gregory.paradis@ubc.ca"}
Expand All @@ -32,6 +29,11 @@ maintainers = [
{name = "Salar Ghotb", email = "salar.ghotb@ubc.ca"}
]

[project.optional-dependencies]
cbm = ["libcbm"] # pip users can `pip install ws3[cbm]`
gurobi = ["gurobipy"]
pulp = ["pulp"]

[tool.hatch.version]
source = "code"
path = "ws3/__init__.py"
Expand Down
2 changes: 2 additions & 0 deletions requirements-dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -23,3 +23,5 @@ sphinx_rtd_theme
nbsphinx
# furo

# libcbm (to run some of the example notebooks)
libcbm
2 changes: 1 addition & 1 deletion ws3/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
.. moduleauthor:: Gregory Paradis gregory.paradis@ubc.ca
"""

__version__ = '1.0.2'
__version__ = '1.0.4'
__all__ = ['common',
'core',
'util',
Expand Down