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

[23.2] Move carbon data loading into config #17159

Closed
wants to merge 2 commits into from
Closed

[23.2] Move carbon data loading into config #17159

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9603db2
Move carbon data loading into config
mvdbeek Dec 11, 2023
b63da52
Fix and move unit test
mvdbeek Dec 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/galaxy/config/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@

import yaml

from galaxy.carbon_emissions import get_carbon_intensity_entry
from galaxy.config.schema import AppSchema
from galaxy.exceptions import ConfigurationError
from galaxy.util import (
Expand All @@ -51,6 +50,7 @@
running_from_source,
)
from galaxy.util.themes import flatten_theme
from .carbon_emissions import get_carbon_intensity_entry
from ..version import (
VERSION_MAJOR,
VERSION_MINOR,
Expand Down
0 lib/galaxy/carbon_emissions/__init__.py → ...alaxy/config/carbon_emissions/__init__.py
View file
Open in desktop
File renamed without changes.
0 ...axy/carbon_emissions/carbon_intensity.csv → ...fig/carbon_emissions/carbon_intensity.csv
View file
Open in desktop
File renamed without changes.
0 test/unit/carbon_emissions/__init__.py → .../unit/config/carbon_emissions/__init__.py
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...ssions/test_get_carbon_intensity_entry.py → ...ssions/test_get_carbon_intensity_entry.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from galaxy.carbon_emissions import get_carbon_intensity_entry
from galaxy.config.carbon_emissions import get_carbon_intensity_entry


def test_get_carbon_intensity_entry():
Expand Down
Loading