jenkins-bot has submitted this change and it was merged.
Change subject: Run flake8 with tox
......................................................................
Run flake8 with tox
Fix a few trivial errors in fabfile.py
Change-Id: I9813f7c66223229358ab57d40a379223e865ed7f
---
M .gitignore
M labs-migration-assistant/fabfile.py
M tox.ini
3 files changed, 11 insertions(+), 11 deletions(-)
Approvals:
Hashar: Looks good to me, approved
jenkins-bot: Verified
diff --git a/.gitignore b/.gitignore
index 2f78cf5..ff124d8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
+/.tox
*.pyc
-
diff --git a/labs-migration-assistant/fabfile.py
b/labs-migration-assistant/fabfile.py
index 308f8a8..a8e3dd4 100644
--- a/labs-migration-assistant/fabfile.py
+++ b/labs-migration-assistant/fabfile.py
@@ -30,7 +30,7 @@
import yaml
import requests
-from fabric.api import *
+from fabric.api import * # noqa
from datetime import datetime
from ansistrm import ColorizingStreamHandler
@@ -57,7 +57,7 @@
env.disable_known_hosts = True
env.reject_unknown_hosts = False
env.gateway = 'bastion.wmflabs.org'
-if not 'ignored_hosts' in env:
+if 'ignored_hosts' not in env:
env.ignored_hosts = ''
env.ignored_hosts = env.ignored_hosts.split(';')
env.key_filename = os.path.join(os.path.expanduser('~'), '.ssh/id_rsa')
@@ -115,7 +115,7 @@
# TODO: only analyse instances in Tampa, make this configurable?
if dc == 'pmtpa':
for name in names:
- if not name.startswith('tools') and not
name.startswith('bastion') and not name in env.ignored_hosts:
+ if not name.startswith('tools') and not
name.startswith('bastion') and name not in env.ignored_hosts:
# ignore all tool-labs instances as they are managed by
# WMF.
labinstance = LabInstance(name, project, dc)
@@ -349,7 +349,6 @@
@check_connection
def check_ubuntu():
min_ubuntu_version = 11.04
- result = run('lsb_release -a')
version = run('lsb_release -r -s')
try:
version = float(version)
diff --git a/tox.ini b/tox.ini
index f8ad589..22f5ccc 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,10 +1,11 @@
-[flake8]
-exclude=.venv,.tox,dist,doc,build,*.egg
-; W191 indentation contains tabs
-; E501 line too long (X > 79 characters)
-ignore=W191,E501
+[tox]
+skipsdist = True
-[pep8]
+[testenv:flake8]
+commands = flake8
+deps = flake8
+
+[flake8]
exclude=.venv,.tox,dist,doc,build,*.egg
; W191 indentation contains tabs
; E501 line too long (X > 79 characters)
--
To view, visit https://gerrit.wikimedia.org/r/242549
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9813f7c66223229358ab57d40a379223e865ed7f
Gerrit-PatchSet: 1
Gerrit-Project: labs/migration-assistant
Gerrit-Branch: master
Gerrit-Owner: Hashar <has...@free.fr>
Gerrit-Reviewer: Hashar <has...@free.fr>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
