Skip to content
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

Resolve scenario calculation bug #1126

Merged
merged 79 commits into from
Dec 13, 2023

Commits on Sep 26, 2023

  1. Configuration menu
    Copy the full SHA
    855ce5f View commit details
    Browse the repository at this point in the history

Commits on Nov 15, 2023

  1. Configuration menu
    Copy the full SHA
    ed2a6f8 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    68bd380 View commit details
    Browse the repository at this point in the history

Commits on Dec 4, 2023

  1. Configuration menu
    Copy the full SHA
    7999944 View commit details
    Browse the repository at this point in the history
  2. update bw2io requirement

    marc-vdm committed Dec 4, 2023
    Configuration menu
    Copy the full SHA
    9699278 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    69f0a4e View commit details
    Browse the repository at this point in the history
  4. Update meta.yaml

    marc-vdm committed Dec 4, 2023
    Configuration menu
    Copy the full SHA
    a7fbd60 View commit details
    Browse the repository at this point in the history
  5. Update README.md

    marc-vdm committed Dec 4, 2023
    Configuration menu
    Copy the full SHA
    c8fe954 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    5cb49c7 View commit details
    Browse the repository at this point in the history
  7. Update README.md

    bsteubing authored and marc-vdm committed Dec 4, 2023
    Configuration menu
    Copy the full SHA
    7da0e5c View commit details
    Browse the repository at this point in the history
  8. Increases the flexibility of the excel importer so it can also handle…

    … the parameter scenario files.
    Zoophobus authored and marc-vdm committed Dec 4, 2023
    Configuration menu
    Copy the full SHA
    a76fd33 View commit details
    Browse the repository at this point in the history
  9. Update README.md

    How to install using Mamba
    bsteubing authored and marc-vdm committed Dec 4, 2023
    Configuration menu
    Copy the full SHA
    306d2ff View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    b2f30cf View commit details
    Browse the repository at this point in the history
  11. Implement dialog

    marc-vdm committed Dec 4, 2023
    Configuration menu
    Copy the full SHA
    7cd8c59 View commit details
    Browse the repository at this point in the history
  12. Configuration menu
    Copy the full SHA
    8ed34c8 View commit details
    Browse the repository at this point in the history
  13. Implement actual relinking

    marc-vdm committed Dec 4, 2023
    Configuration menu
    Copy the full SHA
    c666159 View commit details
    Browse the repository at this point in the history
  14. Configuration menu
    Copy the full SHA
    5e97cfa View commit details
    Browse the repository at this point in the history
  15. Configuration menu
    Copy the full SHA
    c3972b2 View commit details
    Browse the repository at this point in the history
  16. Configuration menu
    Copy the full SHA
    21b8d8d View commit details
    Browse the repository at this point in the history
  17. Configuration menu
    Copy the full SHA
    3ad0ba8 View commit details
    Browse the repository at this point in the history
  18. Fix type hinting error

    marc-vdm committed Dec 4, 2023
    Configuration menu
    Copy the full SHA
    752bd13 View commit details
    Browse the repository at this point in the history
  19. Update README.md

    marc-vdm committed Dec 4, 2023
    Configuration menu
    Copy the full SHA
    97ad641 View commit details
    Browse the repository at this point in the history
  20. Update README.md

    marc-vdm committed Dec 4, 2023
    Configuration menu
    Copy the full SHA
    8854cb6 View commit details
    Browse the repository at this point in the history
  21. Update README.md

    marc-vdm committed Dec 4, 2023
    Configuration menu
    Copy the full SHA
    1e5fe27 View commit details
    Browse the repository at this point in the history
  22. Updates to the functions get_relevant_flows and get_relevant_activiti…

    …es (LCA-ActivityBrowser#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.
    Zoophobus authored and marc-vdm committed Dec 4, 2023
    Configuration menu
    Copy the full SHA
    3852c71 View commit details
    Browse the repository at this point in the history
  23. Multiple sdf update (LCA-ActivityBrowser#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 <zoo@PK-home.kpn>
    2 people authored and marc-vdm committed Dec 4, 2023
    Configuration menu
    Copy the full SHA
    b6e9c41 View commit details
    Browse the repository at this point in the history
  24. Use node16 actions for main pipeline

    haasad authored and marc-vdm committed Dec 4, 2023
    Configuration menu
    Copy the full SHA
    92aa40f View commit details
    Browse the repository at this point in the history
  25. Use node16 actions in release pipeline

    haasad authored and marc-vdm committed Dec 4, 2023
    Configuration menu
    Copy the full SHA
    909408b View commit details
    Browse the repository at this point in the history
  26. Configuration menu
    Copy the full SHA
    0654b82 View commit details
    Browse the repository at this point in the history
  27. Configuration menu
    Copy the full SHA
    e564225 View commit details
    Browse the repository at this point in the history
  28. 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.
    haasad authored and marc-vdm committed Dec 4, 2023
    Configuration menu
    Copy the full SHA
    ab19c06 View commit details
    Browse the repository at this point in the history
  29. Install canary updates (LCA-ActivityBrowser#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 <haasad@users.noreply.github.com>
    2 people authored and marc-vdm committed Dec 4, 2023
    Configuration menu
    Copy the full SHA
    9addfb8 View commit details
    Browse the repository at this point in the history
  30. Configuration menu
    Copy the full SHA
    2165bb6 View commit details
    Browse the repository at this point in the history
  31. Configuration menu
    Copy the full SHA
    3f1638c View commit details
    Browse the repository at this point in the history
  32. Configuration menu
    Copy the full SHA
    b6879f2 View commit details
    Browse the repository at this point in the history
  33. Fix canary link

    marc-vdm committed Dec 4, 2023
    Configuration menu
    Copy the full SHA
    fa8ace6 View commit details
    Browse the repository at this point in the history
  34. Configuration menu
    Copy the full SHA
    4fc7b3b View commit details
    Browse the repository at this point in the history
  35. Configuration menu
    Copy the full SHA
    ebf897d View commit details
    Browse the repository at this point in the history
  36. Configuration menu
    Copy the full SHA
    49b1888 View commit details
    Browse the repository at this point in the history
  37. Configuration menu
    Copy the full SHA
    2439f55 View commit details
    Browse the repository at this point in the history
  38. Configuration menu
    Copy the full SHA
    87ab077 View commit details
    Browse the repository at this point in the history
  39. Configuration menu
    Copy the full SHA
    3480eb5 View commit details
    Browse the repository at this point in the history
  40. Configuration menu
    Copy the full SHA
    237b830 View commit details
    Browse the repository at this point in the history
  41. Resolve 3 bugs for location linking (LCA-ActivityBrowser#1051): 1) da…

    …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 committed Dec 4, 2023
    Configuration menu
    Copy the full SHA
    1d0283a View commit details
    Browse the repository at this point in the history
  42. Configuration menu
    Copy the full SHA
    2b5c713 View commit details
    Browse the repository at this point in the history
  43. Configuration menu
    Copy the full SHA
    f9973f2 View commit details
    Browse the repository at this point in the history
  44. Store AB version in logfile

    marc-vdm committed Dec 4, 2023
    Configuration menu
    Copy the full SHA
    de043cb View commit details
    Browse the repository at this point in the history
  45. Configuration menu
    Copy the full SHA
    591c407 View commit details
    Browse the repository at this point in the history
  46. 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.
    haasad authored and marc-vdm committed Dec 4, 2023
    Configuration menu
    Copy the full SHA
    4c0b0d3 View commit details
    Browse the repository at this point in the history
  47. Move conda-envs to .github directory

    haasad authored and marc-vdm committed Dec 4, 2023
    Configuration menu
    Copy the full SHA
    a377fce View commit details
    Browse the repository at this point in the history
  48. Move changelog config to .github

    haasad authored and marc-vdm committed Dec 4, 2023
    Configuration menu
    Copy the full SHA
    8f9f4f7 View commit details
    Browse the repository at this point in the history
  49. Move dev recipe to .github directory

    haasad authored and marc-vdm committed Dec 4, 2023
    Configuration menu
    Copy the full SHA
    2ffcacd View commit details
    Browse the repository at this point in the history
  50. Move stable recipe to recipe/meta.yaml

    haasad authored and marc-vdm committed Dec 4, 2023
    Configuration menu
    Copy the full SHA
    34e0ffa View commit details
    Browse the repository at this point in the history
  51. Update dev recipe

    haasad authored and marc-vdm committed Dec 4, 2023
    Configuration menu
    Copy the full SHA
    8b5ae43 View commit details
    Browse the repository at this point in the history
  52. Configuration menu
    Copy the full SHA
    41c1b27 View commit details
    Browse the repository at this point in the history
  53. Configuration menu
    Copy the full SHA
    1c36207 View commit details
    Browse the repository at this point in the history
  54. Fix path for dev recipe

    haasad authored and marc-vdm committed Dec 4, 2023
    Configuration menu
    Copy the full SHA
    fb8faac View commit details
    Browse the repository at this point in the history
  55. Added tooltip for table content

    mrvisscher authored and marc-vdm committed Dec 4, 2023
    Configuration menu
    Copy the full SHA
    0a09c46 View commit details
    Browse the repository at this point in the history
  56. Added docstring for data method

    mrvisscher authored and marc-vdm committed Dec 4, 2023
    Configuration menu
    Copy the full SHA
    8f6796b View commit details
    Browse the repository at this point in the history
  57. Cleaning-up documentation

    mrvisscher authored and marc-vdm committed Dec 4, 2023
    Configuration menu
    Copy the full SHA
    cd9c891 View commit details
    Browse the repository at this point in the history
  58. Update README.md

    marc-vdm committed Dec 4, 2023
    Configuration menu
    Copy the full SHA
    504a6d8 View commit details
    Browse the repository at this point in the history
  59. Add - copy on impact category copy (LCA-ActivityBrowser#1136)

    * Add - copy on impact category copy LCA-ActivityBrowser#1133
    
    * Reorder impact category tree context menu
    mrvisscher authored and marc-vdm committed Dec 4, 2023
    Configuration menu
    Copy the full SHA
    94b3295 View commit details
    Browse the repository at this point in the history
  60. Resolve bug with switching project on delete (LCA-ActivityBrowser#1138)

    * Switch project on delete LCA-ActivityBrowser#1075
    
    * Cleaning up ProjectController.change_project
    
    * Resolving comments by marc-vdm
    mrvisscher authored and marc-vdm committed Dec 4, 2023
    Configuration menu
    Copy the full SHA
    bd8f748 View commit details
    Browse the repository at this point in the history
  61. Merge branch 'master' of https://github.com/LCA-ActivityBrowser/activ…

    …ity-browser
    
    � Conflicts:
    �	.github/PULL_REQUEST_TEMPLATE.md
    marc-vdm committed Dec 4, 2023
    Configuration menu
    Copy the full SHA
    8bf5f8d View commit details
    Browse the repository at this point in the history
  62. Merge pull request #9 from marc-vdm/auto_point_to_new_release

    Auto point to new release
    marc-vdm committed Dec 4, 2023
    Configuration menu
    Copy the full SHA
    a5628e4 View commit details
    Browse the repository at this point in the history
  63. Configuration menu
    Copy the full SHA
    6542568 View commit details
    Browse the repository at this point in the history
  64. Merge pull request #10 from marc-vdm/gh_actions

    GH action script for commenting on issues when related milestone is c…
    marc-vdm committed Dec 4, 2023
    Configuration menu
    Copy the full SHA
    f2afaeb View commit details
    Browse the repository at this point in the history
  65. Configuration menu
    Copy the full SHA
    a836d7c View commit details
    Browse the repository at this point in the history
  66. Merge pull request #11 from marc-vdm/gh_action2

    GH action script for commenting on issues when related milestone is c…
    marc-vdm committed Dec 4, 2023
    Configuration menu
    Copy the full SHA
    ab7d30b View commit details
    Browse the repository at this point in the history
  67. Configuration menu
    Copy the full SHA
    96fe93c View commit details
    Browse the repository at this point in the history
  68. Merge pull request #12 from marc-vdm/gh_action_for_closing_milestones

    GH action script for commenting on issues when related milestone is c…
    marc-vdm committed Dec 4, 2023
    Configuration menu
    Copy the full SHA
    5459404 View commit details
    Browse the repository at this point in the history

Commits on Dec 6, 2023

  1. review instructions bot

    marc-vdm committed Dec 6, 2023
    Configuration menu
    Copy the full SHA
    400c2d4 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #14 from marc-vdm/review_message

    Automated review instructions
    marc-vdm committed Dec 6, 2023
    Configuration menu
    Copy the full SHA
    21e03fb View commit details
    Browse the repository at this point in the history
  3. review instructions bot

    marc-vdm committed Dec 6, 2023
    Configuration menu
    Copy the full SHA
    3ce5801 View commit details
    Browse the repository at this point in the history
  4. Merge pull request #16 from marc-vdm/review_message2

    review instructions bot
    marc-vdm committed Dec 6, 2023
    Configuration menu
    Copy the full SHA
    8b8b041 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    c833778 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    ea7cb81 View commit details
    Browse the repository at this point in the history

Commits on Dec 13, 2023

  1. Configuration menu
    Copy the full SHA
    9c1242d View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    b0bd785 View commit details
    Browse the repository at this point in the history