Merge "Test with and assert support for python3"

plugins/doc_fragments/openstack.py

@@ -86,7 +86,7 @@ options:
     default: public
     aliases: [ endpoint_type ]
 requirements:
-  - python >= 2.7
+  - python >= 3.6
   - openstacksdk >= 0.12.0
 notes:
   - The standard OpenStack environment variables, such as C(OS_USERNAME)

plugins/modules/os_auth.py

@@ -17,7 +17,7 @@ author: "Monty Taylor (@emonty)"
 description:
     - Retrieve an auth token from an OpenStack Cloud
 requirements:
-    - "python >= 2.7"
+    - "python >= 3.6""
     - "openstacksdk"
 options:
   availability_zone:

plugins/modules/os_flavor_info.py

@@ -26,7 +26,7 @@ description:
 notes:
     - The result contains a list of unsorted flavors.
 requirements:
-    - "python >= 2.7"
+    - "python >= 3.6""
     - "openstacksdk"
 options:
    name:

plugins/modules/os_group.py

@@ -36,7 +36,7 @@ options:
      description:
        - Ignored. Present for backwards compatibility
 requirements:
-    - "python >= 2.7"
+    - "python >= 3.6""
     - "openstacksdk"
 
 extends_documentation_fragment:

plugins/modules/os_group_info.py

@@ -17,7 +17,7 @@ author: "Phillipe Smith (@phsmith)"
 description:
     - Retrieve info about a one or more OpenStack groups.
 requirements:
-    - "python >= 2.7"
+    - "python >= 3.6""
     - "openstacksdk"
 options:
    name:

plugins/modules/os_image_info.py

@@ -18,7 +18,7 @@ description:
     - This module was called C(os_image_facts) before Ansible 2.9, returning C(ansible_facts).
       Note that the M(os_image_info) module no longer returns C(ansible_facts)!
 requirements:
-    - "python >= 2.7"
+    - "python >= 3.6""
     - "openstacksdk"
 options:
    image:

plugins/modules/os_keystone_domain.py

@@ -41,7 +41,7 @@ options:
      description:
        - Ignored. Present for backwards compatibility
 requirements:
-    - "python >= 2.7"
+    - "python >= 3.6""
     - "openstacksdk"
 
 extends_documentation_fragment:

plugins/modules/os_keystone_domain_info.py

@@ -18,7 +18,7 @@ description:
     - This module was called C(os_keystone_domain_facts) before Ansible 2.9, returning C(ansible_facts).
       Note that the M(os_keystone_domain_info) module no longer returns C(ansible_facts)!
 requirements:
-    - "python >= 2.7"
+    - "python >= 3.6""
     - "sdk"
 options:
    name:

plugins/modules/os_keystone_role.py

@@ -32,7 +32,7 @@ options:
        - Ignored. Present for backwards compatibility
      required: false
 requirements:
-    - "python >= 2.7"
+    - "python >= 3.6""
     - "openstacksdk"
 
 extends_documentation_fragment:

plugins/modules/os_keystone_service.py

@@ -43,7 +43,7 @@ options:
      description:
        - Ignored. Present for backwards compatibility
 requirements:
-    - "python >= 2.7"
+    - "python >= 3.6""
     - "openstacksdk"
 
 extends_documentation_fragment:

plugins/modules/os_networks_info.py

@@ -19,7 +19,7 @@ description:
     - This module was called C(os_networks_facts) before Ansible 2.9, returning C(ansible_facts).
       Note that the M(os_networks_info) module no longer returns C(ansible_facts)!
 requirements:
-    - "python >= 2.7"
+    - "python >= 3.6""
     - "sdk"
 options:
    name:

plugins/modules/os_nova_host_aggregate.py

@@ -32,7 +32,7 @@ options:
     choices: [present, absent]
     default: present
 requirements:
-    - "python >= 2.7"
+    - "python >= 3.6""
     - "openstacksdk"
 
 extends_documentation_fragment:

plugins/modules/os_port.py

@@ -18,7 +18,7 @@ description:
    - Add, Update or Remove ports from an OpenStack cloud. A I(state) of
      'present' will ensure the port is created or updated if required.
 requirements:
-    - "ordereddict unless python >= 2.7"
+    - "ordereddict unless python >= 3.6""
     - "openstacksdk"
 options:
    network:

plugins/modules/os_port_info.py

@@ -18,7 +18,7 @@ description:
     - This module was called C(os_port_facts) before Ansible 2.9, returning C(ansible_facts).
       Note that the M(os_port_info) module no longer returns C(ansible_facts)!
 requirements:
-    - "python >= 2.7"
+    - "python >= 3.6""
     - "openstacksdk"
 options:
     port:

plugins/modules/os_project.py

@@ -45,7 +45,7 @@ options:
      description:
        - Ignored. Present for backwards compatibility
 requirements:
-    - "python >= 2.7"
+    - "python >= 3.6""
     - "openstacksdk"
 
 extends_documentation_fragment:

plugins/modules/os_project_info.py

@@ -18,7 +18,7 @@ description:
     - This module was called C(os_project_facts) before Ansible 2.9, returning C(ansible_facts).
       Note that the M(os_project_info) module no longer returns C(ansible_facts)!
 requirements:
-    - "python >= 2.7"
+    - "python >= 3.6""
     - "openstacksdk"
 options:
    name:

plugins/modules/os_quota.py

@@ -98,7 +98,7 @@ options:
 
 
 requirements:
-    - "python >= 2.7"
+    - "python >= 3.6""
     - "openstacksdk >= 0.13.0"
     - "keystoneauth1 >= 3.4.0"
 

plugins/modules/os_recordset.py

@@ -49,7 +49,7 @@ options:
      description:
        - Ignored. Present for backwards compatibility
 requirements:
-    - "python >= 2.7"
+    - "python >= 3.6""
     - "openstacksdk"
 
 extends_documentation_fragment:

plugins/modules/os_routers_info.py

@@ -18,7 +18,7 @@ author: "Bram Verschueren (@bverschueren)"
 description:
     - Retrieve information about one or more routers from OpenStack.
 requirements:
-    - "python >= 2.7"
+    - "python >= 3.6""
     - "openstacksdk"
 options:
    name:

plugins/modules/os_server.py

@@ -169,7 +169,7 @@ options:
      description:
        - Availability zone in which to create the server.
 requirements:
-    - "python >= 2.7"
+    - "python >= 3.6""
     - "openstacksdk"
 
 extends_documentation_fragment:

plugins/modules/os_server_action.py

@@ -48,7 +48,7 @@ options:
      description:
        - Ignored. Present for backwards compatibility
 requirements:
-    - "python >= 2.7"
+    - "python >= 3.6""
     - "openstacksdk"
 
 extends_documentation_fragment:

plugins/modules/os_server_group.py

@@ -40,7 +40,7 @@ options:
        - Ignored. Present for backwards compatibility
      required: false
 requirements:
-    - "python >= 2.7"
+    - "python >= 3.6""
     - "openstacksdk"
 
 extends_documentation_fragment:

plugins/modules/os_server_info.py

@@ -21,7 +21,7 @@ description:
 notes:
     - The result contains a list of servers.
 requirements:
-    - "python >= 2.7"
+    - "python >= 3.6""
     - "openstacksdk"
 options:
    server:

plugins/modules/os_server_metadata.py

@@ -38,7 +38,7 @@ options:
        - Availability zone in which to create the snapshot.
      required: false
 requirements:
-    - "python >= 2.7"
+    - "python >= 3.6""
     - "openstack"
 
 extends_documentation_fragment:

plugins/modules/os_server_volume.py

@@ -39,7 +39,7 @@ options:
      description:
        - Ignored. Present for backwards compatibility
 requirements:
-    - "python >= 2.7"
+    - "python >= 3.6""
     - "openstacksdk"
 
 extends_documentation_fragment:

plugins/modules/os_stack.py

@@ -55,7 +55,7 @@ options:
       description:
         - Ignored. Present for backwards compatibility
 requirements:
-    - "python >= 2.7"
+    - "python >= 3.6""
     - "openstacksdk"
 
 extends_documentation_fragment:

plugins/modules/os_subnet.py

@@ -94,7 +94,7 @@ options:
      required: false
      default: {}
 requirements:
-    - "python >= 2.7"
+    - "python >= 3.6""
     - "openstacksdk"
 
 extends_documentation_fragment:

plugins/modules/os_subnets_info.py

@@ -19,7 +19,7 @@ description:
     - This module was called C(os_subnets_facts) before Ansible 2.9, returning C(ansible_facts).
       Note that the M(os_subnets_info) module no longer returns C(ansible_facts)!
 requirements:
-    - "python >= 2.7"
+    - "python >= 3.6""
     - "openstacksdk"
 options:
    name:

plugins/modules/os_user.py

@@ -59,7 +59,7 @@ options:
      description:
        - Ignored. Present for backwards compatibility
 requirements:
-    - "python >= 2.7"
+    - "python >= 3.6""
     - "openstacksdk"
 
 extends_documentation_fragment:

plugins/modules/os_user_group.py

@@ -34,7 +34,7 @@ options:
        - Ignored. Present for backwards compatibility
      required: false
 requirements:
-    - "python >= 2.7"
+    - "python >= 3.6""
     - "openstacksdk"
 
 extends_documentation_fragment:

plugins/modules/os_user_info.py

@@ -18,7 +18,7 @@ description:
     - This module was called C(os_user_facts) before Ansible 2.9, returning C(ansible_facts).
       Note that the M(os_user_info) module no longer returns C(ansible_facts)!
 requirements:
-    - "python >= 2.7"
+    - "python >= 3.6""
     - "openstacksdk"
 options:
    name:

plugins/modules/os_user_role.py

@@ -47,7 +47,7 @@ options:
      description:
        - Ignored. Present for backwards compatibility
 requirements:
-    - "python >= 2.7"
+    - "python >= 3.6""
     - "openstacksdk"
 
 extends_documentation_fragment:

plugins/modules/os_volume.py

@@ -60,7 +60,7 @@ options:
      description:
        - Metadata for the volume
 requirements:
-     - "python >= 2.7"
+     - "python >= 3.6""
      - "openstacksdk"
 
 extends_documentation_fragment:

plugins/modules/os_volume_snapshot.py

@@ -45,7 +45,7 @@ options:
      description:
        - Availability zone in which to create the snapshot.
 requirements:
-     - "python >= 2.7"
+     - "python >= 3.6""
      - "openstacksdk"
 
 extends_documentation_fragment:

plugins/modules/os_zone.py

@@ -47,7 +47,7 @@ options:
      description:
        - Ignored. Present for backwards compatibility
 requirements:
-    - "python >= 2.7"
+    - "python >= 3.6""
     - "openstacksdk"
 
 extends_documentation_fragment:

tox.ini

@@ -6,7 +6,8 @@ ignore_basepython_conflict = True
 
 [testenv]
 skip_install = True
-install_command = pip3 install {opts} {packages}
+install_command = python -m pip install {opts} {packages}
+basepython = python3
 passenv = OS_*
 setenv =
     VIRTUAL_ENV={envdir}