Merge remote-tracking branch 'origin/master'

LCA-ActivityBrowser · Sep 30, 2021 · 938792c · 938792c
2 parents 2b29493 + 4d70cd1
commit 938792c
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/activity_browser/ui/widgets/biosphere_update.py b/activity_browser/ui/widgets/biosphere_update.py
@@ -3,7 +3,8 @@
 from bw2data.errors import ValidityError
 from bw2io.data import (
     add_ecoinvent_33_biosphere_flows, add_ecoinvent_34_biosphere_flows,
-    add_ecoinvent_35_biosphere_flows, add_ecoinvent_36_biosphere_flows,
+    add_ecoinvent_35_biosphere_flows, add_ecoinvent_36_biosphere_flows, add_ecoinvent_37_biosphere_flows,
+    add_ecoinvent_38_biosphere_flows,
 )
 from PySide2 import QtCore, QtWidgets
 from PySide2.QtCore import Signal, Slot
@@ -44,6 +45,8 @@ class UpdateBiosphereThread(QtCore.QThread):
         add_ecoinvent_34_biosphere_flows,
         add_ecoinvent_35_biosphere_flows,
         add_ecoinvent_36_biosphere_flows,
+        add_ecoinvent_37_biosphere_flows,
+        add_ecoinvent_38_biosphere_flows,
     )
     progress = Signal(int)
 

diff --git a/ci/travis/recipe/meta.yaml b/ci/travis/recipe/meta.yaml
@@ -25,19 +25,19 @@ requirements:
     - python>=3.8, <=3.9  # https://github.com/conda-forge/pyside2-feedstock/issues/56
     - arrow
     - brightway2 >=2.1.2
-    - bw2io >=0.8
+    - bw2io >=0.8.6
     - bw2data >=3.6.1
     - eidl >=1.2.0
     - fuzzywuzzy
     - matplotlib-base >=2.2.2
     - networkx
     - pandas >=0.24.1
     - pyside2 >=5.13.1
-    - salib >=1.3.11
+    - salib >=1.4
     - seaborn
     - presamples
     - openpyxl
-    - xlrd<2.0  # https://github.com/brightway-lca/brightway2-io/issues/86
+    - xlrd <2.0  # https://github.com/brightway-lca/brightway2-io/issues/86
 
 about:
   home: https://github.com/LCA-ActivityBrowser/activity-browser

diff --git a/recipe/meta.yaml b/recipe/meta.yaml
@@ -27,15 +27,15 @@ requirements:
     - numpy >=1.20.2
     - arrow
     - brightway2 >=2.1.2
-    - bw2io >=0.7.dev1
+    - bw2io >=0.8.6
     - bw2data >=3.6.1
     - eidl >=1.2.0
     - fuzzywuzzy
     - matplotlib-base >=2.2.2
     - networkx
     - pandas >=0.24.1
     - pyside2 >=5.13.1
-    - salib >=1.3.11
+    - salib >=1.4
     - seaborn
     - presamples
     - openpyxl