Merge back from production.
authorBen Hearsum <bhearsum@mozilla.com>
Fri, 25 May 2018 17:09:34 -0400
changeset 6919 f916f6c6adc16ae1e9392f4d4a546f2b8ce47273
parent 6916 e64c2beb84de02bff005367106b24922e5223b3c (current diff)
parent 6918 a70bf013742b05a230dbc2f7cd2ac8d0badb1549 (diff)
child 6920 12c2bedb12e8390aea9e425b3348e39a93b05fba
push id2778
push userasasaki@mozilla.com
push dateTue, 29 May 2018 19:35:39 +0000
Merge back from production.
--- a/modules/python/manifests/virtualenv/settings.pp
+++ b/modules/python/manifests/virtualenv/settings.pp
@@ -6,13 +6,16 @@ class python::virtualenv::settings {
     # the root package directory into which all Python package tarballs are copied
     $misc_python_dir = $::operatingsystem ? {
         windows => 'c:\mozilla-build',
         default => '/tools/misc-python',
     }
     # the puppet URL for the python/packages downloads
     $packages_dir_source = 'puppet:///python/packages'
 
-    $pip_version         = '10.0.1'
+    $pip_version         = $::operatingsystem ? {
+        windows => '1.5.5',
+        default => '10.0.1'
+    }
     $setuptools_version  = '39.1.0'
     $wheel_version       = '0.31.1'
     $virtualenv_version  = '16.0.0'
 }