From cf3d6466138ceede34efbdaab2def2999316c820 Mon Sep 17 00:00:00 2001
From: Steven Robertson <srtrumpetaggie@gmail.com>
Date: Sun, 25 Oct 2020 13:48:54 -0700
Subject: [PATCH] fix custom_python_new_style_missing_interpreter, looks like
 Ansible 2.10 changed how new-style module detection works

---
 .ci/debops_common_install.py                                 | 4 +++-
 .travis.yml                                                  | 5 ++---
 .../modules/custom_python_new_style_missing_interpreter.py   | 4 ++--
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/.ci/debops_common_install.py b/.ci/debops_common_install.py
index 1ce94463..470a5f5e 100755
--- a/.ci/debops_common_install.py
+++ b/.ci/debops_common_install.py
@@ -10,9 +10,11 @@ ci_lib.run_batches([
         # Must be installed separately, as PyNACL indirect requirement causes
         # newer version to be installed if done in a single pip run.
         'pip install "pycparser<2.19"',
-        'pip install -qqqU debops==2.1.2 ansible==%s' % ci_lib.ANSIBLE_VERSION,
+        'pip install -q ansible==%s' % ci_lib.ANSIBLE_VERSION,
     ],
     [
         'docker pull %s' % (ci_lib.image_for_distro('debian'),),
     ],
 ])
+
+ci_lib.run('ansible-galaxy collection install debops.debops:==2.1.2')
diff --git a/.travis.yml b/.travis.yml
index 98306c8c..a1d063ed 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -21,13 +21,12 @@ install:
 - pip install -U pip==20.2.1
 - .ci/${MODE}_install.py
 
+# Travis has a 4MB log limit (https://github.com/travis-ci/travis-ci/issues/1382), but verbose Mitogen logs run larger than that
+# in order to keep verbosity to debug a build failure, will run with this workaround: https://stackoverflow.com/a/26082445
 script:
 - .ci/spawn_reverse_shell.py
 - MODE=${MODE} .ci/travis.sh
 
-# Travis has a 4MB log limit (https://github.com/travis-ci/travis-ci/issues/1382), but verbose Mitogen logs run larger than that
-# in order to keep verbosity to debug a build failure, will run with this workaround: https://stackoverflow.com/a/26082445
-
 # To avoid matrix explosion, just test against oldest->newest and
 # newest->oldest in various configuartions.
 
diff --git a/tests/ansible/lib/modules/custom_python_new_style_missing_interpreter.py b/tests/ansible/lib/modules/custom_python_new_style_missing_interpreter.py
index eea4baa4..ec8cd07e 100644
--- a/tests/ansible/lib/modules/custom_python_new_style_missing_interpreter.py
+++ b/tests/ansible/lib/modules/custom_python_new_style_missing_interpreter.py
@@ -2,8 +2,8 @@
 
 import sys
 
-# This is the magic marker Ansible looks for:
-# from ansible.module_utils.
+# As of Ansible 2.10, Ansible changed new-style detection: # https://github.com/ansible/ansible/pull/61196/files#diff-5675e463b6ce1fbe274e5e7453f83cd71e61091ea211513c93e7c0b4d527d637L828-R980
+# from ansible.module_utils import basic
 
 
 def usage():