Skip to content

Commit d44be56

Browse files
authored
Merge pull request #1352 from marc-vdm/wiki_update
LGTM, thanks @marc-vdm, fantastic work
2 parents acd6aa1 + 91e61a4 commit d44be56

44 files changed

Lines changed: 778 additions & 371 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,28 @@
11
<!--
2-
Thank you for your pull request. Please provide a description above and
3-
review the checklist below.
2+
Thank you for your pull request.
3+
Please provide a description above and review the checklist below.
44
55
Contributors guide: ./CONTRIBUTING.md
66
-->
77

88
## Checklist
99
<!--
10-
Remove items that do not apply. For completed items, change [ ] to [x] or you can click the checkboxes once your
11-
pull-request is published.
10+
Remove items that do not apply.
11+
For completed items, change [ ] to [x] or you can click the checkboxes once your pull-request is published.
1212
-->
1313

1414
- [ ] Keep pull requests small so they can be easily reviewed.
15-
- [ ] Update the documentation, please follow the [numpy style guide](https://numpydoc.readthedocs.io/en/latest/format.html).
15+
- [ ] Update the documentation
16+
- For in-code documentation, please follow the [numpy style guide](https://numpydoc.readthedocs.io/en/latest/format.html).
17+
- For user documentation, please update the wiki in
18+
[`./activity_browser/docs/wiki`](https://github.com/LCA-ActivityBrowser/activity-browser/tree/main/activity_browser/docs/wiki)
1619
- [ ] Update tests.
20+
- [ ] Link this PR to related issues by using [closing keywords](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue).
21+
22+
#### If you have write access (otherwise a maintainer will do this for you):
1723
- [ ] Categorize the PR by setting a good title and adding one of the labels:
1824
`bug`, `feature`, `ui`, `change`, `documentation`, `breaking`, `ci`
1925
as they show up in the changelog.
20-
- [ ] Link this PR to related issues by using [closing keywords](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue).
2126
- [ ] Add a milestone to the PR (and related issues, if any) for the intended release.
2227
- [ ] Request a review from another developer.
2328

CONTRIBUTING.md

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,9 @@ If you want to contribute to the wiki, either by adding figures or links or by w
4242
new sections, please [contact the developers](https://github.com/LCA-ActivityBrowser/activity-browser#developers)!
4343

4444
#### Making changes to the wiki _(for developers)_
45-
Any images or other assets in the documentation should be stored in `docs/assets` and linked to there instead of
46-
online links (unless copyrighted material is linked that cannot be shown in any other way).
45+
Any images or other assets in the documentation should be stored in `docs/wiki/assets` and linked to there instead of
46+
online links (unless copyrighted material is linked that cannot be shown in any other way).
47+
This way all assets are stored in the wiki git.
4748

4849
To make changes to the wiki, open a pull request with suggested changes to
4950
[`docs/wiki`](https://github.com/LCA-ActivityBrowser/activity-browser/tree/main/activity_browser/docs/wiki).
@@ -214,9 +215,12 @@ When the tests pass on a pull-request, one of the maintainers of AB will review
214215

215216
### Do's and Don'ts
216217
- Please do document any new code you wish to include in the activity browser.
217-
This means writing useful documentation in the code (please follow the
218-
[numpy style guide](https://numpydoc.readthedocs.io/en/latest/format.html)), but also writing useful tooltips, labels
219-
and other things that can help users.
218+
This means:
219+
- Writing useful documentation in the code (please follow the
220+
[numpy style guide](https://numpydoc.readthedocs.io/en/latest/format.html)),
221+
- Writing useful tooltips, labels and other things that can help users in the software,
222+
- Updating the wiki in
223+
[`./activity_browser/docs/wiki`](https://github.com/LCA-ActivityBrowser/activity-browser/tree/main/activity_browser/docs/wiki)
220224
- Where possible, avoid importing and using brightway2 classes and methods directly in the Qt application code.
221225
If some complex data processing is needed, see if your use-case is covered by bwutils instead.
222226
If bwutils does not contain any for your use-case you are welcome to add it.

README.md

Lines changed: 14 additions & 160 deletions
Original file line numberDiff line numberDiff line change
@@ -13,189 +13,43 @@
1313

1414
The **Activity Browser (AB) is an open source software for Life Cycle Assessment (LCA)** that builds on [Brightway2](https://brightway.dev).
1515

16-
[Video tutorials](https://www.youtube.com/channel/UCsyySKrzEMsRFsWW1Oz-6aA/) are available on youtube.
17-
18-
Please also read and cite our [scientific paper](https://doi.org/10.1016/j.simpa.2019.100012).
19-
20-
2116
### Some highlights
2217

2318
- **Fast LCA calculations**: for multiple reference flows, impact categories, and scenarios
2419
- **A productivity tool for brightway**: model in brightway (python) and see the results in the AB or vice-versa
2520
- **Advanced modeling:** Use parameters, scenarios (including prospective LCI databases from [premise](https://premise.readthedocs.io/en/latest/)), uncertainties and our Graph Explorer
2621
- **Advanced analyses:** Contribution analyses, Sankey Diagrams, Monte Carlo, and Global Sensitivity Analysis
22+
- **Plugins:** Extend the functionality of Activity Browser with
23+
[Plugins](https://github.com/LCA-ActivityBrowser/activity-browser/wiki/Plugins)
2724

2825
# Contents
2926
- [Installation](#installation)
30-
- [Updating the AB](#updating-the-ab)
31-
- [Getting started](#getting-started)
32-
- [Running the AB](#running-the-ab)
33-
- [Importing LCI databases](#importing-lci-databases)
34-
- [Additional Resources](#additional-resources)
35-
- [Plugins](#plugins)
36-
- [Available plugins](#available-plugins)
37-
- [Installation](#installation-1)
38-
- [Usage](#usage)
39-
- [Development](#development)
27+
- [First Steps](#first-steps)
4028
- [Contributing](#contributing)
4129
- [Developers](#developers)
4230
- [Copyright](#copyright)
4331
- [License](#license)
4432

4533
# Installation
4634

47-
## The quick way
48-
49-
You can install and start the activity-browser like this:
50-
51-
```bash
52-
conda create -n ab -c conda-forge --solver libmamba activity-browser
53-
conda activate ab
54-
activity-browser
55-
```
56-
57-
### Mamba
58-
59-
You can also install the AB using [Mamba](https://mamba.readthedocs.io/en/latest/mamba-installation.html#mamba-install):
60-
61-
```bash
62-
mamba create -n ab activity-browser
63-
mamba activate ab
64-
activity-browser
65-
```
66-
67-
## The thorough way
68-
### Conda
69-
70-
We recommend that you use **conda** to manage your python installation. You can install [Anaconda](https://www.anaconda.com/products/individual) or the more compact [miniconda](https://conda.io/miniconda.html) (Python 3 version) for your operating system. Installation instructions for miniconda can be found [here](https://docs.conda.io/projects/conda/en/latest/user-guide/install/index.html). See also the [conda user guide](https://docs.conda.io/projects/conda/en/latest/user-guide/index.html) or the [Conda cheat sheet](https://docs.conda.io/projects/conda/en/latest/_downloads/843d9e0198f2a193a3484886fa28163c/conda-cheatsheet.pdf).
71-
72-
Skip this step if you already have a working installation of anaconda or miniconda, but make sure to keep your conda installation up-to-date: `conda update -n base conda`.
35+
## Step-by-step guide
36+
See our
37+
[Installation Guide](https://github.com/LCA-ActivityBrowser/activity-browser/wiki/Installation-Guide)
38+
wiki page for a step-by-step guide to installing Activity Browser.
7339

74-
### Add the Conda-Forge channel
75-
The activity-browser has many dependencies that are managed by the [conda-forge](https://conda.io/docs/user-guide/tasks/manage-channels.html) channel. Open a cmd-window or terminal (in Windows you may have to use the Anaconda prompt) and type the following:
76-
77-
```bash
78-
conda config --prepend channels conda-forge
79-
```
80-
Also configure conda to use the libmamba solver which is significantly faster than the default.
81-
```bash
82-
conda config --set solver libmamba
83-
```
84-
85-
### Installing Activity Browser
40+
## The quick way
41+
Or you can install and start the activity-browser like this:
8642

8743
```bash
8844
conda create -n ab -c conda-forge activity-browser
8945
conda activate ab
9046
activity-browser
9147
```
9248

93-
#### Activity Browser is installed
94-
95-
At this point the activity-browser and all of its dependencies will be installed in a new conda environment called `ab`. You can change the environment name `ab` to whatever suits you.
96-
97-
## Updating the AB
98-
99-
We recommend to regularly update the AB to receive new features & bugfixes. These commands will update the activity-browser and all of its dependencies in the conda environment called `ab`.
100-
101-
```bash
102-
conda activate ab
103-
conda update activity-browser
104-
```
105-
106-
# Getting started
107-
108-
## Running the AB
109-
110-
First activate the environment where the activity browser is installed:
111-
112-
```bash
113-
conda activate ab
114-
```
115-
116-
Then simply run `activity-browser` and the application will open.
117-
118-
## Importing LCI databases
119-
120-
- In the `Project`-tab there is initially a button called _"Add default data (biosphere flows and impact categories)"_. Click this button to add the default data. This is equivalent to `brightway2.bw2setup()` in python.
121-
- After adding the default data, you can import a database with the _"Import Database"_-Button. Follow the instructions of the database import wizard. Imports can be done in several ways:
122-
- Directly from the ecoinvent homepage (ecoinvent login credentials required)
123-
- From a 7zip archive
124-
- From a directory with ecospold2 files (same as in brightway2)
125-
- From Excel files using the brightway Excel format
126-
127-
## Additional Resources
128-
129-
- [Youtube tutorials](https://www.youtube.com/channel/UCsyySKrzEMsRFsWW1Oz-6aA/)
130-
- [Introduction video by ETH Zurich](https://www.youtube.com/watch?v=j3uLptvsxeA)
131-
- [AB Discussions page](https://github.com/LCA-ActivityBrowser/activity-browser/discussions)
132-
- [AB Wiki](https://github.com/LCA-ActivityBrowser/activity-browser/wiki)
133-
- [AB scientific article](https://doi.org/10.1016/j.simpa.2019.100012)
134-
- The AB has two mailing lists, for [updates](https://brightway.groups.io/g/AB-updates) and [user exchange](https://brightway.groups.io/g/AB-discussion)
135-
- [Brightway2](https://brightway.dev/)
136-
- [Global Sensitiviy Analysis paper](https://onlinelibrary.wiley.com/doi/10.1111/jiec.13194) describing GSA as implemented in the AB; see also our [wiki](https://github.com/LCA-ActivityBrowser/activity-browser/wiki/Global-Sensitivity-Analysis)
137-
- [Modular LCA paper](https://link.springer.com/article/10.1007/s11367-015-1015-3); [documentation modular LCA](http://activity-browser.readthedocs.io/en/latest/index.html); re-implementation of modular LCA into the AB is [ongoing](https://github.com/marc-vdm/activity-browser/tree/mLCA)
138-
139-
# Plugins
140-
| :warning: DISCLAIMER |
141-
|:--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
142-
| Plugins are not necessarily developed by Activity Browser maintainers. Below are listed plugins from people we trust but we do not check plugins code. **Use them at your own risk**. |
143-
| The plugin system is still in development so keep in mind that things may change at any point. |
144-
145-
Since the `2.8 release` a plugin system has been added to the AB. Plugins are a flexible way to add new functionalities to the AB without modifying the software itself.
146-
147-
The plugin code has been designed and written by Remy le Calloch (supported by [G-SCOP laboratories](https://g-scop.grenoble-inp.fr/en/laboratory/g-scop-laboratory)) with revisions from the AB-team.
148-
149-
150-
## Available plugins
151-
152-
These are the plugins that we know about. To add your plugin to this list either open an issue, or a pull request. All submitted plugins will be reviewed, although all risks associated with their use shall be born by the user.
153-
154-
| Name | Description | Links | Author(s) |
155-
|:---------|-------------|-------|-----------|
156-
| [ScenarioLink](https://github.com/polca/ScenarioLink) | Enables you to seamlessly fetch and reproduce scenario-based LCA databases, such as those generated by [premise](https://github.com/polca/premise) | [anaconda](https://anaconda.org/romainsacchi/ab-plugin-scenariolink), [pypi](https://pypi.org/project/ab-plugin-scenariolink/), [github](https://github.com/polca/ScenarioLink) | Romain Sacchi & Marc van der Meide |
157-
| [ReSICLED](https://github.com/Pan6ora/ab-plugin-ReSICLED) | Evaluating the recyclability of electr(on)ic product for improving product design | [anaconda](https://anaconda.org/pan6ora/ab-plugin-resicled), [github](https://github.com/Pan6ora/ab-plugin-ReSICLED) | G-SCOP Laboratory |
158-
| [Notebook](https://github.com/Pan6ora/ab-plugin-Notebook) | Use Jupyter notebooks from AB | [anaconda](https://anaconda.org/pan6ora/ab-plugin-template), [github](https://github.com/Pan6ora/ab-plugin-Notebook) | Rémy Le Calloch |
159-
| [template](https://github.com/Pan6ora/activity-browser-plugin-template) | An empty plugin to start from | [anaconda](https://anaconda.org/pan6ora/ab-plugin-template), [github](https://github.com/Pan6ora/activity-browser-plugin-template) | Rémy Le Calloch |
160-
161-
## Installation
162-
163-
### detailed instructions
164-
165-
Every plugin's Github page (links are provided in the above table) should have a **Get this plugin** section with installation instructions.
166-
167-
### general instructions
168-
169-
Plugins are conda packages (like the Activity Browser). To add a plugin simply install it in your conda environment from the Anaconda repos.
170-
171-
_Nb: add `-c conda-forge` to the install command like below to avoid problems with dependencies._
172-
173-
Ex:
174-
175-
```
176-
conda activate ab
177-
conda install -c pan6ora -c conda-forge ab-plugin-notebook
178-
```
179-
180-
## Usage
181-
182-
Once a new plugin is installed restart the Activity Browser.
183-
184-
### enabling a plugin
185-
186-
Plugins are enabled **per-project**. Simply open the plugin manager in the `Tools > Plugins` menu.
187-
188-
Close the plugin manager. New tabs should have appeared in the AB (each plugin can spawn one tab on each left/right panel).
189-
190-
### disabling a plugin
191-
192-
Disable a plugin the same way you activated it.
193-
194-
**:warning: Keep in mind that all data created by the plugin in a project could be erased when you disable it.**
195-
196-
## Development
197-
198-
The best place to start to create new plugins is the [plugin template](https://github.com/Pan6ora/activity-browser-plugin-template). Its code and README will help you to understand how to create a plugin.
49+
# First Steps
50+
See our
51+
[Getting Started](https://github.com/LCA-ActivityBrowser/activity-browser/wiki/Getting-Started)
52+
wiki page to learn how to get started using Activity Browser.
19953

20054
# Contributing
20155

@@ -213,7 +67,7 @@ If you experience problems or are suffering from a specific bug, please [raise a
21367
- Marin Visscher (m.r.visscher@cml.leidenuniv.nl) (main developer)
21468
- Marc van der Meide (m.t.van.der.meide@cml.leidenuniv.nl) (maintainer)
21569

216-
### Important contributers
70+
### Important contributors
21771

21872
- [Adrian Haas](https://github.com/haasad)
21973
- [Chris Mutel](https://github.com/cmutel)
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
> [!IMPORTANT]
2+
> This wiki section is __incomplete__ or __outdated__.
3+
>
4+
> Please help us improve the wiki by reading our
5+
> [contributing guidelines](https://github.com/LCA-ActivityBrowser/activity-browser/blob/main/CONTRIBUTING.md#wiki).
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
> [!IMPORTANT]
2+
> This wiki section is __incomplete__ or __outdated__.
3+
>
4+
> Please help us improve the wiki by reading our
5+
> [contributing guidelines](https://github.com/LCA-ActivityBrowser/activity-browser/blob/main/CONTRIBUTING.md#wiki).
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
> [!IMPORTANT]
2+
> This wiki section is __incomplete__ or __outdated__.
3+
>
4+
> Please help us improve the wiki by reading our
5+
> [contributing guidelines](https://github.com/LCA-ActivityBrowser/activity-browser/blob/main/CONTRIBUTING.md#wiki).

0 commit comments

Comments
 (0)