revert python3 setup + add TODO; python3 tests aren't working now but python2 is EOL so they should work soon

pull/658/head
Steven Robertson 5 years ago
parent 1157ff6f43
commit faf7798c16

@ -17,6 +17,8 @@ steps:
# need wheel before building virtualenv because of bdist_wheel and setuptools deps # need wheel before building virtualenv because of bdist_wheel and setuptools deps
# Mac's System Integrity Protection prevents symlinking /usr/bin # Mac's System Integrity Protection prevents symlinking /usr/bin
# and Azure isn't allowing disabling it apparently: https://developercommunityapi.westus.cloudapp.azure.com/idea/558702/allow-disabling-sip-on-microsoft-hosted-macos-agen.html # and Azure isn't allowing disabling it apparently: https://developercommunityapi.westus.cloudapp.azure.com/idea/558702/allow-disabling-sip-on-microsoft-hosted-macos-agen.html
# the || will activate when running python3 tests
# TODO: get python3 tests passing
(sudo ln -fs /usr/bin/python$(python.version) /usr/bin/python && (sudo ln -fs /usr/bin/python$(python.version) /usr/bin/python &&
/usr/bin/python -m pip install -U pip wheel setuptools && /usr/bin/python -m pip install -U pip wheel setuptools &&
/usr/bin/python -m pip install -U virtualenv && /usr/bin/python -m pip install -U virtualenv &&

@ -15,8 +15,8 @@ jobs:
Mito27_27: Mito27_27:
python.version: '2.7' python.version: '2.7'
MODE: mitogen MODE: mitogen
Ans288_37: Ans288_27:
python.version: '3' python.version: '2.7'
MODE: localhost_ansible MODE: localhost_ansible
VER: 2.8.8 VER: 2.8.8

@ -1,4 +1,4 @@
#!/usr/bin/env python #!/usr/bin/python
# I am an Ansible new-style Python module. I return details about the Python # I am an Ansible new-style Python module. I return details about the Python
# interpreter I run within. # interpreter I run within.

@ -15,27 +15,15 @@
no_proxy: "{{ lookup('env', 'no_proxy')|default('') }}" no_proxy: "{{ lookup('env', 'no_proxy')|default('') }}"
PATH: "{{ lookup('env', 'PATH') }}" PATH: "{{ lookup('env', 'PATH') }}"
- name: set python interpreter because mac symlinks things and complains
block:
- name: set python3 interpreter
when: lout.python_version.startswith('3')
set_fact:
python_interpreter: /tmp/issue_152_virtualenv/bin/python3
- name: set python2 interpreter
when: lout.python_version.startswith('2')
set_fact:
python_interpreter: /tmp/issue_152_virtualenv/bin/python
- custom_python_detect_environment: - custom_python_detect_environment:
vars: vars:
ansible_python_interpreter: "{{ python_interpreter }}" ansible_python_interpreter: /tmp/issue_152_virtualenv/bin/python
register: out register: out
when: lout.python_version > '2.6' when: lout.python_version > '2.6'
- assert: - assert:
that: that:
- out.sys_executable == "{{ python_interpreter }}" - out.sys_executable == /tmp/issue_152_virtualenv/bin/python
when: lout.python_version > '2.6' when: lout.python_version > '2.6'
- file: - file:

Loading…
Cancel
Save