elia/pinch-dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Travis gets a special treatment

Browse source
This commit is contained in:
Elijah Lazkani 2017-03-18 23:46:50 -04:00
parent 2962c9d963
commit dd920222a5
3 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.travis.yml
View file

@ -28,5 +28,3 @@ install:
script: script:
- sudo salt-call --local --config=./ --state-output=changes --log-level=quiet --retcode-passthrough state.apply - sudo salt-call --local --config=./ --state-output=changes --log-level=quiet --retcode-passthrough state.apply
- which pip
- which pip3

2
.travis/grains.sh
View file

@ -1,3 +1,3 @@
#!/bin/bash #!/bin/bash
salt-call --local --config=./ --state-output=changes grains.setvals "{ \"user\": \"$(whoami)\", \"group\": \"$(id -g -n $(whoami))\", \"homedir\": \"$HOME\", \"travis\": True }" salt-call --local --config=./ --state-output=changes grains.setvals "{ \"user\": \"$(whoami)\", \"group\": \"$(id -g -n $(whoami))\", \"homedir\": \"$HOME\", \"travis\": True, \"pip\": \"$(which pip)\" }"

10
salty/base/python_env/init.sls
View file

@ -1,5 +1,13 @@
{% from "python_env/map.jinja" import python_env with context %} {% from "python_env/map.jinja" import python_env with context %}
{% if grains['travis'] == True and grains['kernel'] == 'Linux' %}
{% if "python2" in grains['pip'] %}
{% set python_env.pip_bin_env = "/opt/python/3.5.2/bin/pip3" %}
{% else %}
{% set python_env.pip_bin_env = grains['pip'] %}
{% endif %}
{% endif %}
pip-install: pip-install:
pkg.installed: pkg.installed:
- name: {{ python_env.pip }} - name: {{ python_env.pip }}
@ -24,7 +32,7 @@ zsh-virtualenvwrapper:
file.append: file.append:
- name: {{ grains.homedir }}/.zshrc - name: {{ grains.homedir }}/.zshrc
- text: - text:
- "" - "\n"
- "# Adding virtualenvwrapper python binary path" - "# Adding virtualenvwrapper python binary path"
- "export VIRTUALENVWRAPPER_PYTHON={{ python_env.python_path }}" - "export VIRTUALENVWRAPPER_PYTHON={{ python_env.python_path }}"
- "" - ""