Skip to content

Commit

Permalink
Update pylint and astroid and tweak formatting to pass lint. (opsdroi…
Browse files Browse the repository at this point in the history
  • Loading branch information
jacobtomlinson committed Dec 30, 2017
1 parent 203afc1 commit 101ec92
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 9 deletions.
4 changes: 2 additions & 2 deletions opsdroid/__main__.py
Original file line number Diff line number Diff line change
Expand Up @@ -99,8 +99,8 @@ def welcome_message(config):
"http://opsdroid.readthedocs.io/#configuration")
_LOGGER.info("Watch the Get Started Videos at: "
"http://bit.ly/2fnC0Fh")
_LOGGER.info("Install Opsdroid Desktop at: \n" +
"https://github.com/opsdroid/opsdroid-desktop/" +
_LOGGER.info("Install Opsdroid Desktop at: \n"
"https://github.com/opsdroid/opsdroid-desktop/"
"releases")
_LOGGER.info("=" * 40)
except KeyError:
Expand Down
2 changes: 1 addition & 1 deletion opsdroid/core.py
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ def default_connector(self):

def exit(self):
"""Exit application."""
_LOGGER.info("Exiting application with return code " +
_LOGGER.info("Exiting application with return code %s",
str(self.sys_status))
sys.exit(self.sys_status)

Expand Down
7 changes: 4 additions & 3 deletions opsdroid/loader.py
Original file line number Diff line number Diff line change
Expand Up @@ -79,11 +79,12 @@ def check_cache(config):
def build_module_path(self, path_type, config):
"""Generate the module path from name and type."""
if path_type == "import":
return MODULES_DIRECTORY + "." + config["type"] + \
path = MODULES_DIRECTORY + "." + config["type"] + \
"." + config["name"]
elif path_type == "install":
return self.modules_directory + "/" + config["type"] + \
path = self.modules_directory + "/" + config["type"] + \
"/" + config["name"]
return path

@staticmethod
def git_clone(git_url, install_path, branch):
Expand Down Expand Up @@ -345,4 +346,4 @@ def _install_local_module(config):
installed = True

if not installed:
_LOGGER.error("Failed to install from " + config["path"])
_LOGGER.error("Failed to install from %s", config["path"])
5 changes: 2 additions & 3 deletions requirements_test.txt
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
flake8==3.5.0
pylint==1.7.5
pylint==1.8.1
coveralls==1.2.0
astroid==1.5.3
astroid==1.6.0
pytest==3.3.1
pytest-cov==2.5.1
pytest-timeout==1.2.1
pytest-catchlog==1.2.2
pydocstyle==2.1.1
asynctest==0.11.1
requests_mock==1.4.0
Expand Down

0 comments on commit 101ec92

Please sign in to comment.