Merge pull request #211 from josephroque/2017-07-env-fixes

Jeff-Meadows · web-flow · commit 0979c2a94385 · 2017-07-05T18:55:40.000-07:00
July 2017, Pylint/Test environment fixes
diff --git a/.travis.yml b/.travis.yml
@@ -23,7 +23,7 @@ matrix:
     - python: 3.6
       env: TOX_ENV=py36
     - python: pypy
-      env: TOX_ENV=pypy PYPY_VERSION='4.0.0'
+      env: TOX_ENV=pypy PYPY_VERSION='2.7-5.8.0'
     - python: 2.7
       env: TOX_ENV=pep8
     - python: 2.7
diff --git a/.travis/install.sh b/.travis/install.sh
@@ -46,8 +46,8 @@ if [[ "$(uname -s)" == 'Darwin' ]]; then
             pyenv global 3.6.0
             ;;
         pypy)
-            pyenv install "pypy-${PYPY_VERSION}"
-            pyenv global "pypy-${PYPY_VERSION}"
+            pyenv install "pypy${PYPY_VERSION}"
+            pyenv global "pypy${PYPY_VERSION}"
             ;;
     esac
     pyenv rehash
@@ -59,8 +59,8 @@ else
         export PYENV_ROOT="$PWD/.pyenv"
         export PATH="$PYENV_ROOT/bin:$PATH"
         eval "$(pyenv init -)"
-        pyenv install "pypy-${PYPY_VERSION}"
-        pyenv global "pypy-${PYPY_VERSION}"
+        pyenv install "pypy${PYPY_VERSION}"
+        pyenv global "pypy${PYPY_VERSION}"
     fi
     pip install -U virtualenv
 fi
diff --git a/.travis/run.sh b/.travis/run.sh
@@ -14,7 +14,7 @@ else
         export PYENV_ROOT="$PWD/.pyenv"
         export PATH="$PYENV_ROOT/bin:$PATH"
         eval "$(pyenv init -)"
-        pyenv global "pypy-${PYPY_VERSION}"
+        pyenv global "pypy${PYPY_VERSION}"
     fi
 fi
 source $PWD/.venv/bin/activate
diff --git a/boxsdk/auth/developer_token_auth.py b/boxsdk/auth/developer_token_auth.py
@@ -22,8 +22,8 @@ def __init__(self, get_new_token_callback=None, **kwargs):
     def _refresh_developer_token(self):
         if self._get_new_token is not None:
             return self._get_new_token()
-        else:
-            return input(self.ENTER_TOKEN_PROMPT)
+
+        return input(self.ENTER_TOKEN_PROMPT)
 
     def _refresh(self, access_token):
         """
diff --git a/boxsdk/auth/jwt_auth.py b/boxsdk/auth/jwt_auth.py
@@ -292,5 +292,4 @@ def _refresh(self, access_token):
         # pylint:disable=unused-argument
         if self._user_id is None:
             return self.authenticate_instance()
-        else:
-            return self.authenticate_user()
+        return self.authenticate_user()
diff --git a/boxsdk/auth/oauth2.py b/boxsdk/auth/oauth2.py
@@ -207,10 +207,10 @@ def refresh(self, access_token_to_refresh):
                 # be refreshed, or if we don't currently have any active access
                 # token, we make the request to refresh the token.
                 return self._refresh(access_token_to_refresh)
-            else:
-                # If the active access token (self._access_token) is not the same as the token needs to be refreshed,
-                # it means the expired token has already been refreshed. Simply return the current active tokens.
-                return access_token, refresh_token
+
+            # If the active access token (self._access_token) is not the same as the token needs to be refreshed,
+            # it means the expired token has already been refreshed. Simply return the current active tokens.
+            return access_token, refresh_token
 
     @staticmethod
     def _get_state_csrf_token():
diff --git a/boxsdk/object/base_api_json_object.py b/boxsdk/object/base_api_json_object.py
@@ -118,8 +118,7 @@ def __repr__(self):
         description = '<Box {0}{1}>'.format(self.__class__.__name__, extra_description)
         if six.PY2:
             return description.encode('utf-8')
-        else:
-            return description
+        return description
 
     @property
     def _description(self):
diff --git a/boxsdk/object/base_object.py b/boxsdk/object/base_object.py
@@ -34,14 +34,14 @@ def _description(self):
         """Base class override.  Return a description for the object."""
         if 'name' in self._response_object:
             return '{0} ({1})'.format(self._object_id, self.name)  # pylint:disable=no-member
-        else:
-            return '{0}'.format(self._object_id)
+        return '{0}'.format(self._object_id)
 
     def get_url(self, *args):
         """
         Base class override.
         Return the given object's URL, appending any optional parts as specified by args.
         """
+        # pylint:disable=arguments-differ
         return super(BaseObject, self).get_url('{0}s'.format(self._item_type), self._object_id, *args)
 
     def get_type_url(self):
diff --git a/boxsdk/object/collaboration.py b/boxsdk/object/collaboration.py
@@ -32,7 +32,6 @@ class Collaboration(BaseObject):
     """An object that represents a collaboration between a folder and an individual or group"""
     _item_type = 'collaboration'
 
-    # pylint:disable=arguments-differ
     @api_call
     def update_info(self, role=None, status=None):
         """Edit an existing collaboration on Box
@@ -53,6 +52,7 @@ def update_info(self, role=None, status=None):
         :raises:
             :class:`BoxAPIException` if current user doesn't have permissions to edit the collaboration.
         """
+        # pylint:disable=arguments-differ
         data = {}
         if role:
             data['role'] = role
diff --git a/boxsdk/object/events.py b/boxsdk/object/events.py
@@ -55,6 +55,7 @@ class Events(BaseEndpoint):
 
     def get_url(self, *args):
         """Base class override."""
+        # pylint:disable=arguments-differ
         return super(Events, self).get_url('events', *args)
 
     @api_call
diff --git a/boxsdk/object/folder.py b/boxsdk/object/folder.py
@@ -387,4 +387,5 @@ def delete(self, recursive=True, etag=None):
             `bool`
         :raises: :class:`BoxAPIException` if the specified etag doesn't match the latest version of the folder.
         """
+        # pylint:disable=arguments-differ
         return super(Folder, self).delete({'recursive': recursive}, etag)
diff --git a/boxsdk/object/item.py b/boxsdk/object/item.py
@@ -334,6 +334,7 @@ def delete(self, params=None, etag=None):
             `bool`
         :raises: :class:`BoxAPIException` if the specified etag doesn't match the latest version of the item.
         """
+        # pylint:disable=arguments-differ
         headers = {'If-Match': etag} if etag is not None else None
         return super(Item, self).delete(params, headers)
 
diff --git a/boxsdk/object/metadata.py b/boxsdk/object/metadata.py
@@ -126,6 +126,7 @@ def __init__(self, session, box_object, scope, template):
 
     def get_url(self, *args):
         """ Base class override. """
+        # pylint:disable=arguments-differ
         return self._object.get_url('metadata', self._scope, self._template)
 
     @staticmethod
diff --git a/boxsdk/object/search.py b/boxsdk/object/search.py
@@ -129,6 +129,7 @@ def get_url(self, *args):
         :rtype:
             `unicode`
         """
+        # pylint:disable=arguments-differ
         return super(Search, self).get_url('search')
 
     @staticmethod
diff --git a/boxsdk/util/api_call_decorator.py b/boxsdk/util/api_call_decorator.py
@@ -41,7 +41,7 @@ def call(*args, **kwargs):
             instance = _instance
             if instance is None:
                 # If this is being called as an unbound method, the instance is the first arg.
-                if owner is not None and len(args) > 0 and isinstance(args[0], owner):
+                if owner is not None and args and isinstance(args[0], owner):
                     instance = args[0]
                     args = args[1:]
                 else:
diff --git a/boxsdk/util/enum.py b/boxsdk/util/enum.py
@@ -1,4 +1,5 @@
 # coding: utf-8
+# pylint:disable=no-value-for-parameter
 
 from __future__ import absolute_import, unicode_literals
 
@@ -131,7 +132,7 @@ def __getattr__(cls, name):
                 # and __getitem__ have the same behavior. And __getitem__ has
                 # the advantage of never grabbing anything other than enum
                 # members.
-                return cls[name]
+                return cls[name]  # pylint:disable=unsubscriptable-object
             except KeyError:
                 pass
             # This needs to be `reraise()`, and not just `raise`. Otherwise,
diff --git a/requirements-dev.txt b/requirements-dev.txt
@@ -7,6 +7,6 @@ pylint
 pytest>=2.8.3
 pytest-cov
 pytest-xdist
-sphinx
+sphinx>=1.5,<1.6
 sqlalchemy
 tox
diff --git a/setup.cfg b/setup.cfg
@@ -6,3 +6,6 @@ universal=1
 
 [metadata]
 license_file=LICENSE
+
+[isort]
+known_first_party=test
diff --git a/test/functional/test_delete.py b/test/functional/test_delete.py
@@ -12,13 +12,13 @@ def test_upload_then_delete(box_client, test_file_path, test_file_content, file_
     with patch('boxsdk.object.folder.open', streamable_mock_open(read_data=test_file_content), create=True):
         file_object = box_client.folder('0').upload(test_file_path, file_name)
     assert file_object.delete()
-    assert len(box_client.folder('0').get_items(1)) == 0
+    assert not box_client.folder('0').get_items(1)
 
 
 def test_create_folder_then_update_info(box_client, folder_name):
     folder = box_client.folder('0').create_subfolder(folder_name)
     assert folder.delete()
-    assert len(box_client.folder('0').get_items(1)) == 0
+    assert not box_client.folder('0').get_items(1)
 
 
 @pytest.mark.parametrize('constructor', [Client.file, Client.folder])
diff --git a/test/unit/network/test_logging_network.py b/test/unit/network/test_logging_network.py
@@ -49,8 +49,8 @@ def _assert_logger_called_once_with(method_name, *args, **kwargs):
         getattr(logger, method_name).assert_called_once_with(*args, **kwargs)
         method_names = set(logger_method_names)
         method_names.discard(method_name)
-        for method_name in method_names:
-            getattr(logger, method_name).assert_not_called()
+        for name in method_names:
+            getattr(logger, name).assert_not_called()
 
     return _assert_logger_called_once_with
 
diff --git a/test/unit/object/test_metadata.py b/test/unit/object/test_metadata.py
@@ -35,8 +35,7 @@ def metadata_template(request):
 def test_object(test_file, test_folder, request):
     if request.param == 'file':
         return test_file
-    else:
-        return test_folder
+    return test_folder
 
 
 @pytest.mark.parametrize('success', [True, False])
diff --git a/test/util/streamable_mock_open.py b/test/util/streamable_mock_open.py
@@ -18,10 +18,10 @@ def read(size=-1):
         if size == -1:
             handle.position = len(read_data)
             return read_data
-        else:
-            data = read_data[handle.position:handle.position + size]
-            handle.position += size
-            return data
+
+        data = read_data[handle.position:handle.position + size]
+        handle.position += size
+        return data
 
     # pylint:disable=no-member
     handle.tell.side_effect = tell
diff --git a/tox.ini b/tox.ini
@@ -54,7 +54,6 @@ deps = -rrequirements-dev.txt
 changedir = docs
 deps =
   -rrequirements-dev.txt
-  sphinx
 commands =
   sphinx-apidoc -f -o source ../boxsdk
   make html
