0.9.3

CHANGES.md

@@ -1,3 +1,9 @@
+0.9.3 (2017-09-40)
+==================
+- Fix broken py2 compatibility
+- Improve requirement handling for setup.py
+- Fix `__eq__` method (yet again)
+
 0.9.2 (2017-08-30)
 ==================
 - Fix `__eq__` method for main resources.

VERSION

@@ -1 +1 @@
-0.9.2
+0.9.3

requirements.txt

@@ -1,3 +1,9 @@
-six==1.10.0
-requests==2.18.3
-futures==3.0.4; python_version < '3.0'
+-r requirements.txt
+flake8==3.3.0
+pytest==2.9.1
+pytest-cov==2.3.1
+pytest-pep8==1.0.6
+requests_mock==1.3.0
+faker==0.7.10
+sphinx==1.5.1
+sphinx_rtd_theme==0.1.9

setup.py

@@ -1,9 +1,8 @@
 import io
 import os
-import re
 import sys
-from setuptools import setup, find_packages
 
+from setuptools import setup, find_packages
 
 # If version file exists, this happens during the installation phase,
 # read the version from the version file.
@@ -18,13 +17,9 @@
     with io.open(VERSION_FILE, 'w', encoding='utf-8') as f:
         f.write(version)
 
-
-with open('requirements.txt') as fp:
-    install_requires = fp.readlines()
-if sys.version_info < (3, 0):
-    reg = re.compile('''^.*?;\s*python_version\s*<\s*'3\..*$''')
-    install_requires = [i for i in install_requires if not reg.match(i)]
-
+install_requires = ["six==1.10.0", "requests==2.18.3"]
+if sys.version_info < (3,):
+    install_requires.append("futures==3.0.4")
 
 setup(
     name='sevenbridges-python',

sevenbridges/__init__.py

@@ -6,7 +6,7 @@
 """
 import logging
 
-__version__ = "0.9.2"
+__version__ = "0.9.3"
 
 from sevenbridges.api import Api
 from sevenbridges.config import Config

sevenbridges/config.py

@@ -1,7 +1,5 @@
 import logging
 import os
-from configparser import NoSectionError
-
 from six.moves import configparser as cp
 
 from sevenbridges.errors import SbgError
@@ -76,7 +74,7 @@ def proxies(self):
             }
         except KeyError:
             return format_proxies({})
-        except NoSectionError:
+        except cp.NoSectionError:
             return format_proxies({})
 
     @property
@@ -86,7 +84,7 @@ def advance_access(self):
                 'mode', 'advance_access')) if self.config_parser else False
         except KeyError:
             return False
-        except NoSectionError:
+        except cp.NoSectionError:
             return False
 
 

sevenbridges/models/app.py

@@ -41,10 +41,13 @@ def id(self):
             return self._id
 
     def __eq__(self, other):
+        if self is None and other:
+            return False
+        if other is None and self:
+            return False
         if self is other:
             return True
-        else:
-            return self.id == other.id and self.__class__ == other.__class__
+        return self.id == other.id and self.__class__ == other.__class__
 
     def __str__(self):
         return six.text_type('<App: id={id} rev={rev}>'.format(

sevenbridges/models/billing_group.py

@@ -29,10 +29,13 @@ def __str__(self):
         return six.text_type('<BillingGroup: id={id}>'.format(id=self.id))
 
     def __eq__(self, other):
+        if self is None and other:
+            return False
+        if other is None and self:
+            return False
         if self is other:
             return True
-        else:
-            return self.id == other.id and self.__class__ == other.__class__
+        return self.id == other.id and self.__class__ == other.__class__
 
     @classmethod
     def query(cls, offset=None, limit=None, api=None):

sevenbridges/models/division.py

@@ -21,10 +21,13 @@ def __str__(self):
         return six.text_type('<Division: id={id}>'.format(id=self.id))
 
     def __eq__(self, other):
+        if self is None and other:
+            return False
+        if other is None and self:
+            return False
         if self is other:
             return True
-        else:
-            return self.id == other.id and self.__class__ == other.__class__
+        return self.id == other.id and self.__class__ == other.__class__
 
     @classmethod
     def query(cls, offset=None, limit=None, api=None):

sevenbridges/models/file.py

@@ -55,10 +55,13 @@ def __str__(self):
         return six.text_type('<File: id={id}>'.format(id=self.id))
 
     def __eq__(self, other):
+        if self is None and other:
+            return False
+        if other is None and self:
+            return False
         if self is other:
             return True
-        else:
-            return self.id == other.id and self.__class__ == other.__class__
+        return self.id == other.id and self.__class__ == other.__class__
 
     @classmethod
     def query(cls, project, names=None, metadata=None, origin=None, tags=None,

sevenbridges/models/invoice.py

@@ -28,10 +28,13 @@ def __str__(self):
         return six.text_type('<Invoice: id={id}>'.format(id=self.id))
 
     def __eq__(self, other):
+        if self is None and other:
+            return False
+        if other is None and self:
+            return False
         if self is other:
             return True
-        else:
-            return self.id == other.id and self.__class__ == other.__class__
+        return self.id == other.id and self.__class__ == other.__class__
 
     @classmethod
     def query(cls, offset=None, limit=None, api=None):

sevenbridges/models/marker.py

@@ -34,10 +34,13 @@ def __str__(self):
         return six.text_type('<Marker: id={id}>'.format(id=self.id))
 
     def __eq__(self, other):
+        if self is None and other:
+            return False
+        if other is None and self:
+            return False
         if self is other:
             return True
-        else:
-            return self.id == other.id and self.__class__ == other.__class__
+        return self.id == other.id and self.__class__ == other.__class__
 
     @classmethod
     def query(cls, file, offset=None, limit=None, api=None):

sevenbridges/models/member.py

@@ -31,10 +31,13 @@ def __str__(self):
                              .format(id=self.id))
 
     def __eq__(self, other):
+        if self is None and other:
+            return False
+        if other is None and self:
+            return False
         if self is other:
             return True
-        else:
-            return self.id == other.id and self.__class__ == other.__class__
+        return self.id == other.id and self.__class__ == other.__class__
 
     @inplace_reload
     def save(self, inplace=True):

sevenbridges/models/project.py

@@ -45,10 +45,13 @@ def __str__(self):
         return six.text_type('<Project: id={id}>'.format(id=self.id))
 
     def __eq__(self, other):
+        if self is None and other:
+            return False
+        if other is None and self:
+            return False
         if self is other:
             return True
-        else:
-            return self.id == other.id and self.__class__ == other.__class__
+        return self.id == other.id and self.__class__ == other.__class__
 
     @classmethod
     def query(cls, owner=None, offset=None, limit=None, api=None):

sevenbridges/models/storage_export.py

@@ -42,10 +42,13 @@ def __str__(self):
         return six.text_type('<Export: id={id}>'.format(id=self.id))
 
     def __eq__(self, other):
+        if self is None and other:
+            return False
+        if other is None and self:
+            return False
         if self is other:
             return True
-        else:
-            return self.id == other.id and self.__class__ == other.__class__
+        return self.id == other.id and self.__class__ == other.__class__
 
     @property
     def source(self):

sevenbridges/models/storage_import.py

@@ -43,10 +43,13 @@ def __str__(self):
         return six.text_type('<Import: id={id}>'.format(id=self.id))
 
     def __eq__(self, other):
+        if self is None and other:
+            return False
+        if other is None and self:
+            return False
         if self is other:
             return True
-        else:
-            return self.id == other.id and self.__class__ == other.__class__
+        return self.id == other.id and self.__class__ == other.__class__
 
     @property
     def result(self):

sevenbridges/models/task.py

@@ -68,10 +68,13 @@ def __str__(self):
         return six.text_type('<Task: id={id}>'.format(id=self.id))
 
     def __eq__(self, other):
+        if self is None and other:
+            return False
+        if other is None and self:
+            return False
         if self is other:
             return True
-        else:
-            return self.id == other.id and self.__class__ == other.__class__
+        return self.id == other.id and self.__class__ == other.__class__
 
     @classmethod
     def query(cls, project=None, status=None, batch=None,

sevenbridges/models/team.py

@@ -33,10 +33,13 @@ def __str__(self):
         return six.text_type('<Team: id={id}>'.format(id=self.id))
 
     def __eq__(self, other):
+        if self is None and other:
+            return False
+        if other is None and self:
+            return False
         if self is other:
             return True
-        else:
-            return self.id == other.id and self.__class__ == other.__class__
+        return self.id == other.id and self.__class__ == other.__class__
 
     @classmethod
     def query(cls, division, offset=None, limit=None, api=None):

sevenbridges/models/team_member.py

@@ -18,10 +18,13 @@ class TeamMember(Resource):
     role = StringField(read_only=True)
 
     def __eq__(self, other):
+        if self is None and other:
+            return False
+        if other is None and self:
+            return False
         if self is other:
             return True
-        else:
-            return self.id == other.id and self.__class__ == other.__class__
+        return self.id == other.id and self.__class__ == other.__class__
 
     def __str__(self):
         return six.text_type('<Team member: username={username}>'

sevenbridges/models/volume.py

@@ -46,10 +46,13 @@ class Volume(Resource):
     active = BooleanField(read_only=True)
 
     def __eq__(self, other):
+        if self is None and other:
+            return False
+        if other is None and self:
+            return False
         if self is other:
             return True
-        else:
-            return self.id == other.id and self.__class__ == other.__class__
+        return self.id == other.id and self.__class__ == other.__class__
 
     def __str__(self):
         return six.text_type('<Volume: id={id}>'.format(id=self.id))