Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/materials' into materials
Browse files Browse the repository at this point in the history
  • Loading branch information
romainsacchi committed Aug 4, 2023
2 parents c97cb6b + f45b79f commit 1df5a12
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion premise/ecoinvent_modification.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
from .external_data_validation import check_external_scenarios, check_inventories
from .fuels import _update_fuels
from .inventory_imports import AdditionalInventory, DefaultInventory
from .metals import _update_metals, Metals
from .metals import Metals, _update_metals
from .report import generate_change_report, generate_summary_report
from .steel import _update_steel
from .transport import _update_vehicles
Expand Down
2 changes: 1 addition & 1 deletion premise/metals.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@

import logging.config
import uuid
from functools import lru_cache
from pathlib import Path

import country_converter as coco
import numpy as np
import pandas as pd
import wurst
import yaml
from functools import lru_cache

from .export import biosphere_flows_dictionary
from .logger import create_logger
Expand Down

0 comments on commit 1df5a12

Please sign in to comment.