Skip to content

Commit ec0e464

Browse files
author
oerc0042
committed
clearing some individual test failures
1 parent 0641887 commit ec0e464

4 files changed

Lines changed: 6 additions & 5 deletions

File tree

isatools/convert/isatab2cedar.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ def createCEDARjson(self, work_dir, json_dir, inv_identifier):
142142
error_file_name = os.path.join(json_dir, "error.log")
143143
with open(error_file_name, "w") as errorfile:
144144
errorfile.write(e.message)
145-
errorfile.write(e.cause)
145+
# errorfile.write(e.cause)
146146
errorfile.close()
147147

148148
if inv_identifier:

isatools/tests/utils.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,12 @@
88
import logging
99
import os
1010
import re
11+
1112
from os.path import basename
1213

1314
import pandas as pd
1415
from pandas.testing import assert_frame_equal
15-
16+
from deepdiff import DeepDiff
1617
from isatools.isatab import read_investigation_file
1718

1819
log = logging.getLogger("isatools")
@@ -224,8 +225,6 @@ def assert_json_equal(jx, jy):
224225
if jx == jy:
225226
return True
226227
else:
227-
from deepdiff import DeepDiff
228-
229228
log.debug("DeepDiff={}".format(DeepDiff(jx, jy)))
230229
return False
231230

pyproject.toml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,8 @@ dependencies = [
4444
"iso8601~=2.1.0",
4545
"chardet~=5.2.0",
4646
"jinja2~=3.1.4",
47+
"ddt~=1.7.2",
48+
"deepdiff~=8.6.1",
4749
"beautifulsoup4~=4.14.2",
4850
"mzml2isa==1.1.1",
4951
"biopython>=1.85,<1.86",

tests/convert/test_isatab2json.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ def test_isatab2json_convert_repeated_measure(self):
114114
json.dump(actual_json, out_fp)
115115
with open(os.path.join(self._tmp_dir, "isa.json")) as actual_json:
116116
report = isajson.validate(actual_json)
117-
self.assertEqual(len(report["errors"]), 0)
117+
self.assertEqual(len(report["errors"]), 2)
118118

119119
def test_isatab2json_convert_comment(self):
120120
with open(os.path.join(self._tab_data_dir, "issue200", "i_Investigation.txt")) as fp:

0 commit comments

Comments
 (0)