Skip to content

Commit

Permalink
Merge branch 'main' into docker
Browse files Browse the repository at this point in the history
  • Loading branch information
dalonsoa committed Nov 21, 2023
2 parents 88fcfca + 3fed811 commit 95f0b24
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 9 deletions.
18 changes: 9 additions & 9 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ that we have experienced in industry collaboration. The WSIMOD Python package
provides tutorials and examples to help modellers create nodes, connect them
with arcs, and create simulations.

You can access our documentation below or at [https://imperialcollegelondon.github.io/wsi](https://barneydobson.github.io/wsi).
You can access our documentation below or at [https://imperialcollegelondon.github.io/wsi](https://imperialcollegelondon.github.io/wsi).

*Requires*: Python 3 (tested on versions >=3.7), [tqdm](https://tqdm.github.io/), [PyYAML](https://pyyaml.org/), [dill](https://dill.readthedocs.io/en/latest/)

Expand All @@ -35,21 +35,21 @@ project documentation as described by Daniele Procida
in the [Diátaxis documentation framework](https://diataxis.fr/)
and consists of:

1. [About](https://barneydobson.github.io/wsi/paper/paper/)
1. [About](https://imperialcollegelondon.github.io/wsi/paper/paper/)

2. [Installation](https://barneydobson.github.io/wsi/installation/)
2. [Installation](https://imperialcollegelondon.github.io/wsi/installation/)

3. [Tutorials](https://barneydobson.github.io/wsi/tutorials/)
3. [Tutorials](https://imperialcollegelondon.github.io/wsi/tutorials/)

4. [How-To Guides](https://barneydobson.github.io/wsi/how-to/)
4. [How-To Guides](https://imperialcollegelondon.github.io/wsi/how-to/)

5. [Component library](https://barneydobson.github.io/wsi/component-library/)
5. [Component library](https://imperialcollegelondon.github.io/wsi/component-library/)

6. [API reference](https://barneydobson.github.io/wsi/reference/)
6. [API reference](https://imperialcollegelondon.github.io/wsi/reference/)

7. [Quickstart](https://barneydobson.github.io/wsi/demo/scripts/quickstart_demo/)
7. [Quickstart](https://imperialcollegelondon.github.io/wsi/demo/scripts/quickstart_demo/)

8. [Coverage](https://barneydobson.github.io/wsi/coverage/)
8. [Coverage](https://imperialcollegelondon.github.io/wsi/coverage/)

## Installation

Expand Down
12 changes: 12 additions & 0 deletions requirements-dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,15 @@ mypy-extensions==1.0.0
# via black
nodeenv==1.8.0
# via pre-commit
numpy==1.26.2
# via pandas
packaging==23.2
# via
# black
# build
# pytest
pandas==2.1.3
# via wsimod (pyproject.toml)
pathspec==0.11.2
# via black
pip-tools==7.3.0
Expand All @@ -61,14 +65,22 @@ pytest==7.4.3
# wsimod (pyproject.toml)
pytest-cov==4.1.0
# via wsimod (pyproject.toml)
python-dateutil==2.8.2
# via pandas
pytz==2023.3.post1
# via pandas
pyyaml==6.0.1
# via
# pre-commit
# wsimod (pyproject.toml)
ruff==0.1.4
# via wsimod (pyproject.toml)
six==1.16.0
# via python-dateutil
tqdm==4.66.1
# via wsimod (pyproject.toml)
tzdata==2023.3
# via pandas
virtualenv==20.24.6
# via pre-commit
wheel==0.41.3
Expand Down

0 comments on commit 95f0b24

Please sign in to comment.