-
Notifications
You must be signed in to change notification settings - Fork 58
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Add 'duplicate to new location' option for duplicating processes #1051
Merged
marc-vdm
merged 37 commits into
LCA-ActivityBrowser:master
from
marc-vdm:duplicate_to_new_location
Oct 11, 2023
Merged
Add 'duplicate to new location' option for duplicating processes #1051
marc-vdm
merged 37 commits into
LCA-ActivityBrowser:master
from
marc-vdm:duplicate_to_new_location
Oct 11, 2023
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Update issue templates
Add issue config
Delete other option for github templates
Add burg-report yml
delete bug report md version
Remove unused fields
…ity-browser � Conflicts: � .github/ISSUE_TEMPLATE/config.yml � .github/ISSUE_TEMPLATE/something_else.yml
…ity-browser into duplicate_to_new_location
12 tasks
marc-vdm
added a commit
to marc-vdm/activity-browser
that referenced
this pull request
Nov 7, 2023
…tabase of own activity was not always added (in case none of the exchanges were in own database) 2) improve handling of multiple locations. 3) replaced exchanges were deleted from the old process instead of the new one.
marc-vdm
added a commit
to marc-vdm/activity-browser
that referenced
this pull request
Dec 4, 2023
…tabase of own activity was not always added (in case none of the exchanges were in own database) 2) improve handling of multiple locations. 3) replaced exchanges were deleted from the old process instead of the new one.
marc-vdm
added a commit
that referenced
this pull request
Dec 6, 2023
* Delete .github/workflows/install-canary.yaml * update bw2io requirement * Update readme install instructions * Update meta.yaml * Update README.md * Change requirement to brightway2 instead of bw2io * Update README.md * Increases the flexibility of the excel importer so it can also handle the parameter scenario files. * Update README.md How to install using Mamba * Set up signals infrascructure * Implement dialog * Implement finding of suitable alternatives and proper management of failing that. * Implement actual relinking * Minor documentation improvements + store exchanges to remove instead of to keep. * Minor documentation + code improvements * Resolve #782 + improve documentation of `Contributions` class * Minor documentation + code improvements * Fix type hinting error * Update README.md * Update README.md * Update README.md * Updates to the functions get_relevant_flows and get_relevant_activities (#1069) * Updates to the functions from de Koning (get_relevant_flows and get_relevant_activities), avoiding use of pandas apply and using python map functionality for splitting pandas dataframes. * Update the use of DataFrame.applymap to DataFrame.map in the excel file importer module. * Multiple sdf update (#1083) * Updates to the logging system to avoid the print statement. Merging with commits for corrections to the uncertainty distributions that were included within the same branch. Improves thread safety in logging increasing stability in the multi-threaded processes. * Changes the creation of log files. Amends the uncertainty wizard test to correct for use of logging over the standard console. Adds the .logs to .gitignore. * 1) Simplifies the use of the python logging facility with QtThreads (as published on the python docs for logging), improving the stability of logging.\n2) Changes the generation of the logging object that is more compatible with pytest, supporting the existing test procedures. * Provides an update to the Model for the calculation_setup Methods table, corrects for deletion of impact assessment methods. Updates the routine to the lca_setup module for calling the logger. * Updates to the logger module, what was the ABLogger class is renamed to ABHandler. The module now contains the formats and settings for the Stream handlers. Calling of the methods in the other AB modules requires passing a logging.Logger instance and the name of the calling module. These are then incorporated into the wrapping routines in the class. Additions:\n 1) An error wrapper is provided and also explicitly provides a trace of the error.\n 2) A timestamp routine is provided and used for providing the file names for log files.\n 3) A standard location based on appdirs is provided and used for log file locations. * Corrections to the setup of the logger in the test_uncertainty_wizard module * Includes a change to the type used for the scenario columns when using multiple files with the combined (combinatoric) approach for the scenarios. Includes respective changes to the boolean tests applied to such Indexes. * Minor corrections to local repository branch, to keep changes aligned * Alterations to keep minor changes aligned with master branch and fork --------- Co-authored-by: zoo <[email protected]> * Use node16 actions for main pipeline * Use node16 actions in release pipeline * Use latest version of release-changelog-builder * Use node16 action for install canary pipeline * Remove the special build for arm architecture This was added before brightway2 supported multi-arch builds on conda-forge. It is not needed anymore, because the normal AB is now also installable on arm arch. * Install canary updates (#1093) * Increase timeout to 30 min Originally the idea was that installation should never take longer than 12 min, otherwise we should get a warning with the failed pipeline. But unfortuantely conda currently takes longer than 12 minutes to solve the environment. * Add mamba install canary * Download artifacts to start implementing env comparison * Looks like on linux it can take more than 30 minutes :-( * 60min not enough on linux, increasing to 120 * Completely remove timeout, default is 6 hours * Use solver libmamba option * Add diff step to compare installations * Use node16 actions * Re-add the 12 timeout * Split diff into separate steps * Yq action only runs on linux * debug yq formatting step * Simplify * more fighting with yq action * artifacts are apparently directories in this case * Try again with while loop * Run on all os, but only 3.9 * ignore diff exit code * Run canary install for 3.8 and 3.9 again --------- Co-authored-by: haasad <[email protected]> * Adding error message if no scenario file is loaded in a scenario LCA (#1085) * Updated and improved contributing file * Improve text on dependencies * Fix canary link * Add good/bad examples to CONTRIBUTING.md for commit messages and PR titles * Add more specific requirements on communicating work on issues in CONTRIBUTING.md * Minor updates to CONTRIBUTING.md and README.md * Minor improvements to CONTRIBUTING.md * Fix formatting error in PULL_REQUEST_TEMPLATE.md * Resolve #1105 * Update copyright and license information to only link to one place. * Resolve 3 bugs for location linking (#1051): 1) database of own activity was not always added (in case none of the exchanges were in own database) 2) improve handling of multiple locations. 3) replaced exchanges were deleted from the old process instead of the new one. * Improve choosing and handling of alternative locations for location choosing * Resolve readonly database bug for activity duplication to new activity. * Store AB version in logfile * Remove deprecated channels from conda envs * Remove experimental conda environment creation and upload I started this mostly as an experimental alternative install method with `conda env create`. However since the channel handling isn't such a pain anymore now that everything is on conda-forge this is obsolete. * Move conda-envs to .github directory * Move changelog config to .github * Move dev recipe to .github directory * Move stable recipe to recipe/meta.yaml * Update dev recipe * Use micromamba instead of miniconda to speed up tests * Update install instructions to use libmamba solver with conda * Fix path for dev recipe * Added tooltip for table content * Added docstring for data method * Cleaning-up documentation * Update README.md Resolve #1127 * Add - copy on impact category copy (#1136) * Add - copy on impact category copy #1133 * Reorder impact category tree context menu * Resolve bug with switching project on delete (#1138) * Switch project on delete #1075 * Cleaning up ProjectController.change_project * Resolving comments by marc-vdm * review instructions bot --------- Co-authored-by: bsteubing <[email protected]> Co-authored-by: zoophobus <[email protected]> Co-authored-by: Jonathan Kidner <[email protected]> Co-authored-by: zoo <[email protected]> Co-authored-by: haasad <[email protected]> Co-authored-by: Adrian Haas <[email protected]> Co-authored-by: Marin Visscher <[email protected]> Co-authored-by: Marin Visscher <[email protected]>
marc-vdm
added a commit
that referenced
this pull request
Dec 13, 2023
* Delete .github/workflows/install-canary.yaml * Remove unused code in montecarlo.py * Resolve #1103 * GH action script for commenting on issues when related milestone is closed. * update bw2io requirement * Update readme install instructions * Update meta.yaml * Update README.md * Change requirement to brightway2 instead of bw2io * Update README.md * Increases the flexibility of the excel importer so it can also handle the parameter scenario files. * Update README.md How to install using Mamba * Set up signals infrascructure * Implement dialog * Implement finding of suitable alternatives and proper management of failing that. * Implement actual relinking * Minor documentation improvements + store exchanges to remove instead of to keep. * Minor documentation + code improvements * Resolve #782 + improve documentation of `Contributions` class * Minor documentation + code improvements * Fix type hinting error * Update README.md * Update README.md * Update README.md * Updates to the functions get_relevant_flows and get_relevant_activities (#1069) * Updates to the functions from de Koning (get_relevant_flows and get_relevant_activities), avoiding use of pandas apply and using python map functionality for splitting pandas dataframes. * Update the use of DataFrame.applymap to DataFrame.map in the excel file importer module. * Multiple sdf update (#1083) * Updates to the logging system to avoid the print statement. Merging with commits for corrections to the uncertainty distributions that were included within the same branch. Improves thread safety in logging increasing stability in the multi-threaded processes. * Changes the creation of log files. Amends the uncertainty wizard test to correct for use of logging over the standard console. Adds the .logs to .gitignore. * 1) Simplifies the use of the python logging facility with QtThreads (as published on the python docs for logging), improving the stability of logging.\n2) Changes the generation of the logging object that is more compatible with pytest, supporting the existing test procedures. * Provides an update to the Model for the calculation_setup Methods table, corrects for deletion of impact assessment methods. Updates the routine to the lca_setup module for calling the logger. * Updates to the logger module, what was the ABLogger class is renamed to ABHandler. The module now contains the formats and settings for the Stream handlers. Calling of the methods in the other AB modules requires passing a logging.Logger instance and the name of the calling module. These are then incorporated into the wrapping routines in the class. Additions:\n 1) An error wrapper is provided and also explicitly provides a trace of the error.\n 2) A timestamp routine is provided and used for providing the file names for log files.\n 3) A standard location based on appdirs is provided and used for log file locations. * Corrections to the setup of the logger in the test_uncertainty_wizard module * Includes a change to the type used for the scenario columns when using multiple files with the combined (combinatoric) approach for the scenarios. Includes respective changes to the boolean tests applied to such Indexes. * Minor corrections to local repository branch, to keep changes aligned * Alterations to keep minor changes aligned with master branch and fork --------- Co-authored-by: zoo <[email protected]> * Use node16 actions for main pipeline * Use node16 actions in release pipeline * Use latest version of release-changelog-builder * Use node16 action for install canary pipeline * Remove the special build for arm architecture This was added before brightway2 supported multi-arch builds on conda-forge. It is not needed anymore, because the normal AB is now also installable on arm arch. * Install canary updates (#1093) * Increase timeout to 30 min Originally the idea was that installation should never take longer than 12 min, otherwise we should get a warning with the failed pipeline. But unfortuantely conda currently takes longer than 12 minutes to solve the environment. * Add mamba install canary * Download artifacts to start implementing env comparison * Looks like on linux it can take more than 30 minutes :-( * 60min not enough on linux, increasing to 120 * Completely remove timeout, default is 6 hours * Use solver libmamba option * Add diff step to compare installations * Use node16 actions * Re-add the 12 timeout * Split diff into separate steps * Yq action only runs on linux * debug yq formatting step * Simplify * more fighting with yq action * artifacts are apparently directories in this case * Try again with while loop * Run on all os, but only 3.9 * ignore diff exit code * Run canary install for 3.8 and 3.9 again --------- Co-authored-by: haasad <[email protected]> * Adding error message if no scenario file is loaded in a scenario LCA (#1085) * Updated and improved contributing file * Improve text on dependencies * Fix canary link * Add good/bad examples to CONTRIBUTING.md for commit messages and PR titles * Add more specific requirements on communicating work on issues in CONTRIBUTING.md * Minor updates to CONTRIBUTING.md and README.md * Minor improvements to CONTRIBUTING.md * Fix formatting error in PULL_REQUEST_TEMPLATE.md * Resolve #1105 * Update copyright and license information to only link to one place. * Resolve 3 bugs for location linking (#1051): 1) database of own activity was not always added (in case none of the exchanges were in own database) 2) improve handling of multiple locations. 3) replaced exchanges were deleted from the old process instead of the new one. * Improve choosing and handling of alternative locations for location choosing * Resolve readonly database bug for activity duplication to new activity. * Store AB version in logfile * Remove deprecated channels from conda envs * Remove experimental conda environment creation and upload I started this mostly as an experimental alternative install method with `conda env create`. However since the channel handling isn't such a pain anymore now that everything is on conda-forge this is obsolete. * Move conda-envs to .github directory * Move changelog config to .github * Move dev recipe to .github directory * Move stable recipe to recipe/meta.yaml * Update dev recipe * Use micromamba instead of miniconda to speed up tests * Update install instructions to use libmamba solver with conda * Fix path for dev recipe * Added tooltip for table content * Added docstring for data method * Cleaning-up documentation * Update README.md Resolve #1127 * Add - copy on impact category copy (#1136) * Add - copy on impact category copy #1133 * Reorder impact category tree context menu * Resolve bug with switching project on delete (#1138) * Switch project on delete #1075 * Cleaning up ProjectController.change_project * Resolving comments by marc-vdm * GH action script for commenting on issues when related milestone is closed. * GH action script for commenting on issues when related milestone is closed. * GH action script for commenting on issues when related milestone is closed. * review instructions bot * review instructions bot --------- Co-authored-by: bsteubing <[email protected]> Co-authored-by: zoophobus <[email protected]> Co-authored-by: Jonathan Kidner <[email protected]> Co-authored-by: zoo <[email protected]> Co-authored-by: haasad <[email protected]> Co-authored-by: Adrian Haas <[email protected]> Co-authored-by: Marin Visscher <[email protected]> Co-authored-by: Marin Visscher <[email protected]>
marc-vdm
added a commit
that referenced
this pull request
Dec 13, 2023
* Delete .github/workflows/install-canary.yaml * Add testing file * Get available AB versions per AB version from online file * Limit ecoinvent importer to versions compatible with this AB version * Implement choosing of version during biosphere update * Implement choosing of version during defaults import * Resolve offline bug + better updating * move compatible versions file * implement local file fallback * implement legacy biosphere imports for any chosen version AB is compatible with * update test * update test * update test * update test * update test * update test * resolve calculation setup bug where activites are checked when biosphere was updated. * minor updates to test documentation * GH action script for commenting on issues when related milestone is closed. * update bw2io requirement * Update readme install instructions * Update meta.yaml * Update README.md * Change requirement to brightway2 instead of bw2io * Update README.md * Increases the flexibility of the excel importer so it can also handle the parameter scenario files. * Update README.md How to install using Mamba * Set up signals infrascructure * Implement dialog * Implement finding of suitable alternatives and proper management of failing that. * Implement actual relinking * Minor documentation improvements + store exchanges to remove instead of to keep. * Minor documentation + code improvements * Resolve #782 + improve documentation of `Contributions` class * Minor documentation + code improvements * Fix type hinting error * Update README.md * Update README.md * Update README.md * Updates to the functions get_relevant_flows and get_relevant_activities (#1069) * Updates to the functions from de Koning (get_relevant_flows and get_relevant_activities), avoiding use of pandas apply and using python map functionality for splitting pandas dataframes. * Update the use of DataFrame.applymap to DataFrame.map in the excel file importer module. * Multiple sdf update (#1083) * Updates to the logging system to avoid the print statement. Merging with commits for corrections to the uncertainty distributions that were included within the same branch. Improves thread safety in logging increasing stability in the multi-threaded processes. * Changes the creation of log files. Amends the uncertainty wizard test to correct for use of logging over the standard console. Adds the .logs to .gitignore. * 1) Simplifies the use of the python logging facility with QtThreads (as published on the python docs for logging), improving the stability of logging.\n2) Changes the generation of the logging object that is more compatible with pytest, supporting the existing test procedures. * Provides an update to the Model for the calculation_setup Methods table, corrects for deletion of impact assessment methods. Updates the routine to the lca_setup module for calling the logger. * Updates to the logger module, what was the ABLogger class is renamed to ABHandler. The module now contains the formats and settings for the Stream handlers. Calling of the methods in the other AB modules requires passing a logging.Logger instance and the name of the calling module. These are then incorporated into the wrapping routines in the class. Additions:\n 1) An error wrapper is provided and also explicitly provides a trace of the error.\n 2) A timestamp routine is provided and used for providing the file names for log files.\n 3) A standard location based on appdirs is provided and used for log file locations. * Corrections to the setup of the logger in the test_uncertainty_wizard module * Includes a change to the type used for the scenario columns when using multiple files with the combined (combinatoric) approach for the scenarios. Includes respective changes to the boolean tests applied to such Indexes. * Minor corrections to local repository branch, to keep changes aligned * Alterations to keep minor changes aligned with master branch and fork --------- Co-authored-by: zoo <[email protected]> * Use node16 actions for main pipeline * Use node16 actions in release pipeline * Use latest version of release-changelog-builder * Use node16 action for install canary pipeline * Remove the special build for arm architecture This was added before brightway2 supported multi-arch builds on conda-forge. It is not needed anymore, because the normal AB is now also installable on arm arch. * Install canary updates (#1093) * Increase timeout to 30 min Originally the idea was that installation should never take longer than 12 min, otherwise we should get a warning with the failed pipeline. But unfortuantely conda currently takes longer than 12 minutes to solve the environment. * Add mamba install canary * Download artifacts to start implementing env comparison * Looks like on linux it can take more than 30 minutes :-( * 60min not enough on linux, increasing to 120 * Completely remove timeout, default is 6 hours * Use solver libmamba option * Add diff step to compare installations * Use node16 actions * Re-add the 12 timeout * Split diff into separate steps * Yq action only runs on linux * debug yq formatting step * Simplify * more fighting with yq action * artifacts are apparently directories in this case * Try again with while loop * Run on all os, but only 3.9 * ignore diff exit code * Run canary install for 3.8 and 3.9 again --------- Co-authored-by: haasad <[email protected]> * Adding error message if no scenario file is loaded in a scenario LCA (#1085) * Updated and improved contributing file * Improve text on dependencies * Fix canary link * Add good/bad examples to CONTRIBUTING.md for commit messages and PR titles * Add more specific requirements on communicating work on issues in CONTRIBUTING.md * Minor updates to CONTRIBUTING.md and README.md * Minor improvements to CONTRIBUTING.md * Fix formatting error in PULL_REQUEST_TEMPLATE.md * Resolve #1105 * Update copyright and license information to only link to one place. * Resolve 3 bugs for location linking (#1051): 1) database of own activity was not always added (in case none of the exchanges were in own database) 2) improve handling of multiple locations. 3) replaced exchanges were deleted from the old process instead of the new one. * Improve choosing and handling of alternative locations for location choosing * Resolve readonly database bug for activity duplication to new activity. * Store AB version in logfile * Remove deprecated channels from conda envs * Remove experimental conda environment creation and upload I started this mostly as an experimental alternative install method with `conda env create`. However since the channel handling isn't such a pain anymore now that everything is on conda-forge this is obsolete. * Move conda-envs to .github directory * Move changelog config to .github * Move dev recipe to .github directory * Move stable recipe to recipe/meta.yaml * Update dev recipe * Use micromamba instead of miniconda to speed up tests * Update install instructions to use libmamba solver with conda * Fix path for dev recipe * Added tooltip for table content * Added docstring for data method * Cleaning-up documentation * Update README.md Resolve #1127 * Add - copy on impact category copy (#1136) * Add - copy on impact category copy #1133 * Reorder impact category tree context menu * Resolve bug with switching project on delete (#1138) * Switch project on delete #1075 * Cleaning up ProjectController.change_project * Resolving comments by marc-vdm * GH action script for commenting on issues when related milestone is closed. * GH action script for commenting on issues when related milestone is closed. * GH action script for commenting on issues when related milestone is closed. * Add test for semantic version sort * review instructions bot * review instructions bot * Update dialog text * Passed main windows as parent to popup * Update safe_link_fetch from utils * Update safe_link_fetch from utils and update link to correct repo * Update safe_link_fetch from utils and update link to correct repo --------- Co-authored-by: bsteubing <[email protected]> Co-authored-by: zoophobus <[email protected]> Co-authored-by: Jonathan Kidner <[email protected]> Co-authored-by: zoo <[email protected]> Co-authored-by: haasad <[email protected]> Co-authored-by: Adrian Haas <[email protected]> Co-authored-by: Marin Visscher <[email protected]> Co-authored-by: Marin Visscher <[email protected]>
mrvisscher
added a commit
that referenced
this pull request
Dec 20, 2023
* Delete .github/workflows/install-canary.yaml * GH action script for commenting on issues when related milestone is closed. * update bw2io requirement * Update readme install instructions * Update meta.yaml * Update README.md * Change requirement to brightway2 instead of bw2io * Update README.md * Increases the flexibility of the excel importer so it can also handle the parameter scenario files. * Update README.md How to install using Mamba * Set up signals infrascructure * Implement dialog * Implement finding of suitable alternatives and proper management of failing that. * Implement actual relinking * Minor documentation improvements + store exchanges to remove instead of to keep. * Minor documentation + code improvements * Resolve #782 + improve documentation of `Contributions` class * Minor documentation + code improvements * Fix type hinting error * Update README.md * Update README.md * Update README.md * Updates to the functions get_relevant_flows and get_relevant_activities (#1069) * Updates to the functions from de Koning (get_relevant_flows and get_relevant_activities), avoiding use of pandas apply and using python map functionality for splitting pandas dataframes. * Update the use of DataFrame.applymap to DataFrame.map in the excel file importer module. * Multiple sdf update (#1083) * Updates to the logging system to avoid the print statement. Merging with commits for corrections to the uncertainty distributions that were included within the same branch. Improves thread safety in logging increasing stability in the multi-threaded processes. * Changes the creation of log files. Amends the uncertainty wizard test to correct for use of logging over the standard console. Adds the .logs to .gitignore. * 1) Simplifies the use of the python logging facility with QtThreads (as published on the python docs for logging), improving the stability of logging.\n2) Changes the generation of the logging object that is more compatible with pytest, supporting the existing test procedures. * Provides an update to the Model for the calculation_setup Methods table, corrects for deletion of impact assessment methods. Updates the routine to the lca_setup module for calling the logger. * Updates to the logger module, what was the ABLogger class is renamed to ABHandler. The module now contains the formats and settings for the Stream handlers. Calling of the methods in the other AB modules requires passing a logging.Logger instance and the name of the calling module. These are then incorporated into the wrapping routines in the class. Additions:\n 1) An error wrapper is provided and also explicitly provides a trace of the error.\n 2) A timestamp routine is provided and used for providing the file names for log files.\n 3) A standard location based on appdirs is provided and used for log file locations. * Corrections to the setup of the logger in the test_uncertainty_wizard module * Includes a change to the type used for the scenario columns when using multiple files with the combined (combinatoric) approach for the scenarios. Includes respective changes to the boolean tests applied to such Indexes. * Minor corrections to local repository branch, to keep changes aligned * Alterations to keep minor changes aligned with master branch and fork --------- Co-authored-by: zoo <[email protected]> * Use node16 actions for main pipeline * Use node16 actions in release pipeline * Use latest version of release-changelog-builder * Use node16 action for install canary pipeline * Remove the special build for arm architecture This was added before brightway2 supported multi-arch builds on conda-forge. It is not needed anymore, because the normal AB is now also installable on arm arch. * Install canary updates (#1093) * Increase timeout to 30 min Originally the idea was that installation should never take longer than 12 min, otherwise we should get a warning with the failed pipeline. But unfortuantely conda currently takes longer than 12 minutes to solve the environment. * Add mamba install canary * Download artifacts to start implementing env comparison * Looks like on linux it can take more than 30 minutes :-( * 60min not enough on linux, increasing to 120 * Completely remove timeout, default is 6 hours * Use solver libmamba option * Add diff step to compare installations * Use node16 actions * Re-add the 12 timeout * Split diff into separate steps * Yq action only runs on linux * debug yq formatting step * Simplify * more fighting with yq action * artifacts are apparently directories in this case * Try again with while loop * Run on all os, but only 3.9 * ignore diff exit code * Run canary install for 3.8 and 3.9 again --------- Co-authored-by: haasad <[email protected]> * Adding error message if no scenario file is loaded in a scenario LCA (#1085) * Updated and improved contributing file * Improve text on dependencies * Fix canary link * Add good/bad examples to CONTRIBUTING.md for commit messages and PR titles * Add more specific requirements on communicating work on issues in CONTRIBUTING.md * Minor updates to CONTRIBUTING.md and README.md * Minor improvements to CONTRIBUTING.md * Fix formatting error in PULL_REQUEST_TEMPLATE.md * Resolve #1105 * Update copyright and license information to only link to one place. * Resolve 3 bugs for location linking (#1051): 1) database of own activity was not always added (in case none of the exchanges were in own database) 2) improve handling of multiple locations. 3) replaced exchanges were deleted from the old process instead of the new one. * Improve choosing and handling of alternative locations for location choosing * Resolve readonly database bug for activity duplication to new activity. * Store AB version in logfile * Remove deprecated channels from conda envs * Remove experimental conda environment creation and upload I started this mostly as an experimental alternative install method with `conda env create`. However since the channel handling isn't such a pain anymore now that everything is on conda-forge this is obsolete. * Move conda-envs to .github directory * Move changelog config to .github * Move dev recipe to .github directory * Move stable recipe to recipe/meta.yaml * Update dev recipe * Use micromamba instead of miniconda to speed up tests * Update install instructions to use libmamba solver with conda * Fix path for dev recipe * Added tooltip for table content * Added docstring for data method * Cleaning-up documentation * Update README.md Resolve #1127 * Add - copy on impact category copy (#1136) * Add - copy on impact category copy #1133 * Reorder impact category tree context menu * Resolve bug with switching project on delete (#1138) * Switch project on delete #1075 * Cleaning up ProjectController.change_project * Resolving comments by marc-vdm * GH action script for commenting on issues when related milestone is closed. * GH action script for commenting on issues when related milestone is closed. * GH action script for commenting on issues when related milestone is closed. * GH action script for commenting on issues when related milestone is closed. * Update notification message to include link to updates mailing list. * Update notification message formatting * review instructions bot * review instructions bot * review instructions bot * review instructions bot * review instructions bot * Remove PR review bot --------- Co-authored-by: bsteubing <[email protected]> Co-authored-by: zoophobus <[email protected]> Co-authored-by: Jonathan Kidner <[email protected]> Co-authored-by: zoo <[email protected]> Co-authored-by: haasad <[email protected]> Co-authored-by: Adrian Haas <[email protected]> Co-authored-by: Marin Visscher <[email protected]> Co-authored-by: Marin Visscher <[email protected]>
marc-vdm
added a commit
that referenced
this pull request
Dec 20, 2023
* Delete .github/workflows/install-canary.yaml * GH action script for commenting on issues when related milestone is closed. * update bw2io requirement * Update readme install instructions * Update meta.yaml * Update README.md * Change requirement to brightway2 instead of bw2io * Update README.md * Increases the flexibility of the excel importer so it can also handle the parameter scenario files. * Update README.md How to install using Mamba * Set up signals infrascructure * Implement dialog * Implement finding of suitable alternatives and proper management of failing that. * Implement actual relinking * Minor documentation improvements + store exchanges to remove instead of to keep. * Minor documentation + code improvements * Resolve #782 + improve documentation of `Contributions` class * Minor documentation + code improvements * Fix type hinting error * Update README.md * Update README.md * Update README.md * Updates to the functions get_relevant_flows and get_relevant_activities (#1069) * Updates to the functions from de Koning (get_relevant_flows and get_relevant_activities), avoiding use of pandas apply and using python map functionality for splitting pandas dataframes. * Update the use of DataFrame.applymap to DataFrame.map in the excel file importer module. * Multiple sdf update (#1083) * Updates to the logging system to avoid the print statement. Merging with commits for corrections to the uncertainty distributions that were included within the same branch. Improves thread safety in logging increasing stability in the multi-threaded processes. * Changes the creation of log files. Amends the uncertainty wizard test to correct for use of logging over the standard console. Adds the .logs to .gitignore. * 1) Simplifies the use of the python logging facility with QtThreads (as published on the python docs for logging), improving the stability of logging.\n2) Changes the generation of the logging object that is more compatible with pytest, supporting the existing test procedures. * Provides an update to the Model for the calculation_setup Methods table, corrects for deletion of impact assessment methods. Updates the routine to the lca_setup module for calling the logger. * Updates to the logger module, what was the ABLogger class is renamed to ABHandler. The module now contains the formats and settings for the Stream handlers. Calling of the methods in the other AB modules requires passing a logging.Logger instance and the name of the calling module. These are then incorporated into the wrapping routines in the class. Additions:\n 1) An error wrapper is provided and also explicitly provides a trace of the error.\n 2) A timestamp routine is provided and used for providing the file names for log files.\n 3) A standard location based on appdirs is provided and used for log file locations. * Corrections to the setup of the logger in the test_uncertainty_wizard module * Includes a change to the type used for the scenario columns when using multiple files with the combined (combinatoric) approach for the scenarios. Includes respective changes to the boolean tests applied to such Indexes. * Minor corrections to local repository branch, to keep changes aligned * Alterations to keep minor changes aligned with master branch and fork --------- Co-authored-by: zoo <[email protected]> * Use node16 actions for main pipeline * Use node16 actions in release pipeline * Use latest version of release-changelog-builder * Use node16 action for install canary pipeline * Remove the special build for arm architecture This was added before brightway2 supported multi-arch builds on conda-forge. It is not needed anymore, because the normal AB is now also installable on arm arch. * Install canary updates (#1093) * Increase timeout to 30 min Originally the idea was that installation should never take longer than 12 min, otherwise we should get a warning with the failed pipeline. But unfortuantely conda currently takes longer than 12 minutes to solve the environment. * Add mamba install canary * Download artifacts to start implementing env comparison * Looks like on linux it can take more than 30 minutes :-( * 60min not enough on linux, increasing to 120 * Completely remove timeout, default is 6 hours * Use solver libmamba option * Add diff step to compare installations * Use node16 actions * Re-add the 12 timeout * Split diff into separate steps * Yq action only runs on linux * debug yq formatting step * Simplify * more fighting with yq action * artifacts are apparently directories in this case * Try again with while loop * Run on all os, but only 3.9 * ignore diff exit code * Run canary install for 3.8 and 3.9 again --------- Co-authored-by: haasad <[email protected]> * Adding error message if no scenario file is loaded in a scenario LCA (#1085) * Updated and improved contributing file * Improve text on dependencies * Fix canary link * Add good/bad examples to CONTRIBUTING.md for commit messages and PR titles * Add more specific requirements on communicating work on issues in CONTRIBUTING.md * Minor updates to CONTRIBUTING.md and README.md * Minor improvements to CONTRIBUTING.md * Fix formatting error in PULL_REQUEST_TEMPLATE.md * Resolve #1105 * Update copyright and license information to only link to one place. * Resolve 3 bugs for location linking (#1051): 1) database of own activity was not always added (in case none of the exchanges were in own database) 2) improve handling of multiple locations. 3) replaced exchanges were deleted from the old process instead of the new one. * Improve choosing and handling of alternative locations for location choosing * Resolve readonly database bug for activity duplication to new activity. * Store AB version in logfile * Remove deprecated channels from conda envs * Remove experimental conda environment creation and upload I started this mostly as an experimental alternative install method with `conda env create`. However since the channel handling isn't such a pain anymore now that everything is on conda-forge this is obsolete. * Move conda-envs to .github directory * Move changelog config to .github * Move dev recipe to .github directory * Move stable recipe to recipe/meta.yaml * Update dev recipe * Use micromamba instead of miniconda to speed up tests * Update install instructions to use libmamba solver with conda * Fix path for dev recipe * Added tooltip for table content * Added docstring for data method * Cleaning-up documentation * Update README.md Resolve #1127 * Add - copy on impact category copy (#1136) * Add - copy on impact category copy #1133 * Reorder impact category tree context menu * Resolve bug with switching project on delete (#1138) * Switch project on delete #1075 * Cleaning up ProjectController.change_project * Resolving comments by marc-vdm * GH action script for commenting on issues when related milestone is closed. * GH action script for commenting on issues when related milestone is closed. * GH action script for commenting on issues when related milestone is closed. * Strip whitespace from search fields + implement auto-search for search boxes in databases and impact categories + remove some unused code... * review instructions bot * review instructions bot * Assertion for biosphere install in test * Added test for project deletion * Disasbled biosphere search test * Updated search biosphere test * Changed a logger to reduce console spam during search --------- Co-authored-by: bsteubing <[email protected]> Co-authored-by: zoophobus <[email protected]> Co-authored-by: Jonathan Kidner <[email protected]> Co-authored-by: zoo <[email protected]> Co-authored-by: haasad <[email protected]> Co-authored-by: Adrian Haas <[email protected]> Co-authored-by: Marin Visscher <[email protected]> Co-authored-by: Marin Visscher <[email protected]>
marc-vdm
added a commit
that referenced
this pull request
Dec 20, 2023
* Delete .github/workflows/install-canary.yaml * GH action script for commenting on issues when related milestone is closed. * update bw2io requirement * Update readme install instructions * Update meta.yaml * Update README.md * Change requirement to brightway2 instead of bw2io * Update README.md * Increases the flexibility of the excel importer so it can also handle the parameter scenario files. * Update README.md How to install using Mamba * Set up signals infrascructure * Implement dialog * Implement finding of suitable alternatives and proper management of failing that. * Implement actual relinking * Minor documentation improvements + store exchanges to remove instead of to keep. * Minor documentation + code improvements * Resolve #782 + improve documentation of `Contributions` class * Minor documentation + code improvements * Fix type hinting error * Update README.md * Update README.md * Update README.md * Updates to the functions get_relevant_flows and get_relevant_activities (#1069) * Updates to the functions from de Koning (get_relevant_flows and get_relevant_activities), avoiding use of pandas apply and using python map functionality for splitting pandas dataframes. * Update the use of DataFrame.applymap to DataFrame.map in the excel file importer module. * Multiple sdf update (#1083) * Updates to the logging system to avoid the print statement. Merging with commits for corrections to the uncertainty distributions that were included within the same branch. Improves thread safety in logging increasing stability in the multi-threaded processes. * Changes the creation of log files. Amends the uncertainty wizard test to correct for use of logging over the standard console. Adds the .logs to .gitignore. * 1) Simplifies the use of the python logging facility with QtThreads (as published on the python docs for logging), improving the stability of logging.\n2) Changes the generation of the logging object that is more compatible with pytest, supporting the existing test procedures. * Provides an update to the Model for the calculation_setup Methods table, corrects for deletion of impact assessment methods. Updates the routine to the lca_setup module for calling the logger. * Updates to the logger module, what was the ABLogger class is renamed to ABHandler. The module now contains the formats and settings for the Stream handlers. Calling of the methods in the other AB modules requires passing a logging.Logger instance and the name of the calling module. These are then incorporated into the wrapping routines in the class. Additions:\n 1) An error wrapper is provided and also explicitly provides a trace of the error.\n 2) A timestamp routine is provided and used for providing the file names for log files.\n 3) A standard location based on appdirs is provided and used for log file locations. * Corrections to the setup of the logger in the test_uncertainty_wizard module * Includes a change to the type used for the scenario columns when using multiple files with the combined (combinatoric) approach for the scenarios. Includes respective changes to the boolean tests applied to such Indexes. * Minor corrections to local repository branch, to keep changes aligned * Alterations to keep minor changes aligned with master branch and fork --------- Co-authored-by: zoo <[email protected]> * Use node16 actions for main pipeline * Use node16 actions in release pipeline * Use latest version of release-changelog-builder * Use node16 action for install canary pipeline * Remove the special build for arm architecture This was added before brightway2 supported multi-arch builds on conda-forge. It is not needed anymore, because the normal AB is now also installable on arm arch. * Install canary updates (#1093) * Increase timeout to 30 min Originally the idea was that installation should never take longer than 12 min, otherwise we should get a warning with the failed pipeline. But unfortuantely conda currently takes longer than 12 minutes to solve the environment. * Add mamba install canary * Download artifacts to start implementing env comparison * Looks like on linux it can take more than 30 minutes :-( * 60min not enough on linux, increasing to 120 * Completely remove timeout, default is 6 hours * Use solver libmamba option * Add diff step to compare installations * Use node16 actions * Re-add the 12 timeout * Split diff into separate steps * Yq action only runs on linux * debug yq formatting step * Simplify * more fighting with yq action * artifacts are apparently directories in this case * Try again with while loop * Run on all os, but only 3.9 * ignore diff exit code * Run canary install for 3.8 and 3.9 again --------- Co-authored-by: haasad <[email protected]> * Adding error message if no scenario file is loaded in a scenario LCA (#1085) * Updated and improved contributing file * Improve text on dependencies * Fix canary link * Add good/bad examples to CONTRIBUTING.md for commit messages and PR titles * Add more specific requirements on communicating work on issues in CONTRIBUTING.md * Minor updates to CONTRIBUTING.md and README.md * Minor improvements to CONTRIBUTING.md * Fix formatting error in PULL_REQUEST_TEMPLATE.md * Resolve #1105 * Update copyright and license information to only link to one place. * Resolve 3 bugs for location linking (#1051): 1) database of own activity was not always added (in case none of the exchanges were in own database) 2) improve handling of multiple locations. 3) replaced exchanges were deleted from the old process instead of the new one. * Improve choosing and handling of alternative locations for location choosing * Resolve readonly database bug for activity duplication to new activity. * Store AB version in logfile * Remove deprecated channels from conda envs * Remove experimental conda environment creation and upload I started this mostly as an experimental alternative install method with `conda env create`. However since the channel handling isn't such a pain anymore now that everything is on conda-forge this is obsolete. * Move conda-envs to .github directory * Move changelog config to .github * Move dev recipe to .github directory * Move stable recipe to recipe/meta.yaml * Update dev recipe * Use micromamba instead of miniconda to speed up tests * Update install instructions to use libmamba solver with conda * Fix path for dev recipe * Added tooltip for table content * Added docstring for data method * Cleaning-up documentation * Update README.md Resolve #1127 * Add - copy on impact category copy (#1136) * Add - copy on impact category copy #1133 * Reorder impact category tree context menu * Resolve bug with switching project on delete (#1138) * Switch project on delete #1075 * Cleaning up ProjectController.change_project * Resolving comments by marc-vdm * GH action script for commenting on issues when related milestone is closed. * GH action script for commenting on issues when related milestone is closed. * GH action script for commenting on issues when related milestone is closed. * review instructions bot * review instructions bot * Fix non-zero reference flow message * Fix msg formatting * Resolve comments --------- Co-authored-by: bsteubing <[email protected]> Co-authored-by: zoophobus <[email protected]> Co-authored-by: Jonathan Kidner <[email protected]> Co-authored-by: zoo <[email protected]> Co-authored-by: haasad <[email protected]> Co-authored-by: Adrian Haas <[email protected]> Co-authored-by: Marin Visscher <[email protected]> Co-authored-by: Marin Visscher <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Resolves #1042
Adds option to the Activities overview to duplicate an activity to another location. Choosing this option opens a dialog that allows the user to re-link the duplicated activity to another location.
By default the function re-links activities that match exactly to the chosen location (e.g. in
acitivity 1, Loc A
the exchangemarket for electricity, Loc A
links tomarket for electricity, Loc B
ifLoc B
was chosen, the exchangeSteel, Loc C
is left alone. User can choose to use 'fall back' alternativesRoW
andGLO
though. This means that ifmarket for electricity, Loc B
does not exist, butmarket for electricity, RoW
does, a link is made to generic location instead.RoW
is tried always tried beforeGLO
is tried.Checklist
bug
,feature
,ui
,change
,documentation
,breaking
,ci
as they show up in the changelog