Merge pull request #500 from OpenDataServices/update-flattentool

Update pinned flatten-tool commit
OpenDataServices · Nov 24, 2016 · 5aac1b2 · 5aac1b2
2 parents c613f74 + ae2c1de
commit 5aac1b2
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 6 deletions.
diff --git a/fts/tests.py b/fts/tests.py
@@ -239,10 +239,8 @@ def buttons():
     (PREFIX_360, 'WellcomeTrust-grants_2_grants_cp1252.csv', 'Convert', True),
     # Test a non-valid file.
     (PREFIX_360, 'paul-hamlyn-foundation-grants_dc.txt', 'We can only process json, csv and xlsx files', False),
-    # Test a unconvertable spreadsheet (main sheet "grants" is missing)
+    # Test a unconvertable spreadsheet (blank file)
     (PREFIX_360, 'bad.xlsx', 'We think you tried to supply a spreadsheet, but we failed to convert it to JSON.', False),
-    # Test a unconvertable spreadsheet (main sheet "releases" is missing)
-    (PREFIX_OCDS, 'WellcomeTrust-grants_2_grants.xlsx', 'We think you tried to supply a spreadsheet, but we failed to convert it to JSON.', False),
     # Test unconvertable JSON (main sheet "releases" is missing)
     (PREFIX_OCDS, 'unconvertable_json.json', 'could not be converted', False),
     (PREFIX_OCDS, 'full_record.json', ['Number of records', 'Validation Errors', 'compiledRelease', 'versionedRelease'], True),

diff --git a/requirements.in b/requirements.in
@@ -1,7 +1,7 @@
 pip
 Django<1.9
 #^^ rq.filter: <1.9
--e git+https://github.com/OpenDataServices/flatten-tool.git@e098e6518d0db43bf72c0e12232ef4cdfb083546#egg=flattentool
+-e git+https://github.com/OpenDataServices/flatten-tool.git@fc074cd0a4a25b925a05fc0dda0488f17d1c28d5#egg=flattentool
 django-bootstrap3
 django-debug-toolbar
 requests

diff --git a/requirements.txt b/requirements.txt
@@ -1,6 +1,6 @@
 pip==8.1.2
 Django==1.8.16 # rq.filter: <1.9
--e git+https://github.com/OpenDataServices/flatten-tool.git@e098e6518d0db43bf72c0e12232ef4cdfb083546#egg=flattentool
+-e git+https://github.com/OpenDataServices/flatten-tool.git@fc074cd0a4a25b925a05fc0dda0488f17d1c28d5#egg=flattentool
 django-bootstrap3==7.0.1
 django-debug-toolbar==1.4
 requests==2.10.0

diff --git a/requirements_dev.txt b/requirements_dev.txt
@@ -1,6 +1,6 @@
 pip==8.1.2
 Django==1.8.16 # rq.filter: <1.9
--e git+https://github.com/OpenDataServices/flatten-tool.git@e098e6518d0db43bf72c0e12232ef4cdfb083546#egg=flattentool
+-e git+https://github.com/OpenDataServices/flatten-tool.git@fc074cd0a4a25b925a05fc0dda0488f17d1c28d5#egg=flattentool
 django-bootstrap3==7.0.1
 django-debug-toolbar==1.4
 requests==2.10.0