Replace easy_install_package with python_package

diff --git a/cookbooks/dev/metadata.rb b/cookbooks/dev/metadata.rb
index 8b5c166b72c57dec866e7f31233985281f22ee21..93702571b5ba38a90a9e3fa9f945641afc6d841f 100644 (file)
--- a/cookbooks/dev/metadata.rb
+++ b/cookbooks/dev/metadata.rb
@@ -11,6 +11,7 @@ depends           "git"
 depends           "mysql"
 depends           "nodejs"
 depends           "postgresql"
+depends           "python"
 depends           "tools"
 depends           "web"
 

diff --git a/cookbooks/dev/recipes/default.rb b/cookbooks/dev/recipes/default.rb
index 08af7112be3deab9fa103d5d018cd8ef04a4e901..59fd78603d276e7850065ca5ea6b3ea07bd6fa68 100644 (file)
--- a/cookbooks/dev/recipes/default.rb
+++ b/cookbooks/dev/recipes/default.rb
@@ -26,6 +26,7 @@ include_recipe "git"
 include_recipe "mysql"
 include_recipe "nodejs"
 include_recipe "postgresql"
+include_recipe "python"
 
 package "php"
 package "php-cgi"
@@ -54,7 +55,7 @@ package "python-gdal"
 
 nodejs_package "svgo"
 
-easy_install_package "geojson"
+python_package "geojson"
 
 apache_module "env"
 apache_module "expires"

diff --git a/cookbooks/osqa/metadata.rb b/cookbooks/osqa/metadata.rb
index eb9898710a673c0da812154896ce90801c59b632..75ca0ba39175cb4a52347637d9a9ad6c7b6b4d93 100644 (file)
--- a/cookbooks/osqa/metadata.rb
+++ b/cookbooks/osqa/metadata.rb
@@ -7,6 +7,7 @@ long_description  IO.read(File.join(File.dirname(__FILE__), "README.md"))
 version           "1.0.0"
 depends           "apache"
 depends           "memcached"
+depends           "python"
 depends           "tools"
 
 attribute "osqa",

diff --git a/cookbooks/osqa/recipes/default.rb b/cookbooks/osqa/recipes/default.rb
index b7a6a8e6faa0b793b011f6c8e4afdf88521eeb22..6d610e02fef9b16974db4b6b896efad95dc99e0a 100644 (file)
--- a/cookbooks/osqa/recipes/default.rb
+++ b/cookbooks/osqa/recipes/default.rb
@@ -20,6 +20,7 @@
 include_recipe "tools"
 include_recipe "apache"
 include_recipe "memcached"
+include_recipe "python"
 
 package "python-django"
 package "python-html5lib"
@@ -30,9 +31,7 @@ package "python-mysqldb"
 package "python-psycopg2"
 package "python-setuptools"
 
-easy_install_package "South" do
-  package_name "south"
-end
+python_package "South"
 
 apache_module "rewrite"
 apache_module "wsgi"

diff --git a/cookbooks/tile/metadata.rb b/cookbooks/tile/metadata.rb
index cba80c648b49f8d3773ac0089d785766788c2c94..1878fcd91ae8e83a8931c2b456cc9f54b4b6dbcb 100644 (file)
--- a/cookbooks/tile/metadata.rb
+++ b/cookbooks/tile/metadata.rb
@@ -9,5 +9,6 @@ depends           "apache"
 depends           "git"
 depends           "nodejs"
 depends           "postgresql"
+depends           "python"
 depends           "systemd"
 depends           "tools"

diff --git a/cookbooks/tile/recipes/default.rb b/cookbooks/tile/recipes/default.rb
index c26f0f88557430ee455b446942e50f61d270842e..08130c43a1e3b8d7301c8c648e7cfd99cbca5d2c 100644 (file)
--- a/cookbooks/tile/recipes/default.rb
+++ b/cookbooks/tile/recipes/default.rb
@@ -21,6 +21,7 @@ include_recipe "apache"
 include_recipe "git"
 include_recipe "nodejs"
 include_recipe "postgresql"
+include_recipe "python"
 include_recipe "tools"
 
 blocks = data_bag_item("tile", "blocks")
@@ -121,7 +122,7 @@ package "python-cairo"
 package "python-mapnik"
 package "python-setuptools"
 
-easy_install_package "pyotp"
+python_package "pyotp"
 
 package "fonts-noto-cjk"
 package "fonts-noto-hinted"