Merge remote-tracking branch 'origin/azure-280-35'

* origin/azure-280-35:
  issue #590: include nasty workaround for sys.modules junk
  azure: try enabling Ansible 2.8/Py3.5 job
pull/595/head
David Wilson 6 years ago
commit d71d0ea2f9

@ -88,8 +88,14 @@ jobs:
#DISTROS: debian
#STRATEGY: linear
Vanilla_280_27:
Ansible_280_27:
python.version: '2.7'
MODE: ansible
VER: 2.8.0
DISTROS: debian
Ansible_280_35:
python.version: '3.5'
MODE: ansible
VER: 2.8.0
DISTROS: debian

@ -760,7 +760,12 @@ class NewStyleRunner(ScriptRunner):
for fullname, _, _ in self.module_map['custom']:
mitogen.core.import_module(fullname)
for fullname in self.module_map['builtin']:
mitogen.core.import_module(fullname)
try:
mitogen.core.import_module(fullname)
except ImportError:
# TODO: this is a huge hack to work around issue #590.
if fullname != 'ansible.module_utils.distro._distro':
raise
def _setup_excepthook(self):
"""

Loading…
Cancel
Save