Merge "Update tox/test-requirements"

roles/upload-afs/library/zuul_afs.py

@@ -14,11 +14,15 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this software.  If not, see <http://www.gnu.org/licenses/>.
+from __future__ import absolute_import, division, print_function
+__metaclass__ = type
 
 import os
 import subprocess
 import tempfile
 
+from ansible.module_utils.basic import AnsibleModule
+
 
 def afs_sync(afssource, afstarget):
     # Find the list of root markers in the just-completed build
@@ -106,7 +110,6 @@ def main():
     output = afs_sync(p['source'], p['target'])
     module.exit_json(changed=True, build_roots=output)
 
-from ansible.module_utils.basic import *  # noqa
 
 if __name__ == '__main__':
     main()

test-requirements.txt

@@ -1,8 +1,9 @@
 # The order of packages is significant, because pip processes them in the order
 # of appearance. Changing the order has an impact on the overall integration
 # process, which may cause wedges in the gate later.
-pbr>=1.1.0
-hacking>=0.12.0,<0.13 # Apache-2.0
+pep8
+pyflakes
+flake8
 
 ansible-lint
 bashate>=0.2

tox.ini

@@ -43,6 +43,7 @@ commands = {posargs}
 [flake8]
 # These are ignored intentionally in openstack-infra projects;
 # please don't submit patches that solely correct them or enable them.
-ignore = E125,E129,H
+# E402 - ansible modules put documentation before imports. Align to ansible.
+ignore = E125,E129,E402,H
 show-source = True
 exclude = .venv,.tox,dist,doc,build,*.egg