Skip to content

Commit

Permalink
Merge branch 'main' of github.com:TimoDiepers/timex
Browse files Browse the repository at this point in the history
  • Loading branch information
TimoDiepers committed May 27, 2024
2 parents 406be19 + 3b03975 commit 9c9e74b
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,5 +40,5 @@ We welcome contributions! If you have suggestions or want to fix a bug, please:

## Support:
If you have any questions or need help, do not hesitate to contact us:
- [[email protected]](mailto:[email protected])
- [[email protected]](mailto:[email protected])
- Timo Diepers ([[email protected]](mailto:[email protected]))
- Amelie Müller ([[email protected]](mailto:[email protected]))
3 changes: 2 additions & 1 deletion docs/content/installation.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
`timex_lca` is a Python software package. It's available via [`pip`](https://pypi.org/project/pip/) or [`conda`](https://docs.conda.io/en/latest/) / [`mamba`](https://mamba.readthedocs.io/en/latest/).

```{note}
We currently recommend the installation via `conda` or `mamba`. That's what we're providing detailed instructions for below.
1) We currently recommend the installation via `conda` or `mamba`. That's what we're providing detailed instructions for below.
2) timex_lca depends on Brightway25, and will install bw25-compatible versions of the bw packages. This means that it cannot be added to existing virtual environments that are based on Brightway2, e.g. virtual environments containing activity browser. Please install timex_lca in a separate virtual environment following the instructions below.
```

## Installing `timex_lca` using `conda` or `mamba`
Expand Down

0 comments on commit 9c9e74b

Please sign in to comment.