From eec0fd6e3fadcbaea60823ba1ac109a871f2d370 Mon Sep 17 00:00:00 2001 From: Maxime PERALTA Date: Thu, 12 Feb 2026 16:46:04 +0100 Subject: [PATCH 1/2] (fix) Move methods data in appabuild module --- appabuild/database/databases.py | 35 ++++++++++++++++++--------------- 1 file changed, 19 insertions(+), 16 deletions(-) diff --git a/appabuild/database/databases.py b/appabuild/database/databases.py index 58d1841..e3df4bb 100644 --- a/appabuild/database/databases.py +++ b/appabuild/database/databases.py @@ -8,7 +8,10 @@ import csv import json import os +import pkgutil import re +from io import StringIO +from pathlib import Path from typing import Optional import bw2data as bd @@ -25,7 +28,7 @@ from appabuild.exceptions import BwDatabaseError, SerializedDataError from appabuild.logger import log_validation_error, logger -PATH_TO_METHODS = "data/methods/ecoinvent_3.11_methods.csv" +DATA_MODULE = "appabuild.data" class Database: @@ -105,21 +108,21 @@ def import_in_project(self) -> None: ei_bio_database = bd.Database(self.biosphere_name) if not self.with_ecoinvent: - with open(PATH_TO_METHODS, newline="") as csvfile: - reader = csv.reader(csvfile, delimiter=";") - for row in reader: - method, category, indicator, unit = row - key = self.name, method, category, indicator - # todo add all empty methods - # key = self.name = tuple csv - if key not in bd.methods: - method = bd.Method(key) - method.register( - unit=unit, - filepath=PATH_TO_METHODS, - ecoinvent_version="3.11", - database=self.name, - ) + data = pkgutil.get_data(DATA_MODULE, "methods/ecoinvent_3.11_methods.csv") + reader = csv.reader(StringIO(data.decode()), delimiter=";") + for row in reader: + method, category, indicator, unit = row + key = self.name, method, category, indicator + # todo add all empty methods + # key = self.name = tuple csv + if key not in bd.methods: + method = bd.Method(key) + method.register( + unit=unit, + filepath="methods/ecoinvent_3.11_methods.csv", + ecoinvent_version="3.11", + database=self.name, + ) for method in bd.methods: bio_dataset = { From 92f838923f79817c2e66478fd8f6cd540de6ca77 Mon Sep 17 00:00:00 2001 From: Maxime PERALTA Date: Thu, 12 Feb 2026 16:51:40 +0100 Subject: [PATCH 2/2] (fix) Data is a module in appabuild --- appabuild/data/__init__.py | 0 {data => appabuild/data}/methods/ecoinvent_3.11_methods.csv | 0 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 appabuild/data/__init__.py rename {data => appabuild/data}/methods/ecoinvent_3.11_methods.csv (100%) diff --git a/appabuild/data/__init__.py b/appabuild/data/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/data/methods/ecoinvent_3.11_methods.csv b/appabuild/data/methods/ecoinvent_3.11_methods.csv similarity index 100% rename from data/methods/ecoinvent_3.11_methods.csv rename to appabuild/data/methods/ecoinvent_3.11_methods.csv