Merge pull request #235 from OpenDataPolicingNC/ODPM-213-deploy-test

Fixes for deploy on staging

conf/salt/python/init.sls

@@ -0,0 +1,68 @@
+{% set python_version = pillar.get('python_version', '2.7') ~ '' %}
+
+python-pkgs:
+  pkg.installed:
+    - pkgs:
+      - python-pip
+      - build-essential
+      - libpq-dev
+      - libev-dev
+      - libevent-dev
+      - libmemcached-dev
+      - libjpeg8
+      - libjpeg8-dev
+      - libfreetype6
+      - libfreetype6-dev
+      - zlib1g
+      - zlib1g-dev
+      - libxml2-dev
+      - libxslt1-dev
+      - ghostscript
+      - python{{ python_version }}
+      - python{{ python_version }}-dev
+{% for name in pillar.get('python_headers', []) %}
+      - {{ name }}
+{% endfor %}
+
+setuptools:
+  pip.installed:
+    - name: setuptools<8.0
+    - upgrade: True
+    - require:
+      - pkg: python-pkgs
+      - pip: pip
+
+pip:
+  pip.installed:
+{% if grains['saltversion'] < '2016.3.2' %}
+    - name: pip==8.1.1
+{% else %}
+    - name: pip
+    - upgrade: False
+{% endif %}
+    - require:
+      - pkg: python-pkgs
+
+virtualenv:
+  pip.installed:
+    - upgrade: True
+    - require:
+      - pip: pip
+
+/usr/lib/libz.so:
+  file.symlink:
+    - target: /usr/lib/{{ grains['cpuarch'] }}-linux-gnu/libz.so
+    - require:
+      - pkg: python-pkgs
+
+/usr/lib/libfreetype.so:
+  file.symlink:
+    - target: /usr/lib/{{ grains['cpuarch'] }}-linux-gnu/libfreetype.so
+    - require:
+      - pkg: python-pkgs
+
+/usr/lib/libjpeg.so:
+  file.symlink:
+    - target: /usr/lib/{{ grains['cpuarch'] }}-linux-gnu/libjpeg.so
+    - require:
+      - pkg: python-pkgs

requirements/fab.txt

@@ -1,21 +1,2 @@
-Fabric==1.10.0
-Naked==0.1.31
+Fabric==1.11.1
 PyYAML==3.12
-appdirs==1.4.3
-argparse==1.2.1
-asn1crypto==0.22.0
-cffi==1.4.1
-crypto==1.4.1
-cryptography==1.8.1
-enum34==1.1.6
-idna==2.5
-ipaddress==1.0.18
-packaging==16.8
-paramiko==2.1.2
-pyasn1==0.2.3
-pycparser==2.17
-pycrypto==2.6.1
-pyparsing==2.2.0
-requests==2.13.0
-shellescape==3.4.1
-six==1.10.0