From 3b2d91d9fb2bd2878d12d02af78484f9ea43f8f7 Mon Sep 17 00:00:00 2001
From: Tom Hughes <tom@compton.nu>
Date: Fri, 17 Mar 2017 19:06:21 +0000
Subject: [PATCH] Replace easy_install_package with python_package

---
 cookbooks/dev/metadata.rb         | 1 +
 cookbooks/dev/recipes/default.rb  | 3 ++-
 cookbooks/osqa/metadata.rb        | 1 +
 cookbooks/osqa/recipes/default.rb | 5 ++---
 cookbooks/tile/metadata.rb        | 1 +
 cookbooks/tile/recipes/default.rb | 3 ++-
 6 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/cookbooks/dev/metadata.rb b/cookbooks/dev/metadata.rb
index 8b5c166b7..93702571b 100644
--- 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 08af7112b..59fd78603 100644
--- 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 eb9898710..75ca0ba39 100644
--- 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 b7a6a8e6f..6d610e02f 100644
--- 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 cba80c648..1878fcd91 100644
--- 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 c26f0f885..08130c43a 100644
--- 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"
-- 
2.43.2