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.

Sign up for GitHub

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

Jump to bottom

Add caching of Sankey results #1117

Merged
merged 79 commits into from
Dec 13, 2023
Merged

Add caching of Sankey results #1117

merged 79 commits into from
Dec 13, 2023

Conversation

marc-vdm
Copy link
Member

@marc-vdm marc-vdm commented Nov 10, 2023 •
edited
Loading

Resolve #1112
+ Remove unused code

@mrvisscher: can be closed as squashcommit

Checklist

  • Keep pull requests small so they can be easily reviewed.
  • Update the documentation, please follow the numpy style guide
  • 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.
  • Request a review from another developer.

@marc-vdm marc-vdm added breaking PRs that break AB interaction in important ways change PRs related to minor changes to AB labels Nov 10, 2023
@marc-vdm marc-vdm added this to the 2.9.3 milestone Nov 10, 2023
@marc-vdm marc-vdm removed the breaking PRs that break AB interaction in important ways label Nov 10, 2023
@marc-vdm
Copy link
Member Author

@mrvisscher No hurries with this. First get started with other things, but whenever you're ready.

You can see in the contributing guidelines how to review a PR.

You can add my fork to your IDE as a remote and pull this branch and run it to see the code in action.

@coveralls
Copy link

coveralls commented Nov 10, 2023 •
edited
Loading

Coverage Status

coverage: 50.026% (-0.03%) from 50.055%
when pulling 3caff4c on marc-vdm:sankey_caching
into d5b9e75 on LCA-ActivityBrowser:master.

marc-vdm and others added 21 commits November 10, 2023 20:43
@marc-vdm
Move timer code so it only starts if there are no cached results.
0693d9d
@marc-vdm
GH action script for commenting on issues when related milestone is c…
7999944 
…losed.
@marc-vdm
update bw2io requirement
9699278
@marc-vdm
Update readme install instructions
69f0a4e
@marc-vdm
Update meta.yaml
a7fbd60
@marc-vdm
Update README.md
c8fe954
@marc-vdm
Change requirement to brightway2 instead of bw2io
5cb49c7
@bsteubing @marc-vdm
Update README.md
7da0e5c
@Zoophobus @marc-vdm
Increases the flexibility of the excel importer so it can also handle…
a76fd33 
… the parameter scenario files.
@bsteubing @marc-vdm
Update README.md
306d2ff 
How to install using Mamba
@marc-vdm
Set up signals infrascructure
b2f30cf
@marc-vdm
Implement dialog
7cd8c59
@marc-vdm
Implement finding of suitable alternatives and proper management of f…
8ed34c8 
…ailing that.
@marc-vdm
Implement actual relinking
c666159
@marc-vdm
Minor documentation improvements + store exchanges to remove instead …
5e97cfa 
…of to keep.
@marc-vdm
Minor documentation + code improvements
c3972b2
@marc-vdm
Resolve LCA-ActivityBrowser#782 + improve documentation of `Contribut…
21b8d8d 
…ions` class
@marc-vdm
Minor documentation + code improvements
3ad0ba8
@marc-vdm
Fix type hinting error
752bd13
@marc-vdm
Update README.md
97ad641
@marc-vdm
Update README.md
8854cb6
haasad and others added 25 commits December 4, 2023 20:18
@haasad @marc-vdm
Use micromamba instead of miniconda to speed up tests
41c1b27
@haasad @marc-vdm
Update install instructions to use libmamba solver with conda
1c36207
@haasad @marc-vdm
Fix path for dev recipe
fb8faac
@mrvisscher @marc-vdm
Added tooltip for table content
0a09c46
@mrvisscher @marc-vdm
Added docstring for data method
8f6796b
@mrvisscher @marc-vdm
Cleaning-up documentation
cd9c891
@marc-vdm
Update README.md
504a6d8 
Resolve LCA-ActivityBrowser#1127
@mrvisscher @marc-vdm
Add - copy on impact category copy (LCA-ActivityBrowser#1136)
94b3295 
* Add - copy on impact category copy LCA-ActivityBrowser#1133

* Reorder impact category tree context menu
@mrvisscher @marc-vdm
Resolve bug with switching project on delete (LCA-ActivityBrowser#1138)
bd8f748 
* Switch project on delete LCA-ActivityBrowser#1075

* Cleaning up ProjectController.change_project

* Resolving comments by marc-vdm
@marc-vdm
Merge branch 'master' of https://github.com/LCA-ActivityBrowser/activ…
8bf5f8d 
…ity-browser

� Conflicts:
�	.github/PULL_REQUEST_TEMPLATE.md
@marc-vdm
Merge pull request #9 from marc-vdm/auto_point_to_new_release
a5628e4 
Auto point to new release
@marc-vdm
GH action script for commenting on issues when related milestone is c…
6542568 
…losed.
@marc-vdm
Merge pull request #10 from marc-vdm/gh_actions
f2afaeb 
GH action script for commenting on issues when related milestone is c…
@marc-vdm
GH action script for commenting on issues when related milestone is c…
a836d7c 
…losed.
@marc-vdm
Merge pull request #11 from marc-vdm/gh_action2
ab7d30b 
GH action script for commenting on issues when related milestone is c…
@marc-vdm
GH action script for commenting on issues when related milestone is c…
96fe93c 
…losed.
@marc-vdm
Merge pull request #12 from marc-vdm/gh_action_for_closing_milestones
5459404 
GH action script for commenting on issues when related milestone is c…
@marc-vdm
review instructions bot
400c2d4
@marc-vdm
Merge pull request #14 from marc-vdm/review_message
21e03fb 
Automated review instructions
@marc-vdm
review instructions bot
3ce5801
@marc-vdm
Merge pull request #16 from marc-vdm/review_message2
8b8b041 
review instructions bot
@marc-vdm
Merge branch 'master' of https://github.com/LCA-ActivityBrowser/activ…
c833778 
…ity-browser
@marc-vdm
Merge branch 'master' of https://github.com/marc-vdm/activity-browser
ea7cb81
@marc-vdm
Merge branch 'master' of https://github.com/LCA-ActivityBrowser/activ…
9c1242d 
…ity-browser
@marc-vdm
Merge branch 'master' into sankey_caching
3caff4c
mrvisscher
mrvisscher approved these changes Dec 13, 2023
View reviewed changes
Copy link
Collaborator

@mrvisscher mrvisscher left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me!

@mrvisscher mrvisscher merged commit 7396245 into LCA-ActivityBrowser:master Dec 13, 2023
12 checks passed
@github-actions GitHub Actions
Copy link

This issue has been implemented in the new release of Activity Browser 🚀 (version 2.9.3), you can get the new version by updating Activity Browser.

🤖beep boop! I'm a bot and this message was an automated action. If updating does not make sense for this issue, just ignore this.

@marc-vdm marc-vdm mentioned this pull request Dec 21, 2023
Merged
6 tasks
@marc-vdm marc-vdm deleted the sankey_caching branch May 14, 2024 08:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mrvisscher mrvisscher mrvisscher approved these changes

Assignees
No one assigned
Labels
change PRs related to minor changes to AB
Projects
None yet
Milestone
2.9.3
Development

Successfully merging this pull request may close these issues.

Sankey: cache results
6 participants
@marc-vdm @coveralls @mrvisscher @bsteubing @Zoophobus @haasad