Skip to content

Commit dfb7623

Browse files
authored
Use utf-8 encoding when writing csv files (#79)
and add a test case Closes #77
1 parent b613b97 commit dfb7623

File tree

6 files changed

+8
-13
lines changed

6 files changed

+8
-13
lines changed

petab/conditions.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,7 @@ def write_condition_df(df: pd.DataFrame, filename: str) -> None:
5151
df: PEtab condition table
5252
filename: Destination file name
5353
"""
54-
with open(filename, 'w') as fh:
55-
df.to_csv(fh, sep='\t', index=True)
54+
df.to_csv(filename, sep='\t', index=True)
5655

5756

5857
def create_condition_df(parameter_ids: Iterable[str],

petab/core.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,7 @@ def write_simulation_df(df: pd.DataFrame, filename: str) -> None:
4040
df: PEtab simulation table
4141
filename: Destination file name
4242
"""
43-
with open(filename, 'w') as fh:
44-
df.to_csv(fh, sep='\t', index=False)
43+
df.to_csv(filename, sep='\t', index=False)
4544

4645

4746
def get_visualization_df(visualization_file: str) -> pd.DataFrame:
@@ -70,8 +69,7 @@ def write_visualization_df(df: pd.DataFrame, filename: str) -> None:
7069
df: PEtab visualization table
7170
filename: Destination file name
7271
"""
73-
with open(filename, 'w') as fh:
74-
df.to_csv(fh, sep='\t', index=False)
72+
df.to_csv(filename, sep='\t', index=False)
7573

7674

7775
def get_notnull_columns(df: pd.DataFrame, candidates: Iterable):

petab/measurements.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,7 @@ def write_measurement_df(df: pd.DataFrame, filename: str) -> None:
5757
df: PEtab measurement table
5858
filename: Destination file name
5959
"""
60-
with open(filename, 'w') as fh:
61-
df.to_csv(fh, sep='\t', index=False)
60+
df.to_csv(filename, sep='\t', index=False)
6261

6362

6463
def get_noise_distributions(measurement_df: pd.DataFrame) -> dict:

petab/observables.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,7 @@ def write_observable_df(df: pd.DataFrame, filename: str) -> None:
6060
df: PEtab observable table
6161
filename: Destination file name
6262
"""
63-
with open(filename, 'w') as fh:
64-
df.to_csv(fh, sep='\t', index=True)
63+
df.to_csv(filename, sep='\t', index=True)
6564

6665

6766
def get_output_parameters(

petab/parameters.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,7 @@ def write_parameter_df(df: pd.DataFrame, filename: str) -> None:
8989
df: PEtab parameter table
9090
filename: Destination file name
9191
"""
92-
with open(filename, 'w') as fh:
93-
df.to_csv(fh, sep='\t', index=True)
92+
df.to_csv(filename, sep='\t', index=True)
9493

9594

9695
def get_optimization_parameters(parameter_df: pd.DataFrame) -> List[str]:

tests/test_parameters.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,8 @@ def test_write_parameter_df():
112112
"""Test parameters.write_parameter_df."""
113113
parameter_df = pd.DataFrame(data={
114114
PARAMETER_ID: ['par1', 'par2'],
115-
PARAMETER_NAME: ['parname1', 'parname2'],
115+
# Test utf8 characters
116+
PARAMETER_NAME: ['ɑ', 'β'],
116117
}).set_index(PARAMETER_ID)
117118

118119
with tempfile.NamedTemporaryFile(mode='w', delete=True) as fh:

0 commit comments

Comments
 (0)