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

refactor: turn food process category into a list #795

Merged
merged 15 commits into from
Oct 17, 2024
Merged

refactor: turn food process category into a list #795

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
a724b12
turn food process category into a list
ccomb Oct 7, 2024
34b472d
remove the double category test
ccomb Oct 7, 2024
1af45aa
fixed path for zip extraction
ccomb Oct 8, 2024
5695374
fixed path for zip extraction
ccomb Oct 8, 2024
99c092a
export categories on process and ingredients
ccomb Oct 8, 2024
9edc86e
use ordereddict
ccomb Oct 9, 2024
b4af7cc
reorder encoder and change function name
ccomb Oct 10, 2024
3969b47
try to blind fix linter error
ccomb Oct 11, 2024
891a5e7
noqa: I001. Can't figure out why it is not positive in local
ccomb Oct 11, 2024
c25459a
moved the noqa
ccomb Oct 11, 2024
dc79794
elm review
ccomb Oct 11, 2024
d97aba0
keep original name
ccomb Oct 15, 2024
325ae90
less parenthesis
ccomb Oct 15, 2024
a19ce12
restore original ordering
ccomb Oct 17, 2024
cf71925
chore: remove noqa
vjousse Oct 17, 2024
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
6 changes: 3 additions & 3 deletions data/common/import_.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import os
import re
import sys
from os.path import dirname
from subprocess import call
from zipfile import ZipFile

Expand All @@ -13,7 +14,6 @@

from common.export import create_activity, delete_exchange, new_exchange, search

BIOSPHERE = "biosphere3"
vjousse marked this conversation as resolved.
Show resolved Hide resolved
AGRIBALYSE_PACKAGINGS = [
"PS",
"LDPE",
Expand Down Expand Up @@ -173,7 +173,7 @@ def add_variant_activity(activity_data, dbname):
def import_simapro_csv(
datapath,
dbname,
biosphere=BIOSPHERE,
biosphere="biosphere3",
migrations=[],
first_strategies=[],
excluded_strategies=[],
Expand All @@ -187,7 +187,7 @@ def import_simapro_csv(
# unzip
with ZipFile(datapath) as zf:
print("### Extracting the zip file...")
zf.extractall(path=os.path.dirname(datapath))
zf.extractall(path=dirname(datapath))
unzipped = datapath[0:-4]

if "AGB" in datapath:
Expand Down
Loading