From b969e26229864c6a3d72b642330a5ec1aa982f9f Mon Sep 17 00:00:00 2001 From: Timo Diepers <90762029+TimoDiepers@users.noreply.github.com> Date: Wed, 22 May 2024 17:33:15 +0200 Subject: [PATCH 1/2] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 6597607..d7e4a0e 100644 --- a/README.md +++ b/README.md @@ -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: -- [timo.diepers@ltt.rwth-aachen.de](mailto:timo.diepers@ltt.rwth-aachen.de) -- [a.muller@cml.leidenuniv.nl](mailto:a.muller@cml.leidenuniv.nl) +- Timo Diepers ([timo.diepers@ltt.rwth-aachen.de](mailto:timo.diepers@ltt.rwth-aachen.de)) +- Amelie Müller ([a.muller@cml.leidenuniv.nl](mailto:a.muller@cml.leidenuniv.nl)) From 3b03975bc338467ebc52b884b27a548183cec583 Mon Sep 17 00:00:00 2001 From: muelleram Date: Mon, 27 May 2024 13:35:06 +0200 Subject: [PATCH 2/2] add bw25 disclaimer to installation instructions --- docs/content/installation.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/content/installation.md b/docs/content/installation.md index d8f1a20..580ab50 100644 --- a/docs/content/installation.md +++ b/docs/content/installation.md @@ -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`