updated puppet, fixed breaking pip bug because of apt managed matplotlib

modules/common/manifests/init.pp

@@ -3,7 +3,7 @@
 # Packages required by multiple modules
 # Packages required by multiple modules
 #
 #
 class common {
 class common {
-  $pkgs=['build-essential','screen','emacs','openvpn', 'gnome-tweak-tool', 'nmap']
+  $pkgs=['build-essential','screen','emacs','openvpn', 'gnome-tweak-tool', 'nmap','wget']
   
   
   package { $pkgs:
   package { $pkgs:
     ensure => present
     ensure => present

modules/joule_labjack/manifests/init.pp

@@ -45,15 +45,15 @@ class joule_labjack {
     ensure => present,
     ensure => present,
   }
   }
   exec{'install labjack':
   exec{'install labjack':
-    command => "${pip_cmd} LabJackPython joule_labjack",
+    command => "${pip_cmd} LabJackPython joulelabjack",
     timeout => 0,
     timeout => 0,
     path    => ['/usr/local/bin','/usr/bin'],
     path    => ['/usr/local/bin','/usr/bin'],
   }
   }
 
 
   $exodriver_zip="https://github.com/labjack/exodriver/archive/master.zip"
   $exodriver_zip="https://github.com/labjack/exodriver/archive/master.zip"
   exec{'install exodriver':
   exec{'install exodriver':
-    command => 'wget  & unzip master.zip & cd master & ./install.sh',
-    path    => ['/usr/local/bin','/usr/sbin','/bin'],
+    command => "wget ${exodriver_zip} && unzip -o ./master.zip && cd ./exodriver-master && sudo /bin/bash install.sh",
+    path    => ['/usr/local/bin','/usr/sbin','/bin','/usr/bin'],
     creates => '/usr/local/lib/liblabjackusb.so.2.6.0',
     creates => '/usr/local/lib/liblabjackusb.so.2.6.0',
     require => Package['libusb-1.0.0-dev']
     require => Package['libusb-1.0.0-dev']
   }
   }

modules/python/manifests/init.pp

@@ -19,14 +19,34 @@
 class python {
 class python {
   require common
   require common
 
 
-  $deps = ['python3-scipy', 'python3-numpy', 'python3-matplotlib',
-  	   'python-numpy', 'python-scipy', 'python-matplotlib',
+  $deps = ['python3-scipy', 'python3-numpy', 
+  	   'python-numpy', 'python-scipy',
           'cython','python2.7','python2.7-dev','python-setuptools',
           'cython','python2.7','python2.7-dev','python-setuptools',
           'python-cherrypy3','python-decorator','python-requests','python3-dev',
           'python-cherrypy3','python-decorator','python-requests','python3-dev',
           'python-dateutil','python-tz','python-progressbar','python-psutil',
           'python-dateutil','python-tz','python-progressbar','python-psutil',
-          'python-simplejson', 'python-pip', 'python3-pip']
+          'python-simplejson']
 
 
   package{$deps:
   package{$deps:
     ensure => present
     ensure => present
   }
   }
+  file{'/tmp/get-pip.py':
+    owner => root,
+    group => root,
+    mode => '0755',
+    source => 'puppet:///modules/python/get-pip.py'
+  }
+  $dist_pip = ['python-pip', 'python3-pip', 'python3-matplotlib', 'python-matplotlib']
+  package{$dist_pip:
+    ensure => absent
+  }
+  exec{'install_pip3':
+    command => 'python3 /tmp/get-pip.py',
+    path    => ['/usr/local/bin','/usr/bin'],
+    require => Package[$deps]
+  }
+  exec{'install_pip2':
+    command => 'python2 /tmp/get-pip.py',
+    path    => ['/usr/local/bin','/usr/bin'],
+    require => Package[$deps,$dist_pip]
+  }
 }
 }