Merge branch 'master' into loadxl_on_submit4dn

4dn-dcic · Oct 11, 2016 · daab542 · daab542
2 parents 5300ee5 + d1d935f
commit daab542
Show file tree

Hide file tree

Showing 12 changed files with 23 additions and 1 deletion.
diff --git a/AllItems.xls b/AllItems.xls
diff --git a/AllItems_ordered.xls b/AllItems_ordered.xls
diff --git a/Data_Files/Rao_et_al_2014/fieldsRao.xls b/Data_Files/Rao_et_al_2014/fieldsRao.xls
diff --git a/Data_Files/Sanborn_et_al_2015/Sanborn_DBXREF_and_File_Metadata.xls b/Data_Files/Sanborn_et_al_2015/Sanborn_DBXREF_and_File_Metadata.xls
diff --git a/Data_Files/Sanborn_et_al_2015/Sanborn_FASTA_upload.xls b/Data_Files/Sanborn_et_al_2015/Sanborn_FASTA_upload.xls
diff --git a/Data_Files/Sanborn_et_al_2015/Sanborn_capc.xls b/Data_Files/Sanborn_et_al_2015/Sanborn_capc.xls
diff --git a/Data_Files/Sanborn_et_al_2015/Sanborn_fields.xls b/Data_Files/Sanborn_et_al_2015/Sanborn_fields.xls
diff --git a/Data_Files/Sanborn_et_al_2015/Sanborn_fields_ExperimentSets.xls b/Data_Files/Sanborn_et_al_2015/Sanborn_fields_ExperimentSets.xls
diff --git a/Data_Files/Sanborn_et_al_2015/Sanborn_fields_Phase1.xls b/Data_Files/Sanborn_et_al_2015/Sanborn_fields_Phase1.xls
diff --git a/Data_Files/Submission Pack/Metadata_entry_form_V2.xls b/Data_Files/Submission Pack/Metadata_entry_form_V2.xls
diff --git a/README.md b/README.md
@@ -15,6 +15,28 @@ The Submit4DN package is registered with Pypi so installation is as simple as:
 pip3 install submit4dn
 ```
 
+### Troubleshooting
+
+If you encounter an error containint something like:  
+
+```
+ Symbol not found: _PyInt_AsLong
+```
+
+Then it means that the imaging library Pillow / PIL is missing some required libraries.  You can fix it by doing the following.
+
+```shell
+$ pip uninstall pillow
+$ brew install libjpeg zlib libtiff littlecms webp openjpeg tcl-tk
+$ pip install pillow
+```
+
+That should fix it!
+
+
+Once installed then follow the directions below:
+
+
 
 ## Connection
 To be able to use the provided tools, you need to have a secure key to access the REST application.

diff --git a/setup.py b/setup.py
@@ -7,14 +7,14 @@
 
 requires = [
     'attrs==16.0.0',
+    'Pillow==3.3.0',
     'py==1.4.31',
     'python-magic==0.4.12',
     'requests==2.11.0',
     'wheel==0.24.0',
     'xlrd==1.0.0',
     'xlwt==1.1.2',
     'awscli==1.10.62',
-    'Pillow==3.3.0',
 ]
 
 tests_require = [