Merge tag '0.25.1' into develop

CenterForOpenScience · Mar 29, 2018 · 8a10328 · 8a10328
2 parents eb9cccf + d31efe8
commit 8a10328
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -2,6 +2,11 @@
 ChangeLog
 *********
 
+0.25.1 (2018-03-29)
+===================
+- Fix: Temporarily disable rendering for csv files. csv continues to cause resource issues for MFR
+and so will be disabled until those are resolved in another hotfix.
+
 0.25.0 (2018-03-28)
 ===================
 - Feature: Large files can now be zoomed!  Images are scaled to fit the window, but clicking on the

diff --git a/mfr/version.py b/mfr/version.py
@@ -1 +1 @@
-__version__ = '0.25.0'
+__version__ = '0.25.1'
diff --git a/setup.py b/setup.py
@@ -711,7 +711,7 @@ def parse_requirements(requirements):
             # '.svg = mfr.extensions.svg:SvgRenderer',
 
             # tabular
-            '.csv = mfr.extensions.tabular:TabularRenderer',
+            # '.csv = mfr.extensions.tabular:TabularRenderer',
             '.tsv = mfr.extensions.tabular:TabularRenderer',
             '.xls = mfr.extensions.tabular:TabularRenderer',
             '.xlsx = mfr.extensions.tabular:TabularRenderer',