ecoinvent 3.10 compatibility #1308

mrvisscher · 2024-06-06T14:09:28Z

Replaced the default install chain with a ProjectSetupWizard that will either install the biosphere3 packaged with bw2io, or use ecoinvent_interface to download and install a specific version of ecoinvent and matching biosphere.

See where tests break

Fixes

Fix default install tests
Check or remove Python 3.8 & 3.9 compatibility
Discuss Python 3.8 & 3.9 compatibility

Checklist

Keep pull requests small so they can be easily reviewed.
Update the documentation, please follow the numpy style guide.
Update tests.
Categorize the PR by setting a good title and adding one of the labels:
bug, feature, ui, change, documentation, breaking, ci
as they show up in the changelog.
Link this PR to related issues by using closing keywords.
Add a milestone to the PR (and related issues, if any) for the intended release.
Request a review from another developer.

Will add a `ignore-revs` commit after this one.

* Last commit changed the whole project by applying formatting. This avoids showing this commit on git blame. Ideally, this is achieved globally by running the following: ```sh $ git config blame.ignoreRevsFile .git-blame-ignore-revs ``` Signed-off-by: João Gonçalves <jsvgoncalves@gmail.com>

also cleanup the login signal and move them out of the downloader

coveralls · 2024-06-06T15:22:25Z

coverage: 55.448% (-0.8%) from 56.242%
when pulling 6bcc974 on mrvisscher:project-setup-wizard
into cc7ea7b on LCA-ActivityBrowser:main.

coveralls · 2024-06-06T15:25:21Z

coverage: 55.482% (-0.8%) from 56.242%
when pulling 5e99b6c on mrvisscher:project-setup-wizard
into cc7ea7b on LCA-ActivityBrowser:main.

going back and forth between the wizard pages can set this to an empty string and cause an exception

still have a fallback if the provided file is 7z

# Conflicts: # activity_browser/actions/default_install.py # activity_browser/mod/__init__.py # activity_browser/ui/threading.py # tests/actions/test_various_actions.py

coveralls · 2024-06-11T13:31:37Z

coverage: 55.314% (-0.8%) from 56.101%
when pulling 760fc19 on mrvisscher:project-setup-wizard
into ee24c15 on LCA-ActivityBrowser:main.

marc-vdm

Minor comments, just see per comment if you change or reject, then looks fine to merge to me!

marc-vdm · 2024-06-19T11:13:01Z

activity_browser/ui/wizards/project_setup_wizard.py

+        self.setSubTitle("Choose how you want to set up you project")
+
+        # radio buttons for the setup mode
+        radio_1 = QtWidgets.QRadioButton("Biosphere3")


Perhaps add a tooltip/label/info that user can still install ei later if they don't do so now.

marc-vdm · 2024-06-19T11:13:21Z

activity_browser/mod/bw2io/ecoinvent.py

+    from bw2io import migrations
+    from .migrations import ab_create_core_migrations
+
+    # if not len(migrations):


marc-vdm · 2024-06-19T11:31:28Z

activity_browser/ui/wizards/project_setup_wizard.py

+                self.message.setText("Unknown connection error, try again later.")
+                raise e
+
+        # in case of success, set the settings for permanent use


Fine for now, but we need to add option for user to remember or not and to remove stored credentials

tests/actions/test_various_actions.py

marc-vdm · 2024-06-19T11:43:38Z

activity_browser/mod/ecoinvent_interface/release.py

+                )
+                filename = possible[1]
+            else:
+                ERROR = """"Can't find predicted filename {filename}.


One " too many and needs to be f"""..."""

activity_browser/actions/default_install.py

activity_browser/mod/ecoinvent_interface/__init__.py

marc-vdm · 2024-06-19T12:02:20Z

activity_browser/mod/ecoinvent_interface/release.py

+                out_filepath.unlink()
+            except PermissionError:
+                # Error on Windows during testing
+                message = """"Can't automatically delete {out_filepath}


Same as earlier, " and f""

…setup-wizard # Conflicts: # .github/workflows/main.yaml

…terface' into project-setup-wizard # Conflicts: # .git-blame-ignore-revs # activity_browser/__init__.py # activity_browser/actions/__init__.py # activity_browser/actions/activity/activity_delete.py # activity_browser/actions/activity/activity_relink.py # activity_browser/actions/biosphere_update.py # activity_browser/actions/database/database_delete.py # activity_browser/actions/database/database_relink.py # activity_browser/actions/default_install.py # activity_browser/actions/parameter/parameter_clear_broken.py # activity_browser/actions/parameter/parameter_delete.py # activity_browser/actions/parameter/parameter_rename.py # activity_browser/bwutils/__init__.py # activity_browser/bwutils/calculations.py # activity_browser/bwutils/exporters.py # activity_browser/bwutils/importers.py # activity_browser/bwutils/metadata.py # activity_browser/bwutils/multilca.py # activity_browser/bwutils/sensitivity_analysis.py # activity_browser/bwutils/strategies.py # activity_browser/bwutils/superstructure/__init__.py # activity_browser/bwutils/superstructure/graph_traversal_with_scenario.py # activity_browser/bwutils/superstructure/manager.py # activity_browser/bwutils/superstructure/mlca.py # activity_browser/bwutils/utils.py # activity_browser/controllers/plugin.py # activity_browser/layouts/panels/__init__.py # activity_browser/layouts/panels/right.py # activity_browser/layouts/tabs/LCA_results_tab.py # activity_browser/layouts/tabs/LCA_results_tabs.py # activity_browser/layouts/tabs/LCA_setup.py # activity_browser/layouts/tabs/__init__.py # activity_browser/layouts/tabs/activity.py # activity_browser/layouts/tabs/parameters.py # activity_browser/layouts/tabs/project_manager.py # activity_browser/logger.py # activity_browser/mod/__init__.py # activity_browser/mod/bw2data/backends/base.py # activity_browser/mod/bw2data/backends/proxies.py # activity_browser/ui/menu_bar.py # activity_browser/ui/tables/LCA_setup.py # activity_browser/ui/tables/__init__.py # activity_browser/ui/tables/delegates/__init__.py # activity_browser/ui/tables/impact_categories.py # activity_browser/ui/tables/inventory.py # activity_browser/ui/tables/models/__init__.py # activity_browser/ui/tables/models/activity.py # activity_browser/ui/tables/models/base.py # activity_browser/ui/tables/models/inventory.py # activity_browser/ui/tables/models/parameters.py # activity_browser/ui/tables/parameters.py # activity_browser/ui/tables/projects.py # activity_browser/ui/tables/views.py # activity_browser/ui/threading.py # activity_browser/ui/web/base.py # activity_browser/ui/web/sankey_navigator.py # activity_browser/ui/widgets/__init__.py # activity_browser/ui/widgets/cutoff_menu.py # activity_browser/ui/widgets/dialog.py # activity_browser/ui/wizards/db_import_wizard.py # activity_browser/utils.py # recipe/meta.yaml # tests/actions/test_activity_actions.py # tests/actions/test_calculation_setup_actions.py # tests/actions/test_database_actions.py # tests/actions/test_exchange_actions.py # tests/actions/test_method_actions.py # tests/actions/test_parameter_actions.py # tests/actions/test_project_actions.py # tests/actions/test_various_actions.py # tests/conftest.py # tests/legacy/test_uncertainty.py # tests/legacy/test_widgets.py # tests/wizards/test_uncertainty_wizard.py

coveralls · 2024-06-25T11:49:01Z

coverage: 54.444% (-0.8%) from 55.287%
when pulling 6a2dd94 on mrvisscher:project-setup-wizard
into 5c523ee on LCA-ActivityBrowser:main.

coveralls · 2024-06-25T12:00:16Z

coverage: 54.444% (-0.8%) from 55.287%
when pulling ee31373 on mrvisscher:project-setup-wizard
into 5c523ee on LCA-ActivityBrowser:main.

coveralls · 2024-06-25T12:03:25Z

coverage: 54.444% (-0.8%) from 55.287%
when pulling 2d188d6 on mrvisscher:project-setup-wizard
into 5c523ee on LCA-ActivityBrowser:main.

jsvgoncalves and others added 26 commits June 4, 2024 14:08

Make main branch the default

ea7eff0

isort and black linting

5cfe149

Stop Numpy 2 breaking changes

a1dd7ed

Add some new required libraries

aa673ac

isort and black linting

5cde894

Will add a `ignore-revs` commit after this one.

Use safe_filename from bw_processing

8a29fc1

Fix missing pprint.pformat import

c14018f

Merge branch 'main' into brightway25

ae8568d

isort blew up __init__ import order

7c92ac9

Don't silence stderr during 25 development

ae5c8f8

Start switch to bw_graph_tools

903a0dd

Avoid circular import

52141e9

Work only on 25 projects

4eb2d4d

Remove incorrect type check for calculation setups

aeae168

feat: support login workflow with ecoinvent_interface

4d43cf1

feat: update ecoinvent version page

61fb2fb

feat: implement downloading and extract file

723a1e6

also cleanup the login signal and move them out of the downloader

fix: import errors

db71352

fix: always download ecospold file

6796052

fix: activity browser sqlite3 superclass

efb1c94

feat: support listing cached downloads

41cb2c9

Rebase onto main

8d6fb53

Reordering pages and threads

fe2bf25

Updating to new user feedback system

5f6bdcb

Added setup wizard to Activity Browser

50a1965

mrvisscher requested a review from marc-vdm June 6, 2024 14:09

mrvisscher added 3 commits June 6, 2024 16:15

meta.yaml update

c79a1c9

remove libxml2 pin

fe55f0f

Testing fixes

6bcc974

Testing only 3.10 & 3.11

5e99b6c

will7200 and others added 11 commits June 6, 2024 23:32

chore: update typings

f12ec3b

chore: remove explict inheritance for downloader

429f740

feat: skip login page if user has valid credentials

4eaec6d

fix: handle case when version is empty

3245bca

going back and forth between the wizard pages can set this to an empty string and cause an exception

fix: filter catalog items for ecoSpold02 files only

c9c93ec

feat: update biosphere_database preference on import

65ac1dc

fix: handle case when no ecoinvent credentials are pre-configured

bd5c355

refactor: use extract of ecoinvent

e6fa005

still have a fallback if the provided file is 7z

feat: add page to create versioned biosphere database

a7d87e1

Merge branch 'refs/heads/main' into project-setup-wizard

2e46afc

# Conflicts: # activity_browser/actions/default_install.py # activity_browser/mod/__init__.py # activity_browser/ui/threading.py # tests/actions/test_various_actions.py

Formatting

760fc19

marc-vdm reviewed Jun 19, 2024

View reviewed changes

marc-vdm linked an issue Jun 20, 2024 that may be closed by this pull request

Add ecoinvent 3.10 support #1163

Closed

4 tasks

marc-vdm added this to the 2.10 milestone Jun 20, 2024

mrvisscher added 3 commits June 25, 2024 11:47

Merge remote-tracking branch 'refs/remotes/origin/main' into project-…

4adb1e9

…setup-wizard # Conflicts: # .github/workflows/main.yaml

Made feat/ecoinvent_interface branch compatible

6a2dd94

mrvisscher added 2 commits June 25, 2024 13:56

Small fixes

ee31373

Removed eidl and Python 3.9 from dependencies

2d188d6

mrvisscher merged commit ab9cdaa into LCA-ActivityBrowser:main Jun 25, 2024
9 checks passed

marc-vdm added the feature Issues/PRs related to a new feature label Jun 25, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

ecoinvent 3.10 compatibility #1308

ecoinvent 3.10 compatibility #1308

mrvisscher commented Jun 6, 2024 •

edited by marc-vdm

Loading

coveralls commented Jun 6, 2024

coveralls commented Jun 6, 2024

coveralls commented Jun 11, 2024

marc-vdm left a comment

marc-vdm Jun 19, 2024

marc-vdm Jun 19, 2024

marc-vdm Jun 19, 2024

marc-vdm Jun 19, 2024

marc-vdm Jun 19, 2024

coveralls commented Jun 25, 2024

coveralls commented Jun 25, 2024

coveralls commented Jun 25, 2024

ecoinvent 3.10 compatibility #1308

ecoinvent 3.10 compatibility #1308

Conversation

mrvisscher commented Jun 6, 2024 • edited by marc-vdm Loading

Fixes

Checklist

coveralls commented Jun 6, 2024

coveralls commented Jun 6, 2024

coveralls commented Jun 11, 2024

marc-vdm left a comment

Choose a reason for hiding this comment

marc-vdm Jun 19, 2024

Choose a reason for hiding this comment

marc-vdm Jun 19, 2024

Choose a reason for hiding this comment

marc-vdm Jun 19, 2024

Choose a reason for hiding this comment

marc-vdm Jun 19, 2024

Choose a reason for hiding this comment

marc-vdm Jun 19, 2024

Choose a reason for hiding this comment

coveralls commented Jun 25, 2024

coveralls commented Jun 25, 2024

coveralls commented Jun 25, 2024

mrvisscher commented Jun 6, 2024 •

edited by marc-vdm

Loading