diff --git a/Makefile b/Makefile index 33dda1c2b1..acfb9f8ca8 100644 --- a/Makefile +++ b/Makefile @@ -284,7 +284,7 @@ requirements_jenkins: requirements: virtualenv requirements_ansible requirements_tower -requirements_dev: virtualenv requirements_ansible requirements_tower_dev +requirements_dev: requirements requirements_tower_dev # "Install" ansible-tower package in development mode. develop: diff --git a/requirements/requirements_dev.txt b/requirements/requirements_dev.txt index 214bbe601b..ff39fd09f9 100644 --- a/requirements/requirements_dev.txt +++ b/requirements/requirements_dev.txt @@ -1,4 +1,3 @@ --r requirements.txt django-debug-toolbar==1.4 unittest2 pep8 @@ -9,4 +8,3 @@ pytest-cov pytest-django pytest-pythonpath pytest-mock -django-split-settings diff --git a/setup.cfg b/setup.cfg index 97ce43f2e8..ee1d85aa29 100755 --- a/setup.cfg +++ b/setup.cfg @@ -14,8 +14,8 @@ # W391 - Blank line at end of file # W293 - Blank line contains whitespace ignore=E201,E203,E221,E225,E231,E241,E251,E261,E265,E302,E303,E501,W291,W391,W293 -exclude=.tox,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 +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 -exclude=.tox,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 +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