Skip to content

Commit a42cd40

Browse files
committed
Merge branch 'main-docs' into major-documentation
# Conflicts: # activity_browser/docs/wiki/Databases.md # activity_browser/docs/wiki/Getting-Started.md
2 parents 7ab17ff + 74b14e4 commit a42cd40

40 files changed

Lines changed: 1021 additions & 80 deletions
Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
name: Activity Browser 3 Beta
2+
description: File a bug report or feature request.
3+
labels: ["beta"]
4+
body:
5+
- type: markdown
6+
attributes:
7+
value: |
8+
Thanks for taking the time to test the Activity Browser 3 Beta! Please fill out the following form to report a bug or request a feature. If you are reporting a bug, please make sure to include as much information as possible to help us reproduce the issue.
9+
- type: textarea
10+
id: what-happened
11+
attributes:
12+
label: What do you want to report?
13+
description: Also tell us, what did you expect to happen? You can share relevant files (e.g. screenshots/databases) here too.
14+
placeholder: Tell us what happened
15+
validations:
16+
required: true
17+
- type: textarea
18+
id: errors
19+
attributes:
20+
label: Relevant errors
21+
description: Please copy and paste any relevant errors from the terminal.
22+
placeholder: This will be automatically formatted into code, so no need to worry about the formatting.
23+
render: python
24+
- type: input
25+
id: version
26+
attributes:
27+
label: Version
28+
description: Please specify the version of the Activity Browser you are using.
29+
placeholder: e.g. 3.0.0b940
30+
- type: dropdown
31+
id: distribution
32+
attributes:
33+
label: Installation method
34+
multiple: false
35+
options:
36+
- PyPI (pip)
37+
- Anaconda (conda)
38+
default: 0
39+
- type: dropdown
40+
id: os
41+
attributes:
42+
label: Operating system
43+
multiple: false
44+
options:
45+
- Windows 10
46+
- Windows 11
47+
- MacOS (Apple Silicon)
48+
- MacOS (Intel)
49+
- Linux/Other (please specify above)
50+
default: 1
Lines changed: 75 additions & 80 deletions
Original file line numberDiff line numberDiff line change
@@ -1,108 +1,103 @@
1-
## Quick Installation
2-
<details><summary><b>Familiar with Conda already? Do a quick install</b></summary>
1+
## Introduction
2+
Thank you for showing interesting in the Beta for Activity Browser 3.0. This release has been a year in the making and we're happy to
3+
show of the hard work that's been put in and get it to a level where we're happy to show it to the wider public. Most notably AB3 will
4+
support Brightway25 and multifunctionality. But there have also been a lot of changes to the look and experience of the Activity Browser.
35

4-
You can install and start the activity-browser like this:
5-
1. Install [Miniconda](https://docs.anaconda.com/miniconda/#miniconda-latest-installer-links).
6-
2. ```bash
7-
conda create -n ab -c conda-forge activity-browser
8-
conda activate ab
9-
activity-browser
10-
```
11-
</details>
6+
Making so many changes inevitably also comes with creating a lot of bugs. We have tried to catch as may of them as we could, but in the
7+
end noone is better at finding bugs than you, our users, are. We invite you to install the Activity Browser 3.0 Beta and break it in as
8+
many ways as you possibly can. As long as you report the bugs you find back to us, so we can fix them.
129

13-
## The Anaconda package manager
14-
Skip this step if you already have a working installation of Anaconda or Miniconda, but make sure to keep your
15-
conda installation up-to-date: `conda update -n base conda`.
10+
Thank you for your help, and enjoy the new Activity Browser!
1611

17-
You need the python package manager [Anaconda](https://anaconda.org) to install Activity Browser.
18-
Anaconda is somewhat like an app-store for python programs.
19-
You can install the full [Anaconda user interface (navigator)](https://www.anaconda.com/download/success)
20-
or just the minimal command-line installer,
21-
[Miniconda](https://docs.anaconda.com/miniconda/#miniconda-latest-installer-links).
22-
If needed, see also the
23-
[conda user guide](https://docs.conda.io/projects/conda/en/latest/user-guide/index.html)
24-
or the
25-
[Conda cheat sheet](https://docs.conda.io/projects/conda/en/latest/_downloads/843d9e0198f2a193a3484886fa28163c/conda-cheatsheet.pdf).
12+
> [!IMPORTANT]
13+
> This is a **beta installation**. As always use of the Activity Browser is **at your own risk**, but take extra care with this installation. Back-up critical projects before opening them.
2614
27-
- Install the Anaconda manager of your choice from the above options.
28-
- Start `Anaconda Prompt` from the start menu.
29-
- This is a terminal window with `conda`, you will need this prompt for all next steps.
15+
## Distributions on PyPI and Anaconda
16+
The Activity Browser 3 Beta is available both on [PyPI]() and [Anaconda](). Because not all necessary libraries are available on Anaconda
17+
right now you need to do an extra `pip install` inside your Conda environment.
3018

31-
## Add the conda-forge channel
32-
Open an Anaconda prompt window and type the following (and `Enter`):
33-
```bash
34-
conda config --prepend channels conda-forge
19+
#### Quick-Install PyPI
20+
```
21+
pip install activity-browser
3522
```
3623

37-
<details><summary><b>More information about this step</b></summary>
24+
#### Quick-Install Anaconda
25+
```
26+
conda create -n ab_beta -c conda-forge lca::activity-browser
27+
conda activate ab_beta
28+
pip install PySide6
29+
```
3830

39-
Activity Browser has many dependencies that are managed by
40-
[conda-forge](https://conda.io/docs/user-guide/tasks/manage-channels.html).
41-
By adding the channel you can install python packages from there.
31+
For more elaborate installing instructions check out the page below for both [installing from PyPI](#installing-from-pypi) and [installing from Anaconda](#installing-from-anaconda).
4232

43-
The line above means:
44-
- `conda`: a command for conda
45-
- `config`: change something in the configuration (settings) of `conda`
46-
- `--prepend channels`: in the channels from which conda can install things, add to the top (prepend)
47-
- `conda-forge`: the channel name
48-
</details>
33+
## Installing from PyPI
34+
Installing from the Python Package Index (PyPI) can be done using the standard `pip` command. We strongly recommended installing the
35+
Activity Browser into a separate [virtual environment](https://realpython.com/python-virtual-environments-a-primer/)
4936

50-
## Creating an environment and Installing Activity Browser
51-
Next, we create a python environment, in which we install Activity Browser
37+
First make sure you have Python installed on your PC by entering the following command into your terminal or command prompt.
5238

53-
```bash
54-
conda create -n ab -c conda-forge activity-browser
5539
```
40+
python --version
41+
```
42+
If you get an error please install Python [using their install instructions](https://www.python.org/downloads/).
5643

57-
> [!NOTE]
58-
> Installing Activity Browser can take some time, this depends on the speed of your internet connection and computer.
44+
### Creating a virtual environment
45+
Firstly, create a directory for your virtual environments, such as C:/Users/me/virtualenvs/. Then create a virtual environment in that
46+
location using the following command:
47+
```
48+
python -m venv C:/Users/me/virtualenvs/ab-beta
49+
```
50+
Afterwards, you need to activate the virtual environment, which differs between operating systems and shells. Using Window Command Prompt
51+
activate the environment using this command:
52+
```
53+
C:\Users\me\virtualenvs\ab-beta\Scripts\activate.bat
54+
```
55+
For a full overview of activation commands, [check out the documentation here](https://docs.python.org/3/library/venv.html#how-venvs-work)
5956

60-
<details><summary><b>More information about this step</b></summary>
57+
### Activity Browser Beta installation
58+
After creating the virtual environment, installing the Beta should be as simple as using the following command:
59+
```
60+
pip install activity-browser
61+
```
6162

62-
We create a separate environment, this allows Activity Browser to work with the specific versions of other libraries
63-
it needs without interfering with other python packages.
63+
### Launching the Activity Browser
64+
The Activity Browser can then be launched like so:
65+
```
66+
activity-browser
67+
```
6468

65-
The line above means:
66-
- `conda`: a command for conda
67-
- `create -n ab`: create a new e**n**vironment (`-n`) with the name `ab`
68-
- `-c conda-forge`: from the **c**hannel (`-c`) `conda-forge`
69-
- `activity-browser`: install the package `activity-browser`
69+
## Installing from Anaconda
70+
First make sure you have Conda installed
7071

71-
You can have as many environments as you like, you can also install different versions of Activity Browser
72-
in different environments, for example for different [plugins](Plugins), or just for using different version of
73-
Activity Browser.
72+
```
73+
conda --version
74+
```
7475

75-
All environments will have access to the same projects and databases in Activity Browser.
76+
If you get an error, please download and install miniconda from anaconda.com https://www.anaconda.com/download/success
7677

77-
</details>
78+
### Activity Browser Beta installation
79+
Next we're going to create a new environment for the Activity Browser Beta release.
7880

79-
## Activating and running Activity Browser
80-
To run Activity Browser, you need to activate your environment with
81-
```bash
82-
conda activate ab
8381
```
84-
85-
And then run activity browser
86-
with.
87-
```bash
88-
activity-browser
82+
conda create -n ab_beta -c conda-forge lca::activity-browser
8983
```
9084

91-
Congratulations! You've started Activity Browser for the first time!
85+
This will go through a few steps, some of which like `solving environment` may take a while. After installation has finished you can
86+
activate the environment like so:
9287

93-
Every time you want to start Activity Browser, you need to start an anaconda prompt
94-
and do `conda activate ab` and then `activity browser`.
88+
```
89+
conda activate ab_beta
90+
```
9591

96-
## Updating Activity Browser
97-
We recommend to regularly update Activity Browser to receive new features & bugfixes.
98-
These commands will update the Activity Browser and all of its dependencies in the conda environment called `ab`.
92+
### PySide6 installation
93+
We will need to install `PySide6` from a different source, as the fully functional version is not available on anaconda.
9994

100-
```bash
101-
conda activate ab
102-
conda update activity-browser
95+
```
96+
pip install PySide6
10397
```
10498

105-
> [!IMPORTANT]
106-
> If you currently have a version <u>below</u> `2.10.0`, please consult
107-
> [this guide](https://github.com/LCA-ActivityBrowser/activity-browser/discussions/1049)
108-
> to update.
99+
### Launching the Activity Browser
100+
Launch the Activity Browser like you would normally
101+
```
102+
activity-browser
103+
```

docs/.gitignore

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
_site
2+
.sass-cache
3+
.jekyll-cache
4+
.jekyll-metadata
5+
vendor
6+
Gemfile.lock

docs/404.html

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
---
2+
permalink: /404.html
3+
layout: page
4+
---
5+
6+
<style type="text/css" media="screen">
7+
.container {
8+
margin: 10px auto;
9+
max-width: 600px;
10+
text-align: center;
11+
}
12+
h1 {
13+
margin: 30px 0;
14+
font-size: 4em;
15+
line-height: 1;
16+
letter-spacing: -1px;
17+
}
18+
</style>
19+
20+
<div class="container">
21+
<h1>404</h1>
22+
23+
<p><strong>Page not found :(</strong></p>
24+
<p>The requested page could not be found.</p>
25+
</div>

docs/Gemfile

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
source "https://rubygems.org"
2+
# Hello! This is where you manage which Jekyll version is used to run.
3+
# When you want to use a different version, change it below, save the
4+
# file and run `bundle install`. Run Jekyll with `bundle exec`, like so:
5+
#
6+
# bundle exec jekyll serve
7+
#
8+
# This will help ensure the proper Jekyll version is running.
9+
# Happy Jekylling!
10+
# gem "jekyll", "~> 4.4.1"
11+
# This is the default theme for new Jekyll sites. You may change this to anything you like.
12+
gem "minima", "~> 2.5"
13+
# If you want to use GitHub Pages, remove the "gem "jekyll"" above and
14+
# uncomment the line below. To upgrade, run `bundle update github-pages`.
15+
gem "github-pages", "~> 232", group: :jekyll_plugins
16+
# If you have any plugins, put them here!
17+
group :jekyll_plugins do
18+
gem "jekyll-feed", "~> 0.12"
19+
end
20+
21+
# Windows and JRuby does not include zoneinfo files, so bundle the tzinfo-data gem
22+
# and associated library.
23+
platforms :mingw, :x64_mingw, :mswin, :jruby do
24+
gem "tzinfo", ">= 1", "< 3"
25+
gem "tzinfo-data"
26+
end
27+
28+
# Performance-booster for watching directories on Windows
29+
gem "wdm", "~> 0.1", :platforms => [:mingw, :x64_mingw, :mswin]
30+
31+
# Lock `http_parser.rb` gem to `v0.6.x` on JRuby builds since newer versions of the gem
32+
# do not have a Java counterpart.
33+
gem "http_parser.rb", "~> 0.6.0", :platforms => [:jruby]
34+
gem "jekyll-remote-theme"

docs/_config.yml

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
# Welcome to Jekyll!
2+
#
3+
# This config file is meant for settings that affect your whole blog, values
4+
# which you are expected to set up once and rarely edit after that. If you find
5+
# yourself editing this file very often, consider using Jekyll's data files
6+
# feature for the data you need to update frequently.
7+
#
8+
# For technical reasons, this file is *NOT* reloaded automatically when you use
9+
# 'bundle exec jekyll serve'. If you change this file, please restart the server process.
10+
#
11+
# If you need help with YAML syntax, here are some quick references for you:
12+
# https://learn-the-web.algonquindesign.ca/topics/markdown-yaml-cheat-sheet/#yaml
13+
# https://learnxinyminutes.com/docs/yaml/
14+
#
15+
# Site settings
16+
# These are used to personalize your new site. If you look in the HTML files,
17+
# you will see them accessed via {{ site.title }}, {{ site.email }}, and so on.
18+
# You can create any custom variable you would like, and they will be accessible
19+
# in the templates via {{ site.myvariable }}.
20+
21+
title: Activity Browser
22+
logo: "/assets/activitybrowser.png"
23+
email: your-email@example.com
24+
25+
# Build settings
26+
remote_theme: just-the-docs/just-the-docs
27+
plugins:
28+
- jekyll-feed
29+
- jekyll-remote-theme
30+
31+
callouts_level: quiet # or loud
32+
callouts:
33+
highlight:
34+
color: yellow
35+
important:
36+
title: Important
37+
color: blue
38+
new:
39+
title: New
40+
color: green
41+
note:
42+
title: Note
43+
color: purple
44+
warning:
45+
title: Warning
46+
color: red
47+
48+
# Exclude from processing.
49+
# The following items will not be processed, by default.
50+
# Any item listed under the `exclude:` key here will be automatically added to
51+
# the internal "default list".
52+
#
53+
# Excluded items can be processed by explicitly listing the directories or
54+
# their entries' file path in the `include:` list.
55+
#
56+
# exclude:
57+
# - .sass-cache/
58+
# - .jekyll-cache/
59+
# - gemfiles/
60+
# - Gemfile
61+
# - Gemfile.lock
62+
# - node_modules/
63+
# - vendor/bundle/
64+
# - vendor/cache/
65+
# - vendor/gems/
66+
# - vendor/ruby/
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
<footer class="site-footer">
2+
See how <b>you</b> can contribute in our <a href="github.com/LCA-ActivityBrowser/activity-browser/blob/master/CONTRIBUTING.md">Contributing Guidelines</a>
3+
</footer>
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Search the docs

docs/_sass/custom/custom.scss

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
.image-container{
2+
display: flex;
3+
flex-direction: row;
4+
gap: 20px;
5+
margin-bottom: 20px;
6+
}
7+
8+
@media (max-width: 500px){
9+
.image-container{
10+
flex-direction: column;
11+
}
12+
}

0 commit comments

Comments
 (0)