Merge branch 'dev' of github.com:biocore/qiita into add-default-workf…

…low-to-future-artifact

qiita_db/base.py

@@ -203,7 +203,7 @@ def __init__(self, id_):
 
     def __eq__(self, other):
         r"""Self and other are equal based on type and database id"""
-        if type(self) != type(other):
+        if type(self) is not type(other):
             return False
         if other._id != self._id:
             return False

qiita_db/software.py

@@ -1569,7 +1569,7 @@ class Parameters(object):
 
     def __eq__(self, other):
         """Equality based on the parameter values and the command"""
-        if type(self) != type(other):
+        if type(self) is not type(other):
             return False
         if self.command != other.command:
             return False

setup.py

@@ -108,7 +108,7 @@
                         'networkx', 'humanize', 'wtforms<3.0.0', 'nltk',
                         'openpyxl', 'sphinx-bootstrap-theme', 'Sphinx<3.0',
                         'gitpython', 'redbiom', 'pyzmq', 'sphinx_rtd_theme',
-                        'paramiko', 'seaborn',  'matplotlib', 'scipy<1.8',
+                        'paramiko', 'seaborn',  'matplotlib', 'scipy<=1.10.1',
                         'nose',
                         'flake8', 'six', 'qiita-files @ https://github.com/'
                         'qiita-spots/qiita-files/archive/master.zip', 'mock',