Beta updated requirements (#1647)

* - 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

* 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.

* Update dependency versions and replace np.NaN with np.nan for consistency (#1644)

* Beta reduce pins (#1645)

* Update dependency versions and replace np.NaN with np.nan for consistency

* Seems we need numpy<2 since otherwise there are no wheels for the pip install

* Update pyside6 bw2data requirements pip (#1637)

* Update requirements for pip as well:
- updates:
     - pyside6 >=6.5.0, <6.10
     - bw2data >=4.1

* Update dependency versions and replace np.NaN with np.nan for consistency (#1644)

* Change np.NaN to np.nan

Author: bsteubing

activity_browser/bwutils/metadata/updater.py

@@ -36,7 +36,7 @@ def on_signaleddataset_save(self, sender, old, new):
             return
 
         node_data = {f: getattr(new, f) for f in primary}
-        node_data = node_data | {f: new.data.get(f, np.NaN) for f in secondary}
+        node_data = node_data | {f: new.data.get(f, np.nan) for f in secondary}
         node_data["key"] = new.key
         node_data = pd.Series(node_data, name=new.key)
 

activity_browser/bwutils/montecarlo.py

@@ -118,7 +118,7 @@ def construct_lca(
     #         else:
     #             row = self.lca.biosphere_dict.get(x["input"], None)
     #             col = self.lca.activity_dict.get(x["output"], None)
-    #         # if either the row or the column is None, return np.NaN.
+    #         # if either the row or the column is None, return np.nan.
     #         if row is None or col is None:
     #             return None
     #         return row, col, x["type"], x["amount"]

activity_browser/bwutils/superstructure/activities.py

@@ -63,11 +63,11 @@ def construct_ad_data(row) -> tuple:
     """
     key = (row.database, row.code)
     if row.type == "process":
-        data = (row.name, row.product, row.location, np.NaN, row.database)
+        data = (row.name, row.product, row.location, np.nan, row.database)
     elif "categories" in row.data:
-        data = (row.name, np.NaN, np.NaN, row.data["categories"], row.database)
+        data = (row.name, np.nan, np.nan, row.data["categories"], row.database)
     else:
-        data = (row.name, np.NaN, np.NaN, np.NaN, row.database)
+        data = (row.name, np.nan, np.nan, np.nan, row.database)
     return key, data
 
 
@@ -95,7 +95,7 @@ def data_from_index(index: tuple) -> dict:
         "to categories": to_data[3],
         "to database": to_data[4],
         "to key": to_key,
-        "flow type": index[2] if len(index) > 2 else np.NaN,
+        "flow type": index[2] if len(index) > 2 else np.nan,
     }
 
 
@@ -159,7 +159,7 @@ def build_match(row):
             match = (row.iat[0], row.iat[3])
         else:
             match = (row.iat[0], row.iat[1], row.iat[2])
-        return matchbook.get(match, np.NaN)
+        return matchbook.get(match, np.nan)
 
     return df.apply(build_match, axis=1)
 

activity_browser/bwutils/uncertainty.py

@@ -9,11 +9,11 @@
 
 EMPTY_UNCERTAINTY = {
     "uncertainty type": UndefinedUncertainty.id,
-    "loc": np.NaN,
-    "scale": np.NaN,
-    "shape": np.NaN,
-    "minimum": np.NaN,
-    "maximum": np.NaN,
+    "loc": np.nan,
+    "scale": np.nan,
+    "shape": np.nan,
+    "minimum": np.nan,
+    "maximum": np.nan,
     "negative": False,
 }
 

activity_browser/ui/dialogs/uncertainty_dialog.py

@@ -16,11 +16,11 @@
 
 EMPTY_UNCERTAINTY = {
     "uncertainty type": sa.UndefinedUncertainty.id,
-    "loc": np.NaN,
-    "scale": np.NaN,
-    "shape": np.NaN,
-    "minimum": np.NaN,
-    "maximum": np.NaN,
+    "loc": np.nan,
+    "scale": np.nan,
+    "shape": np.nan,
+    "minimum": np.nan,
+    "maximum": np.nan,
     "negative": False,
 }
 

docs/getting-started/installation.md

@@ -35,7 +35,8 @@ For more elaborate installing instructions check out the page below for both [in
 ## Installing from PyPI
 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/)
 
-First make sure you have Python installed on your PC by entering the following command into your terminal or command prompt.
+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. 
 
 ```
 python --version
@@ -51,6 +52,7 @@ Afterwards, you need to activate the virtual environment, which differs between
 ```
 C:\Users\me\virtualenvs\ab-beta\Scripts\activate.bat
 ```
+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)
 
 ### Activity Browser installation

pyproject.toml

@@ -33,30 +33,28 @@ classifiers = [
 requires-python = ">=3.10, <3.13"
 dependencies = [
     "arrow",
+    "bw-functional>=0b97",
     "bw2analyzer>=0.11.5",
     "bw2calc>=2.0",
-    "bw2data>=4.1, <4.5.2",
-    "bw2parameters>=1.1",
+    "bw2data>=4.1",
     "bw2io>=0.9.3",
+    "bw2parameters>=1.1",
     "bw_graph_tools>=0.5",
     "bw_processing>=1.0",
     "bw_simapro_csv >=0.2.6",
     "ecoinvent_interface",
+    "loguru>=0.7",
     "matrix_utils>=0.5",
-    "bw-functional==0b97",
     "networkx",
     "numpy>=1.23.5,<2",
     "pandas>=2.2.1",
-    "pint<=0.21",
-    "py7zr==0.22.0",
+    "py7zr>=0.22.0",
     "pyperclip",
-    "pyside6",
-    "pypardiso ; platform_system == 'Windows'",
     "pyprind",
+    "pyside6>=6.5.0, <6.10",
     "qtpy",
     "salib>=1.4",
     "seaborn",
-    "loguru>=0.7",
 ]
 
 

recipe/meta.yaml

@@ -20,27 +20,28 @@ requirements:
   run:
     - python >=3.10, <3.12
     - arrow
+    - bw_functional>=0.b.97
     - bw2analyzer >=0.11.5
-    - bw2data >=4.1, <4.5.2
-    - bw2parameters >=1.1
+    - bw2calc >=2.0
+    - bw2data >=4.1
     - bw2io >=0.9.3
+    - bw2parameters >=1.1
     - bw_graph_tools >=0.5
     - bw_processing >=1.0
     - bw_simapro_csv >=0.2.6
-    - bw_functional=0.b.97
     - ecoinvent_interface
+    - loguru>=0.7
     - matrix_utils >=0.5
+    - networkx
     - numpy >=1.23.5, <2
-    - pint <=0.21
-    - py7zr <=0.22.0
+    - pandas >=2.2.1
+    - py7zr >=0.22.0
     - pyperclip
     - pyprind
-    - networkx
-    - pandas >=2.2.1
     - pyside2 >=5.15.5
     - qt-webengine
     - qtpy
-    - salib >=1.4, <1.5.1
+    - salib >=1.4
     - seaborn
 
 about: