Skip to content

Commit 5557d92

Browse files
authored
Rebasing major on beta (#1641)
* - Removed PySide 2 requirement (#1636) - updates: - pyside6 >=6.5.0, <6.10 - bw2data >=4.1 * Update pyside6 bw2data requirements pip (#1637) * Update requirements for pip as well: - updates: - pyside6 >=6.5.0, <6.10 - bw2data >=4.1 * Update py side6 dependencies (#1638) Updated requirements for pip and conda, hopefully working this time * Update py side6 dependencies (#1639) * - Removed PySide 2 requirement - updates: - pyside6 >=6.5.0, <6.10 - bw2data >=4.1 * Update requirements for pip as well: - updates: - pyside6 >=6.5.0, <6.10 - bw2data >=4.1 * -removing conda requirement for pyside6 again as conda-forge still does not have pyside6-addons. So PySide6 must still be installed via pip via an extra command if using conda for the AB * downgrading conda requirement PySide6 --> PySide2 * Small update of "installation" documentation to make users aware that their venv Python version needs to compatible with the AB.
1 parent 9927406 commit 5557d92

3 files changed

Lines changed: 7 additions & 5 deletions

File tree

docs/getting-started/installation.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,8 @@ For more elaborate installing instructions check out the page below for both [in
3535
## Installing from PyPI
3636
Installing from the Python Package Index (PyPI) can be done using the standard `pip` command. We strongly recommended installing the Activity Browser into a separate [virtual environment](https://realpython.com/python-virtual-environments-a-primer/)
3737

38-
First make sure you have Python installed on your PC by entering the following command into your terminal or command prompt. At this moment the AB is compatible with Python versions 3.10, 3.11, and 3.12.
38+
First make sure you have Python installed on your PC by entering the following command into your terminal or command prompt.
39+
At this moment the AB is compatible with Python versions 3.10, 3.11, and 3.12.
3940

4041
```
4142
python --version
@@ -51,7 +52,8 @@ Afterwards, you need to activate the virtual environment, which differs between
5152
```
5253
C:\Users\me\virtualenvs\ab-beta\Scripts\activate.bat
5354
```
54-
Possibly double-check if the Python version of your virtual environment is compatible with the AB. For a full overview of activation commands, [check out the documentation here](https://docs.python.org/3/library/venv.html#how-venvs-work)
55+
Possibly double-check if the Python version of your virtual environment is compatible with the AB.
56+
For a full overview of activation commands, [check out the documentation here](https://docs.python.org/3/library/venv.html#how-venvs-work)
5557

5658
### Activity Browser installation
5759
After creating and activating the virtual environment, installing the Beta should be as simple as using the following command:

pyproject.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ dependencies = [
3535
"arrow",
3636
"bw2analyzer>=0.11.5",
3737
"bw2calc>=2.0",
38-
"bw2data>=4.1, <4.5.2",
38+
"bw2data>=4.1",
3939
"bw2parameters>=1.1",
4040
"bw2io>=0.9.3",
4141
"bw_graph_tools>=0.5",
@@ -50,7 +50,7 @@ dependencies = [
5050
"pint<=0.21",
5151
"py7zr==0.22.0",
5252
"pyperclip",
53-
"pyside6",
53+
"pyside6>=6.5.0, <6.10",
5454
"pypardiso ; platform_system == 'Windows'",
5555
"pyprind",
5656
"qtpy",

recipe/meta.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ requirements:
2121
- python >=3.10, <3.12
2222
- arrow
2323
- bw2analyzer >=0.11.5
24-
- bw2data >=4.1, <4.5.2
24+
- bw2data >=4.1
2525
- bw2parameters >=1.1
2626
- bw2io >=0.9.3
2727
- bw_graph_tools >=0.5

0 commit comments

Comments
 (0)