python v1.0.0, pip install script is now downloaded with remote_file instead of curl

schisamo · schisamo · commit 5bbd2cc0491c · 2011-02-17T10:19:42.000-05:00
diff --git a/metadata.json b/metadata.json
@@ -1,6 +1,6 @@
 {
   "name": "python",
-  "description": "Installs python packages",
+  "description": "Installs python packages. Includes LWRPs for managing `pip` packages and `virtualenv` isolated Python environments.",
   "long_description": "",
   "maintainer": "Opscode, Inc.",
   "maintainer_email": "cookbooks@opscode.com",
@@ -41,5 +41,5 @@
   "recipes": {
     "python": "Installs python, pip, and virtualenv"
   },
-  "version": "0.99.0"
+  "version": "1.0.0"
 }
diff --git a/metadata.rb b/metadata.rb
@@ -1,8 +1,8 @@
 maintainer        "Opscode, Inc."
 maintainer_email  "cookbooks@opscode.com"
 license           "Apache 2.0"
-description       "Installs python packages"
-version           "0.99"
+description       "Installs python packages. Includes LWRPs for managing `pip` packages and `virtualenv` isolated Python environments."
+version           "1.0.0"
 
 recipe "python", "Installs python, pip, and virtualenv"
 
diff --git a/recipes/default.rb b/recipes/default.rb
@@ -46,6 +46,12 @@
   easy_install pip
   EOH
   not_if "which pip"
+  action :nothing
+end
+remote_file "#{Chef::Config[:file_cache_path]}/distribute_setup.py" do
+  source "http://python-distribute.org/distribute_setup.py"
+  notifies :run, "bash[install-pip]", :immediate
+  not_if "which pip"
 end
 
 python_pip "virtualenv" do

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "python",`
`3`		`- "description": "Installs python packages",`
	`3`	+ "description": "Installs python packages. Includes LWRPs for managing `pip` packages and `virtualenv` isolated Python environments.",
`4`	`4`	`"long_description": "",`
`5`	`5`	`"maintainer": "Opscode, Inc.",`
`6`	`6`	`"maintainer_email": "[email protected]",`
`@@ -41,5 +41,5 @@`
`41`	`41`	`"recipes": {`
`42`	`42`	`"python": "Installs python, pip, and virtualenv"`
`43`	`43`	`},`
`44`		`- "version": "0.99.0"`
	`44`	`+ "version": "1.0.0"`
`45`	`45`	`}`