From 0dfe3b197a8c09cd18fdbef338dff094457efc6a Mon Sep 17 00:00:00 2001 From: Chris Meyers Date: Mon, 12 Sep 2016 12:45:01 -0400 Subject: [PATCH 1/6] bump pyflakes version --- requirements/requirements_dev.txt | 2 +- requirements/requirements_jenkins.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements/requirements_dev.txt b/requirements/requirements_dev.txt index 5fa57df995..c301be2528 100644 --- a/requirements/requirements_dev.txt +++ b/requirements/requirements_dev.txt @@ -4,7 +4,7 @@ ipython unittest2 pep8 flake8 -pyflakes==1.0.0 # Pinned until PR merges https://gitlab.com/pycqa/flake8/merge_requests/56 +pyflakes pytest==2.9.2 pytest-cov pytest-django diff --git a/requirements/requirements_jenkins.txt b/requirements/requirements_jenkins.txt index 287a714939..1546b0ae3b 100644 --- a/requirements/requirements_jenkins.txt +++ b/requirements/requirements_jenkins.txt @@ -1,6 +1,6 @@ ansible==1.9.4 coverage -pyflakes==1.0.0 # Pinned until PR merges https://gitlab.com/pycqa/flake8/merge_requests/56 +pyflakes pep8 pylint flake8 From c91b10e62de6fd11eb3e832efd3b58fcc4dccffb Mon Sep 17 00:00:00 2001 From: Chris Meyers Date: Mon, 12 Sep 2016 14:06:20 -0400 Subject: [PATCH 2/6] use flake8 inside tower env --- Makefile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Makefile b/Makefile index 5cbc9ac400..64ecb71433 100644 --- a/Makefile +++ b/Makefile @@ -425,6 +425,9 @@ pep8: reports @(set -o pipefail && $@ | tee reports/$@.report) flake8: reports + @if [ "$(VENV_BASE)" ]; then \ + . $(VENV_BASE)/tower/bin/activate; \ + fi; \ @$@ --output-file=reports/$@.report pyflakes: reports From 3969cfa2a0ce210b76ba19e835714d3ee50c7b77 Mon Sep 17 00:00:00 2001 From: Chris Meyers Date: Thu, 15 Sep 2016 08:45:13 -0400 Subject: [PATCH 3/6] Revert "use flake8 inside tower env" This reverts commit 90cdc5c83cb495e0d448f8e9eb7381d5fd84e9d4. --- Makefile | 3 --- 1 file changed, 3 deletions(-) diff --git a/Makefile b/Makefile index 64ecb71433..5cbc9ac400 100644 --- a/Makefile +++ b/Makefile @@ -425,9 +425,6 @@ pep8: reports @(set -o pipefail && $@ | tee reports/$@.report) flake8: reports - @if [ "$(VENV_BASE)" ]; then \ - . $(VENV_BASE)/tower/bin/activate; \ - fi; \ @$@ --output-file=reports/$@.report pyflakes: reports From 0a24a4f9b7c6682da60433cd80e59e89be85c415 Mon Sep 17 00:00:00 2001 From: Chris Meyers Date: Thu, 15 Sep 2016 10:18:10 -0400 Subject: [PATCH 4/6] ignore import splat --- setup.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.cfg b/setup.cfg index ee1d85aa29..ea462fd7fa 100755 --- a/setup.cfg +++ b/setup.cfg @@ -17,5 +17,5 @@ ignore=E201,E203,E221,E225,E231,E241,E251,E261,E265,E302,E303,E501,W291,W391,W29 exclude=.tox,venv,awx/lib/site-packages,awx/plugins/inventory/ec2.py,awx/plugins/inventory/gce.py,awx/plugins/inventory/vmware.py,awx/plugins/inventory/windows_azure.py,awx/plugins/inventory/openstack.py,awx/ui,awx/api/urls.py,awx/main/migrations,awx/main/south_migrations,awx/main/tests/data [flake8] -ignore=E201,E203,E221,E225,E231,E241,E251,E261,E265,E302,E303,E501,W291,W391,W293,E731 +ignore=E201,E203,E221,E225,E231,E241,E251,E261,E265,E302,E303,E501,W291,W391,W293,E731,F405 exclude=.tox,venv,awx/lib/site-packages,awx/plugins/inventory,awx/ui,awx/api/urls.py,awx/main/migrations,awx/main/south_migrations,awx/main/tests/data,node_modules/,awx/projects/,tools/docker,awx/settings/local_settings.py From cb8b6ea29f895bfb1845496dd128e61c0ea3e597 Mon Sep 17 00:00:00 2001 From: Chris Meyers Date: Thu, 15 Sep 2016 08:52:12 -0400 Subject: [PATCH 5/6] fix flake8 --- awx/sso/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/awx/sso/__init__.py b/awx/sso/__init__.py index 347aedfeee..6596e4bf78 100644 --- a/awx/sso/__init__.py +++ b/awx/sso/__init__.py @@ -8,7 +8,7 @@ import threading xmlsec_init_lock = threading.Lock() xmlsec_initialized = False -import dm.xmlsec.binding +import dm.xmlsec.binding # noqa original_xmlsec_initialize = dm.xmlsec.binding.initialize def xmlsec_initialize(*args, **kwargs): From f06b212266897d2142759443a5450904baeffb44 Mon Sep 17 00:00:00 2001 From: Chris Meyers Date: Thu, 15 Sep 2016 10:25:36 -0400 Subject: [PATCH 6/6] flake8 fixes --- awx/settings/defaults.py | 9 --------- 1 file changed, 9 deletions(-) diff --git a/awx/settings/defaults.py b/awx/settings/defaults.py index 89389c02c7..c05857cbd6 100644 --- a/awx/settings/defaults.py +++ b/awx/settings/defaults.py @@ -973,15 +973,6 @@ LOGGING = { 'backupCount': 5, 'formatter':'simple', }, - 'fact_receiver': { - 'level': 'WARNING', - 'class':'logging.handlers.RotatingFileHandler', - 'filters': ['require_debug_false'], - 'filename': os.path.join(LOG_ROOT, 'fact_receiver.log'), - 'maxBytes': 1024 * 1024 * 5, # 5 MB - 'backupCount': 5, - 'formatter':'simple', - }, 'system_tracking_migrations': { 'level': 'WARNING', 'class':'logging.handlers.RotatingFileHandler',