From 80e91bde19d44fe124e4da2f194bd5c8b0134ec8 Mon Sep 17 00:00:00 2001 From: Vladimir Didenko Date: Wed, 29 Apr 2015 13:23:42 +0300 Subject: [PATCH] Add futures --- pkgs/python/futures.sls | 12 ++++++++++++ projects/salt/2014/7/unit.sls | 3 +++ projects/salt/2015/2/unit.sls | 3 +++ projects/salt/develop/unit.sls | 3 +++ 4 files changed, 21 insertions(+) create mode 100644 pkgs/python/futures.sls diff --git a/pkgs/python/futures.sls b/pkgs/python/futures.sls new file mode 100644 index 0000000..9077d1f --- /dev/null +++ b/pkgs/python/futures.sls @@ -0,0 +1,12 @@ +include: + - pkgs.python.pip + +futures: + pip.installed: + {%- if salt['config.get']('virtualenv_name', None) %} + - bin_env: /srv/virtualenvs/{{ salt['config.get']('virtualenv_name') }} + {%- endif %} + - index_url: https://pypi-jenkins.saltstack.com/jenkins/develop + - extra_index_url: https://pypi.python.org/simple + - require: + - pip: pip diff --git a/projects/salt/2014/7/unit.sls b/projects/salt/2014/7/unit.sls index ba1f15d..5ceab4a 100644 --- a/projects/salt/2014/7/unit.sls +++ b/projects/salt/2014/7/unit.sls @@ -40,6 +40,9 @@ include: - pkgs.python.moto - pkgs.python.psutil - pkgs.python.tornado + {%- if grains.get('pythonversion')[:2] < [3, 2] %} + - pkgs.python.futures + {%- endif %} {%- if test_transport == 'raet' %} - pkgs.python.libnacl - pkgs.python.ioflo diff --git a/projects/salt/2015/2/unit.sls b/projects/salt/2015/2/unit.sls index ba1f15d..5ceab4a 100644 --- a/projects/salt/2015/2/unit.sls +++ b/projects/salt/2015/2/unit.sls @@ -40,6 +40,9 @@ include: - pkgs.python.moto - pkgs.python.psutil - pkgs.python.tornado + {%- if grains.get('pythonversion')[:2] < [3, 2] %} + - pkgs.python.futures + {%- endif %} {%- if test_transport == 'raet' %} - pkgs.python.libnacl - pkgs.python.ioflo diff --git a/projects/salt/develop/unit.sls b/projects/salt/develop/unit.sls index ec32075..2951b29 100644 --- a/projects/salt/develop/unit.sls +++ b/projects/salt/develop/unit.sls @@ -40,6 +40,9 @@ include: - pkgs.python.moto - pkgs.python.psutil - pkgs.python.tornado + {%- if grains.get('pythonversion')[:2] < [3, 2] %} + - pkgs.python.futures + {%- endif %} - pkgs.python.dnspython {%- if test_transport == 'raet' %} - pkgs.python.libnacl