👕 make lint process pass and update coding style

Author: chfw

.moban.yml

@@ -1,6 +1,6 @@
 configuration:
   template_dir:
-  - "git://github.com/moremoban/pypi-mobans.git?submodule=true!/templates"
+  - "git://github.com/moremoban/pypi-mobans.git?submodule=true&branch=dev!/templates"
   - ".moban.d"
   configuration: gitfs2.yml
 targets:

.travis.yml

@@ -37,8 +37,7 @@ stages:
     submodules: false
   python: 3.6
   stage: lint
-  install: pip install flake8
-  script: flake8
+  script: make lint
 
 .moban: &moban
   <<: *disable_global

gitfs2.yml

@@ -17,3 +17,4 @@ entry_points:
     - "git = gitfs2:GitFSOpener"
 description: "Python file system 2 over GitPython"
 moban_command: make format git-diff-check
+lint_command: make lint

gitfs2/__init__.py

@@ -1,4 +1,3 @@
 # flake8: noqa
-from gitfs2._version import __version__
-from gitfs2._version import __author__
 from gitfs2.opener import GitFSOpener
+from gitfs2._version import __author__, __version__

gitfs2/opener.py

@@ -10,21 +10,20 @@ class GitFSOpener(Opener):
     def open_fs(self, fs_url, parse_result, writeable, create, cwd):
         repo_name, _, dir_path = parse_result.resource.partition("/")
         git_url = "{protocol}://{resource}".format(
-            protocol=parse_result.protocol,
-            resource=parse_result.resource
+            protocol=parse_result.protocol, resource=parse_result.resource
         )
         require = repo.GitRequire(
             git_url=git_url,
-            branch=parse_result.params.get('branch'),
-            submodule=parse_result.params.get('submodule'),
-            reference=parse_result.params.get('reference')
+            branch=parse_result.params.get("branch"),
+            submodule=parse_result.params.get("submodule"),
+            reference=parse_result.params.get("reference"),
         )
         local_folder = repo.git_clone(
-            require,
-            action_required=GitFSOpener.update)
+            require, action_required=GitFSOpener.update
+        )
         if GitFSOpener.update:
             GitFSOpener.update = False
         if parse_result.path:
-            local_folder = local_folder+parse_result.path
+            local_folder = local_folder + parse_result.path
         osfs = OSFS(root_path=local_folder)
         return osfs

gitfs2/repo.py

@@ -5,7 +5,7 @@
 
 import fs
 import fs.path
-from gitfs2 import constants, reporter
+from gitfs2 import reporter, constants
 
 
 class GitRequire(object):
@@ -41,7 +41,7 @@ def __repr__(self):
 
 
 def convert_submodule(submodule_string):
-    if submodule_string in ['1', 'True', 'true']:
+    if submodule_string in ["1", "True", "true"]:
         return True
     return False
 
@@ -93,9 +93,7 @@ def get_repo_name(repo_url):
         repo = giturlparse.parse(repo_url.rstrip("/"))
         return repo.name
     except ParserError:
-        reporter.error(
-            constants.MESSAGE_INVALID_GIT_URL % repo_url
-        )
+        reporter.error(constants.MESSAGE_INVALID_GIT_URL % repo_url)
         raise
 
 

setup.py

@@ -1,14 +1,14 @@
 #!/usr/bin/env python3
 
+import os
+import sys
 # Template by pypi-mobans
 import codecs
 import locale
-import os
 import platform
-import sys
 from shutil import rmtree
 
-from setuptools import Command, find_packages, setup
+from setuptools import Command, setup, find_packages
 
 PY2 = sys.version_info[0] == 2
 PY26 = PY2 and sys.version_info[1] < 7

tests/test_gitfs_opener.py

@@ -1,19 +1,20 @@
 import fs
+from gitfs2.repo import GitRequire
+
 from mock import patch
 from nose.tools import ok_
-from gitfs2.repo import GitRequire
 
 
 @patch("gitfs2.repo.git_clone")
 def test_opener(fake_clone):
-    fake_clone.return_value = '.'
+    fake_clone.return_value = "."
     url = "git://github.com/moremoban/pypi-mobans.git?submodule=true!/tests"
     file_system = fs.open_fs(url)
-    ok_(file_system.exists(u'test_gitfs_opener.py'))
+    ok_(file_system.exists(u"test_gitfs_opener.py"))
     fake_clone.assert_called_with(
         GitRequire(
-            git_url='git://github.com/moremoban/pypi-mobans.git',
-            submodule='true',
+            git_url="git://github.com/moremoban/pypi-mobans.git",
+            submodule="true",
         ),
-        action_required=True
+        action_required=True,
     )

tests/test_repo.py

@@ -1,13 +1,14 @@
 import fs.path
-from mock import patch
 from gitfs2.repo import (
+    GitRequire,
     git_clone,
-    get_repo_name,
     get_app_home,
+    get_repo_name,
     make_sure_git_is_available,
 )
+
+from mock import patch
 from nose.tools import eq_, raises
-from gitfs2.repo import GitRequire
 
 
 @patch("appdirs.user_cache_dir", return_value="root")
@@ -20,7 +21,7 @@ def setUp(self):
         self.repo = "https://github.com/my/" + self.repo_name
         self.require = GitRequire(git_url=self.repo)
         self.require_with_submodule = GitRequire(
-            git_url=self.repo, submodule='True'
+            git_url=self.repo, submodule="True"
         )
         self.require_with_branch = GitRequire(
             git_url=self.repo, branch="ghpages"