Description: use py3 Use python 3 for all helper scripts during build . This allows us to not depend on python 2 anymore for building. --- a/docs/bin/find-plugin-refs.py +++ b/docs/bin/find-plugin-refs.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 # To run this script, first make webdocs in the toplevel of the checkout. This will generate all # rst files from their sources. Then run this script ./docs/bin/find-plugin-refs.py --- a/docs/docsite/Makefile +++ b/docs/docsite/Makefile @@ -1,5 +1,5 @@ OS := $(shell uname -s) -SITELIB = $(shell python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()"): +SITELIB = $(shell python3 -c "from distutils.sysconfig import get_python_lib; print get_python_lib()"): PLUGIN_FORMATTER=../../hacking/build-ansible.py document-plugins TESTING_FORMATTER=../bin/testing_formatter.sh KEYWORD_DUMPER=../../hacking/build-ansible.py document-keywords --- a/Makefile +++ b/Makefile @@ -32,7 +32,7 @@ ASCII2MAN = @echo "ERROR: rst2man from docutils command is not installed but is required to build $(MANPAGES)" && exit 1 endif -PYTHON=python +PYTHON=python3 GENERATE_CLI = hacking/build-ansible.py generate-man SITELIB = $(shell $(PYTHON) -c "from distutils.sysconfig import get_python_lib; print get_python_lib()") --- a/contrib/inventory/abiquo.py +++ b/contrib/inventory/abiquo.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 # -*- coding: utf-8 -*- ''' --- a/contrib/inventory/apache-libcloud.py +++ b/contrib/inventory/apache-libcloud.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 # (c) 2013, Sebastien Goasguen <runseb@gmail.com> # --- a/contrib/inventory/apstra_aos.py +++ b/contrib/inventory/apstra_aos.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 # # (c) 2017 Apstra Inc, <community@apstra.com> # --- a/contrib/inventory/azure_rm.py +++ b/contrib/inventory/azure_rm.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 # # Copyright (c) 2016 Matt Davis, <mdavis@ansible.com> # Chris Houseknecht, <house@redhat.com> --- a/contrib/inventory/brook.py +++ b/contrib/inventory/brook.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 # Copyright 2016 Doalitic. # # This file is part of Ansible --- a/contrib/inventory/cloudforms.py +++ b/contrib/inventory/cloudforms.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 # vim: set fileencoding=utf-8 : # # Copyright (C) 2016 Guido Günther <agx@sigxcpu.org> --- a/contrib/inventory/cloudstack.py +++ b/contrib/inventory/cloudstack.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 # -*- coding: utf-8 -*- # # (c) 2015, René Moser <mail@renemoser.net> --- a/contrib/inventory/cobbler.py +++ b/contrib/inventory/cobbler.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 """ Cobbler external inventory script --- a/contrib/inventory/collins.py +++ b/contrib/inventory/collins.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 """ Collins external inventory script --- a/contrib/inventory/consul_io.py +++ b/contrib/inventory/consul_io.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 # # (c) 2015, Steve Gargan <steve.gargan@gmail.com> --- a/contrib/inventory/digital_ocean.py +++ b/contrib/inventory/digital_ocean.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 """ DigitalOcean external inventory script --- a/contrib/inventory/docker.py +++ b/contrib/inventory/docker.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 # # (c) 2016 Paul Durivage <paul.durivage@gmail.com> # Chris Houseknecht <house@redhat.com> --- a/contrib/inventory/ec2.py +++ b/contrib/inventory/ec2.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 ''' EC2 external inventory script --- a/contrib/inventory/fleet.py +++ b/contrib/inventory/fleet.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 """ fleetctl base external inventory script. Automatically finds the IPs of the booted coreos instances and returns it under the host group 'coreos' --- a/contrib/inventory/foreman.py +++ b/contrib/inventory/foreman.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 # vim: set fileencoding=utf-8 : # # Copyright (C) 2016 Guido Günther <agx@sigxcpu.org>, --- a/contrib/inventory/freeipa.py +++ b/contrib/inventory/freeipa.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 # Copyright (c) 2017 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) --- a/contrib/inventory/gce.py +++ b/contrib/inventory/gce.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 # Copyright: (c) 2013, Google Inc. # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) --- a/contrib/inventory/infoblox.py +++ b/contrib/inventory/infoblox.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 # # (c) 2018, Red Hat, Inc. # --- a/contrib/inventory/jail.py +++ b/contrib/inventory/jail.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 # (c) 2013, Michael Scherer <misc@zarb.org> # --- a/contrib/inventory/landscape.py +++ b/contrib/inventory/landscape.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 # (c) 2015, Marc Abramowitz <marca@surveymonkey.com> # --- a/contrib/inventory/libvirt_lxc.py +++ b/contrib/inventory/libvirt_lxc.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 # (c) 2013, Michael Scherer <misc@zarb.org> # --- a/contrib/inventory/linode.py +++ b/contrib/inventory/linode.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 ''' Linode external inventory script --- a/contrib/inventory/lxc_inventory.py +++ b/contrib/inventory/lxc_inventory.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 # # (c) 2015-16 Florian Haas, hastexo Professional Services GmbH # <florian@hastexo.com> --- a/contrib/inventory/lxd.py +++ b/contrib/inventory/lxd.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 # (c) 2013, Michael Scherer <misc@zarb.org> # (c) 2014, Hiroaki Nakamura <hnakamur@gmail.com> --- a/contrib/inventory/mdt_dynamic_inventory.py +++ b/contrib/inventory/mdt_dynamic_inventory.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 # (c) 2016, Julian Barnett <jbarnett@tableau.com> # --- a/contrib/inventory/nagios_livestatus.py +++ b/contrib/inventory/nagios_livestatus.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 # (c) 2015, Yannig Perre <yannig.perre@gmail.com> # --- a/contrib/inventory/nagios_ndo.py +++ b/contrib/inventory/nagios_ndo.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 # (c) 2014, Jonathan Lestrelin <jonathan.lestrelin@gmail.com> # --- a/contrib/inventory/nsot.py +++ b/contrib/inventory/nsot.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 ''' nsot --- a/contrib/inventory/openshift.py +++ b/contrib/inventory/openshift.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 # (c) 2013, Michael Scherer <misc@zarb.org> # --- a/contrib/inventory/openstack_inventory.py +++ b/contrib/inventory/openstack_inventory.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 # Copyright (c) 2012, Marco Vito Moscaritolo <marco@agavee.com> # Copyright (c) 2013, Jesse Keating <jesse.keating@rackspace.com> --- a/contrib/inventory/openvz.py +++ b/contrib/inventory/openvz.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 # -*- coding: utf-8 -*- # # openvz.py --- a/contrib/inventory/ovirt.py +++ b/contrib/inventory/ovirt.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 # Copyright 2015 IIX Inc. # # This file is part of Ansible --- a/contrib/inventory/ovirt4.py +++ b/contrib/inventory/ovirt4.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 # -*- coding: utf-8 -*- # # Copyright (c) 2016 Red Hat, Inc. --- a/contrib/inventory/packet_net.py +++ b/contrib/inventory/packet_net.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 ''' Packet.net external inventory script --- a/contrib/inventory/proxmox.py +++ b/contrib/inventory/proxmox.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 # Copyright (C) 2014 Mathieu GAUTHIER-LAFAYE <gauthierl@lapth.cnrs.fr> # --- a/contrib/inventory/rackhd.py +++ b/contrib/inventory/rackhd.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 # This file is part of Ansible # --- a/contrib/inventory/rax.py +++ b/contrib/inventory/rax.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 # (c) 2013, Jesse Keating <jesse.keating@rackspace.com, # Paul Durivage <paul.durivage@rackspace.com>, --- a/contrib/inventory/rudder.py +++ b/contrib/inventory/rudder.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 # Copyright (c) 2015, Normation SAS # --- a/contrib/inventory/scaleway.py +++ b/contrib/inventory/scaleway.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 # -*- coding: utf-8 -*- ''' --- a/contrib/inventory/serf.py +++ b/contrib/inventory/serf.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 # (c) 2015, Marc Abramowitz <marca@surveymonkey.com> # --- a/contrib/inventory/softlayer.py +++ b/contrib/inventory/softlayer.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 """ SoftLayer external inventory script. --- a/contrib/inventory/spacewalk.py +++ b/contrib/inventory/spacewalk.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 """ Spacewalk external inventory script --- a/contrib/inventory/ssh_config.py +++ b/contrib/inventory/ssh_config.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 # (c) 2014, Tomas Karasek <tomas.karasek@digile.fi> # --- a/contrib/inventory/stacki.py +++ b/contrib/inventory/stacki.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 # Copyright (c) 2016, Hugh Ma <hugh.ma@flextronics.com> # --- a/contrib/inventory/vagrant.py +++ b/contrib/inventory/vagrant.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 """ Vagrant external inventory script. Automatically finds the IP of the booted vagrant vm(s), and returns it under the host group 'vagrant' --- a/contrib/inventory/vbox.py +++ b/contrib/inventory/vbox.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 # This file is part of Ansible, # --- a/contrib/inventory/vmware.py +++ b/contrib/inventory/vmware.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 # -*- coding: utf-8 -*- ''' VMware Inventory Script --- a/contrib/inventory/vmware_inventory.py +++ b/contrib/inventory/vmware_inventory.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 # -*- coding: utf-8 -*- # # Copyright (C): 2017, Ansible Project --- a/contrib/inventory/zabbix.py +++ b/contrib/inventory/zabbix.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 # (c) 2013, Greg Buehler # (c) 2018, Filippo Ferrazini --- a/contrib/inventory/zone.py +++ b/contrib/inventory/zone.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 # (c) 2015, Dagobert Michelsen <dam@baltic-online.de> # --- a/lib/ansible/cli/scripts/ansible_cli_stub.py +++ b/lib/ansible/cli/scripts/ansible_cli_stub.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 # -*- coding: utf-8 -*- # (c) 2012, Michael DeHaan <michael.dehaan@gmail.com> # --- a/lib/ansible/cli/scripts/ansible_connection_cli_stub.py +++ b/lib/ansible/cli/scripts/ansible_connection_cli_stub.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 # Copyright: (c) 2017, Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) from __future__ import (absolute_import, division, print_function) --- a/packaging/release/changelogs/changelog.py +++ b/packaging/release/changelogs/changelog.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 # PYTHON_ARGCOMPLETE_OK """Changelog generator and linter.""" --- a/packaging/sdist/check-link-behavior.py +++ b/packaging/sdist/check-link-behavior.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 """Checks for link behavior required for sdist to retain symlinks.""" from __future__ import (absolute_import, division, print_function) --- a/test/integration/targets/cli/test-cli.py +++ b/test/integration/targets/cli/test-cli.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 # Copyright (c) 2019 Matt Martz <matt@sivel.net> # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) --- a/test/integration/targets/gathering/uuid.fact +++ b/test/integration/targets/gathering/uuid.fact @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 # -*- coding: utf-8 -*- --- a/test/integration/targets/gathering_facts/uuid.fact +++ b/test/integration/targets/gathering_facts/uuid.fact @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 # -*- coding: utf-8 -*- --- a/test/integration/targets/group/files/gidget.py +++ b/test/integration/targets/group/files/gidget.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 import grp --- a/test/integration/targets/inventory_aws_conformance/inventory_diff.py +++ b/test/integration/targets/inventory_aws_conformance/inventory_diff.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 import json import sys --- a/test/integration/targets/inventory_aws_conformance/lib/boto/session.py +++ b/test/integration/targets/inventory_aws_conformance/lib/boto/session.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 # boto3 from boto.mocks.instances import Boto3Instance --- a/test/integration/targets/inventory_kubevirt_conformance/inventory_diff.py +++ b/test/integration/targets/inventory_kubevirt_conformance/inventory_diff.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 import json import sys --- a/test/integration/targets/inventory_kubevirt_conformance/server.py +++ b/test/integration/targets/inventory_kubevirt_conformance/server.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 import json import os --- a/test/integration/targets/mail/files/smtpserver.py +++ b/test/integration/targets/mail/files/smtpserver.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 # -*- coding: utf-8 -*- # Copyright: (c) 2018, Dag Wieers (@dagwieers) <dag@wieers.com> --- a/test/integration/targets/module_utils/module_utils/foo.py +++ b/test/integration/targets/module_utils/module_utils/foo.py @@ -1,3 +1,3 @@ -#!/usr/bin/env python +#!/usr/bin/python3 foo = "FOO FROM foo.py" --- a/test/integration/targets/module_utils/module_utils/sub/bam.py +++ b/test/integration/targets/module_utils/module_utils/sub/bam.py @@ -1,3 +1,3 @@ -#!/usr/bin/env python +#!/usr/bin/python3 bam = "BAM FROM sub/bam.py" --- a/test/integration/targets/module_utils/module_utils/sub/bam/bam.py +++ b/test/integration/targets/module_utils/module_utils/sub/bam/bam.py @@ -1,3 +1,3 @@ -#!/usr/bin/env python +#!/usr/bin/python3 bam = "BAM FROM sub/bam/bam.py" --- a/test/integration/targets/module_utils/module_utils/sub/bar/bam.py +++ b/test/integration/targets/module_utils/module_utils/sub/bar/bam.py @@ -1,3 +1,3 @@ -#!/usr/bin/env python +#!/usr/bin/python3 bam = "BAM FROM sub/bar/bam.py" --- a/test/integration/targets/module_utils/module_utils/sub/bar/bar.py +++ b/test/integration/targets/module_utils/module_utils/sub/bar/bar.py @@ -1,3 +1,3 @@ -#!/usr/bin/env python +#!/usr/bin/python3 bar = "BAR FROM sub/bar/bar.py" --- a/test/integration/targets/pause/test-pause.py +++ b/test/integration/targets/pause/test-pause.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 import os import pexpect --- a/test/integration/targets/pip/files/setup.py +++ b/test/integration/targets/pip/files/setup.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 from setuptools import setup, find_packages --- a/test/integration/targets/service/files/ansible_test_service.py +++ b/test/integration/targets/service/files/ansible_test_service.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 # this is mostly based off of the code found here: # http://code.activestate.com/recipes/278731-creating-a-daemon-the-python-way/ --- a/test/integration/targets/setup_rpm_repo/files/create-repo.py +++ b/test/integration/targets/setup_rpm_repo/files/create-repo.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 import sys --- a/test/integration/targets/sts_assume_role/tasks/main.yml +++ b/test/integration/targets/sts_assume_role/tasks/main.yml @@ -9,7 +9,7 @@ path: "{{ output_dir }}/sts.py" create: yes block: | - #!/usr/bin/env python + #!/usr/bin/python3 import boto3 sts = boto3.client('sts') response = sts.get_caller_identity() --- a/test/integration/targets/supervisorctl/files/sendProcessStdin.py +++ b/test/integration/targets/supervisorctl/files/sendProcessStdin.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 # -*- coding: utf-8 -*- import sys import time --- a/test/integration/targets/template/role_filter/filter_plugins/myplugin.py +++ b/test/integration/targets/template/role_filter/filter_plugins/myplugin.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 class FilterModule(object): --- a/test/integration/targets/throttle/test_throttle.py +++ b/test/integration/targets/throttle/test_throttle.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 from __future__ import (absolute_import, division, print_function) __metaclass__ = type --- a/test/integration/targets/var_precedence/ansible-var-precedence-check.py +++ b/test/integration/targets/var_precedence/ansible-var-precedence-check.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 # A tool to check the order of precedence for ansible variables # https://github.com/ansible/ansible/blob/devel/test/integration/test_var_precedence.yml --- a/test/integration/targets/vars_prompt/test-vars_prompt.py +++ b/test/integration/targets/vars_prompt/test-vars_prompt.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 import os import pexpect --- a/test/integration/targets/vault/faux-editor.py +++ b/test/integration/targets/vault/faux-editor.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 # # Ansible is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by --- a/test/integration/targets/vault/password-script.py +++ b/test/integration/targets/vault/password-script.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 # # Ansible is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by --- a/test/integration/targets/vault/test-vault-client.py +++ b/test/integration/targets/vault/test-vault-client.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 # -*- coding: utf-8 -*- ANSIBLE_METADATA = {'status': ['preview'], --- a/test/lib/ansible_test/_data/cli/ansible_test_cli_stub.py +++ b/test/lib/ansible_test/_data/cli/ansible_test_cli_stub.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 # PYTHON_ARGCOMPLETE_OK """Command line entry point for ansible-test.""" --- a/test/lib/ansible_test/_data/injector/python.py +++ b/test/lib/ansible_test/_data/injector/python.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 """Provides an entry point for python scripts and python modules on the controller with the current python interpreter and optional code coverage collection.""" from __future__ import (absolute_import, division, print_function) __metaclass__ = type --- a/test/lib/ansible_test/_data/sanity/code-smell/action-plugin-docs.py +++ b/test/lib/ansible_test/_data/sanity/code-smell/action-plugin-docs.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 """Test to verify action plugins have an associated module to provide documentation.""" from __future__ import (absolute_import, division, print_function) __metaclass__ = type --- a/test/lib/ansible_test/_data/sanity/code-smell/empty-init.py +++ b/test/lib/ansible_test/_data/sanity/code-smell/empty-init.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 from __future__ import (absolute_import, division, print_function) __metaclass__ = type --- a/test/lib/ansible_test/_data/sanity/code-smell/future-import-boilerplate.py +++ b/test/lib/ansible_test/_data/sanity/code-smell/future-import-boilerplate.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 from __future__ import (absolute_import, division, print_function) __metaclass__ = type --- a/test/lib/ansible_test/_data/sanity/code-smell/line-endings.py +++ b/test/lib/ansible_test/_data/sanity/code-smell/line-endings.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 from __future__ import (absolute_import, division, print_function) __metaclass__ = type --- a/test/lib/ansible_test/_data/sanity/code-smell/metaclass-boilerplate.py +++ b/test/lib/ansible_test/_data/sanity/code-smell/metaclass-boilerplate.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 from __future__ import (absolute_import, division, print_function) __metaclass__ = type --- a/test/lib/ansible_test/_data/sanity/code-smell/no-assert.py +++ b/test/lib/ansible_test/_data/sanity/code-smell/no-assert.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 from __future__ import (absolute_import, division, print_function) __metaclass__ = type --- a/test/lib/ansible_test/_data/sanity/code-smell/no-basestring.py +++ b/test/lib/ansible_test/_data/sanity/code-smell/no-basestring.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 from __future__ import (absolute_import, division, print_function) __metaclass__ = type --- a/test/lib/ansible_test/_data/sanity/code-smell/no-dict-iteritems.py +++ b/test/lib/ansible_test/_data/sanity/code-smell/no-dict-iteritems.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 from __future__ import (absolute_import, division, print_function) __metaclass__ = type --- a/test/lib/ansible_test/_data/sanity/code-smell/no-dict-iterkeys.py +++ b/test/lib/ansible_test/_data/sanity/code-smell/no-dict-iterkeys.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 from __future__ import (absolute_import, division, print_function) __metaclass__ = type --- a/test/lib/ansible_test/_data/sanity/code-smell/no-dict-itervalues.py +++ b/test/lib/ansible_test/_data/sanity/code-smell/no-dict-itervalues.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 from __future__ import (absolute_import, division, print_function) __metaclass__ = type --- a/test/lib/ansible_test/_data/sanity/code-smell/no-get-exception.py +++ b/test/lib/ansible_test/_data/sanity/code-smell/no-get-exception.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 from __future__ import (absolute_import, division, print_function) __metaclass__ = type --- a/test/lib/ansible_test/_data/sanity/code-smell/no-illegal-filenames.py +++ b/test/lib/ansible_test/_data/sanity/code-smell/no-illegal-filenames.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 # a script to check for illegal filenames on various Operating Systems. The # main rules are derived from restrictions on Windows --- a/test/lib/ansible_test/_data/sanity/code-smell/no-main-display.py +++ b/test/lib/ansible_test/_data/sanity/code-smell/no-main-display.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 from __future__ import (absolute_import, division, print_function) __metaclass__ = type --- a/test/lib/ansible_test/_data/sanity/code-smell/no-smart-quotes.py +++ b/test/lib/ansible_test/_data/sanity/code-smell/no-smart-quotes.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 # -*- coding: utf-8 -*- from __future__ import (absolute_import, division, print_function) __metaclass__ = type --- a/test/lib/ansible_test/_data/sanity/code-smell/no-unicode-literals.py +++ b/test/lib/ansible_test/_data/sanity/code-smell/no-unicode-literals.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 from __future__ import (absolute_import, division, print_function) __metaclass__ = type --- a/test/lib/ansible_test/_data/sanity/code-smell/replace-urlopen.py +++ b/test/lib/ansible_test/_data/sanity/code-smell/replace-urlopen.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 from __future__ import (absolute_import, division, print_function) __metaclass__ = type --- a/test/lib/ansible_test/_data/sanity/code-smell/shebang.py +++ b/test/lib/ansible_test/_data/sanity/code-smell/shebang.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 from __future__ import (absolute_import, division, print_function) __metaclass__ = type --- a/test/lib/ansible_test/_data/sanity/code-smell/symlinks.py +++ b/test/lib/ansible_test/_data/sanity/code-smell/symlinks.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 from __future__ import (absolute_import, division, print_function) __metaclass__ = type --- a/test/lib/ansible_test/_data/sanity/code-smell/use-argspec-type-path.py +++ b/test/lib/ansible_test/_data/sanity/code-smell/use-argspec-type-path.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 from __future__ import (absolute_import, division, print_function) __metaclass__ = type --- a/test/lib/ansible_test/_data/sanity/code-smell/use-compat-six.py +++ b/test/lib/ansible_test/_data/sanity/code-smell/use-compat-six.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 from __future__ import (absolute_import, division, print_function) __metaclass__ = type --- a/test/lib/ansible_test/_data/sanity/compile/compile.py +++ b/test/lib/ansible_test/_data/sanity/compile/compile.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 """Python syntax checker with lint friendly output.""" from __future__ import (absolute_import, division, print_function) __metaclass__ = type --- a/test/lib/ansible_test/_data/sanity/import/importer.py +++ b/test/lib/ansible_test/_data/sanity/import/importer.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 """Import the given python module(s) and report error(s) encountered.""" from __future__ import (absolute_import, division, print_function) __metaclass__ = type --- a/test/lib/ansible_test/_data/sanity/validate-modules/main.py +++ b/test/lib/ansible_test/_data/sanity/validate-modules/main.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 from __future__ import (absolute_import, division, print_function) __metaclass__ = type --- a/test/lib/ansible_test/_data/sanity/yamllint/yamllinter.py +++ b/test/lib/ansible_test/_data/sanity/yamllint/yamllinter.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 """Wrapper around yamllint that supports YAML embedded in Ansible modules.""" from __future__ import (absolute_import, division, print_function) __metaclass__ = type --- a/test/lib/ansible_test/_data/versions.py +++ b/test/lib/ansible_test/_data/versions.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 """Show python and pip versions.""" from __future__ import (absolute_import, division, print_function) __metaclass__ = type --- a/test/lib/ansible_test/_data/virtualenvcheck.py +++ b/test/lib/ansible_test/_data/virtualenvcheck.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 """Detect the real python interpreter when running in a virtual environment created by the 'virtualenv' module.""" from __future__ import (absolute_import, division, print_function) __metaclass__ = type --- a/test/lib/ansible_test/_data/yamlcheck.py +++ b/test/lib/ansible_test/_data/yamlcheck.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 """Show python and pip versions.""" from __future__ import (absolute_import, division, print_function) __metaclass__ = type --- a/test/sanity/code-smell/azure-requirements.py +++ b/test/sanity/code-smell/azure-requirements.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 """Make sure the Azure requirements files match.""" from __future__ import (absolute_import, division, print_function) __metaclass__ = type --- a/test/sanity/code-smell/changelog.py +++ b/test/sanity/code-smell/changelog.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 from __future__ import (absolute_import, division, print_function) __metaclass__ = type --- a/test/sanity/code-smell/configure-remoting-ps1.py +++ b/test/sanity/code-smell/configure-remoting-ps1.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 from __future__ import (absolute_import, division, print_function) __metaclass__ = type --- a/test/sanity/code-smell/deprecated-config.py +++ b/test/sanity/code-smell/deprecated-config.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 # -*- coding: utf-8 -*- # (c) 2018, Matt Martz <matt@sivel.net> # --- a/test/sanity/code-smell/docs-build.py +++ b/test/sanity/code-smell/docs-build.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 from __future__ import (absolute_import, division, print_function) __metaclass__ = type --- a/test/sanity/code-smell/no-unwanted-files.py +++ b/test/sanity/code-smell/no-unwanted-files.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 """Prevent unwanted files from being added to the source tree.""" from __future__ import (absolute_import, division, print_function) __metaclass__ = type --- a/test/sanity/code-smell/obsolete-files.py +++ b/test/sanity/code-smell/obsolete-files.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 """Prevent files from being added to directories that are now obsolete.""" from __future__ import (absolute_import, division, print_function) __metaclass__ = type --- a/test/sanity/code-smell/package-data.py +++ b/test/sanity/code-smell/package-data.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 from __future__ import (absolute_import, division, print_function) __metaclass__ = type --- a/test/sanity/code-smell/required-and-default-attributes.py +++ b/test/sanity/code-smell/required-and-default-attributes.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 from __future__ import (absolute_import, division, print_function) __metaclass__ = type --- a/test/sanity/code-smell/test-constraints.py +++ b/test/sanity/code-smell/test-constraints.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 from __future__ import (absolute_import, division, print_function) __metaclass__ = type --- a/test/sanity/code-smell/update-bundled.py +++ b/test/sanity/code-smell/update-bundled.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 # -*- coding: utf-8 -*- # (c) 2018, Ansible Project #