Replace easy_install_package with python_package
authorTom Hughes <tom@compton.nu>
Fri, 17 Mar 2017 19:06:21 +0000 (19:06 +0000)
committerTom Hughes <tom@compton.nu>
Fri, 17 Mar 2017 19:06:21 +0000 (19:06 +0000)
cookbooks/dev/metadata.rb
cookbooks/dev/recipes/default.rb
cookbooks/osqa/metadata.rb
cookbooks/osqa/recipes/default.rb
cookbooks/tile/metadata.rb
cookbooks/tile/recipes/default.rb

index 8b5c166..9370257 100644 (file)
@@ -11,6 +11,7 @@ depends           "git"
 depends           "mysql"
 depends           "nodejs"
 depends           "postgresql"
+depends           "python"
 depends           "tools"
 depends           "web"
 
index 08af711..59fd786 100644 (file)
@@ -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"
index eb98987..75ca0ba 100644 (file)
@@ -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",
index b7a6a8e..6d610e0 100644 (file)
@@ -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"
index cba80c6..1878fcd 100644 (file)
@@ -9,5 +9,6 @@ depends           "apache"
 depends           "git"
 depends           "nodejs"
 depends           "postgresql"
+depends           "python"
 depends           "systemd"
 depends           "tools"
index c26f0f8..08130c4 100644 (file)
@@ -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"