Skip to content

Commit

Permalink
Merge branch 'devel'
Browse files Browse the repository at this point in the history
  • Loading branch information
rhandberg committed Aug 5, 2020
2 parents db8a9ce + be5f222 commit 861b38d
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
master-v1.0.2
master-v1.0.3
3 changes: 2 additions & 1 deletion dataval/dataval.py
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,7 @@ def __init__(self, input_folders, output_folder=None, corr=False, validate=True,
self.cursor.execute("SELECT COUNT(*) FROM sqlite_master WHERE type='table' AND name='diagnostics_corr';")
self.corrections_done = bool(self.cursor.fetchone()[0] == 1)
if self.corr and not self.corrections_done:
self.close()
raise ValueError("Can not run dataval on corr when corrections have not been run")

# Add method_used to the diagnostics table if it doesn't exist:
Expand Down Expand Up @@ -236,7 +237,7 @@ def close(self):

# Close the logging FileHandler:
if hasattr(self, '_filehandler'):
logger = logging.getLogger(__name__)
logger = logging.getLogger('dataval')
self._filehandler.close()
logger.removeHandler(self._filehandler)

Expand Down

0 comments on commit 861b38d

Please sign in to comment.