From d97231f6044b070747fd9f0276ad4d4c4dd02ed1 Mon Sep 17 00:00:00 2001
From: Rafa de la Torre <rtorre@cartodb.com>
Date: Wed, 29 Jun 2016 18:34:01 +0200
Subject: [PATCH] Revert changes in release/ dir

---
 release/crankshaft--0.0.1.sql            | 27 ------------------------
 release/python/0.0.1/crankshaft/setup.py |  3 ++-
 2 files changed, 2 insertions(+), 28 deletions(-)

diff --git a/release/crankshaft--0.0.1.sql b/release/crankshaft--0.0.1.sql
index c72e5fc..436beea 100644
--- a/release/crankshaft--0.0.1.sql
+++ b/release/crankshaft--0.0.1.sql
@@ -137,33 +137,6 @@ BEGIN
 END;
 $$
 LANGUAGE plpgsql VOLATILE;
-CREATE OR REPLACE FUNCTION
-  cdb_create_segment (
-      segment_name TEXT,
-      table_name TEXT,
-  	  column_name TEXT,
-      geoid_column TEXT DEFAULT 'geoid',
-      census_table TEXT DEFAULT 'block_groups'
-  )
-RETURNS NUMERIC
-AS $$
-  from crankshaft import segmentation
-  # TODO: use named parameters or a dictionary
-  return segmentation.create_segment(segment_name,table_name,column_name,geoid_column,census_table,'random_forest')
-$$ LANGUAGE plpythonu;
-
-CREATE OR REPLACE FUNCTION
-  cdb_predict_segment (
-      segment_name TEXT,
-      geoid_column TEXT DEFAULT 'geoid',
-      census_table TEXT DEFAULT 'block_groups'
-  )
-RETURNS TABLE(geoid TEXT, prediction NUMERIC)
-AS $$
-  from crankshaft.segmentation import create_segemnt
-  # TODO: use named parameters or a dictionary
-  return create_segment('table')
-$$ LANGUAGE plpythonu;
 -- Make sure by default there are no permissions for publicuser
 -- NOTE: this happens at extension creation time, as part of an implicit transaction.
 -- REVOKE ALL PRIVILEGES ON SCHEMA cdb_crankshaft FROM PUBLIC, publicuser CASCADE;
diff --git a/release/python/0.0.1/crankshaft/setup.py b/release/python/0.0.1/crankshaft/setup.py
index 798a96d..f045b62 100644
--- a/release/python/0.0.1/crankshaft/setup.py
+++ b/release/python/0.0.1/crankshaft/setup.py
@@ -40,8 +40,9 @@ setup(
 
     # The choice of component versions is dictated by what's
     # provisioned in the production servers.
-    install_requires=['pysal==1.11.0','numpy==1.10.1','scipy==0.17.0','pandas','sklearn'],
+    install_requires=['pysal==1.11.0','numpy==1.6.1','scipy==0.17.0'],
 
+    requires=['pysal', 'numpy'],
 
     test_suite='test'
 )