Test: try to avoid travis virtualenv

Removes cartodb-extension-dep

.travis.yml

@@ -0,0 +1,35 @@
+sudo: true
+
+language: c
+
+addons:
+  postgresql: "9.4"
+  apt:
+    packages:
+      - python2.7
+      - python2.7-dev 
+      - postgresql-plpython-9.4
+      - postgresql-server-dev-9.4
+      - liblapack-dev
+      - libatlas-dev
+      - gfortran
+
+env:
+  - PGUSER=postgres
+
+# From https://gist.github.com/dan-blanchard/7045057
+before_install:
+  - wget http://repo.continuum.io/miniconda/Miniconda-latest-Linux-x86_64.sh -O miniconda.sh
+  - chmod +x miniconda.sh
+  - ./miniconda.sh -b -p `pwd`/miniconda
+  - export PATH=`pwd`/miniconda/bin:$PATH
+  - conda update --yes conda
+  - conda create --yes -n condaenv python=2.7
+  - source activate condaenv
+  - conda install --yes -n condaenv pip nose
+  - conda install --yes -n condaenv numpy=1.11.0 scipy=0.17.1 pysal=1.11.1 scikit-learn=0.17.1
+
+install:
+  - travis_wait 30 sudo make install
+
+script: make test

CONTRIBUTING.md

@@ -60,7 +60,6 @@ it can be installed directly with:
 
 * `CREATE EXTENSION IF NOT EXISTS plpythonu;`
   `CREATE EXTENSION IF NOT EXISTS postgis;`
-  `CREATE EXTENSION IF NOT EXISTS cartodb;`
   `CREATE EXTENSION crankshaft WITH VERSION 'dev';`
 
 Note: the development extension uses the development python virtual

src/pg/crankshaft.control

@@ -1,5 +1,5 @@
 comment = 'CartoDB Spatial Analysis extension'
 default_version = '0.0.3'
-requires = 'plpythonu, postgis, cartodb'
+requires = 'plpythonu, postgis'
 superuser = true
 schema = cdb_crankshaft

src/pg/test/expected/01_install_test.out

@@ -1,6 +1,5 @@
 -- Install dependencies
 CREATE EXTENSION plpythonu;
 CREATE EXTENSION postgis;
-CREATE EXTENSION cartodb;
 -- Install the extension
 CREATE EXTENSION crankshaft VERSION 'dev';

src/pg/test/sql/01_install_test.sql

@@ -1,7 +1,6 @@
 -- Install dependencies
 CREATE EXTENSION plpythonu;
 CREATE EXTENSION postgis;
-CREATE EXTENSION cartodb;
 
 -- Install the extension
 CREATE EXTENSION crankshaft VERSION 'dev';

src/pg/test/sql/90_permissions.sql

@@ -4,7 +4,7 @@ SELECT cdb_crankshaft._cdb_random_seeds(1234);
 SET ROLE test_regular_user;
 
 -- Add to the search path the schema
-SET search_path TO public,cartodb,cdb_crankshaft;
+SET search_path TO public,cdb_crankshaft;
 
 -- Exercise public functions
 SELECT ppoints.code, m.quads

src/py/Makefile

@@ -13,5 +13,5 @@ release: ../../release/$(EXTENSION).control $(SOURCES_DATA)
 	cp -r ./$(PACKAGE) ../../release/python/$(EXTVERSION)/
 	$(SED) -i -r 's/version='"'"'[0-9]+\.[0-9]+\.[0-9]+'"'"'/version='"'"'$(EXTVERSION)'"'"'/g'  ../../release/python/$(EXTVERSION)/$(PACKAGE)/setup.py
 
-deploy:
-	pip install --upgrade ../../release/python/$(RELEASE_VERSION)/$(PACKAGE)
+deploy: 
+	pip install $(RUN_OPTIONS) --upgrade ../../release/python/$(RELEASE_VERSION)/$(PACKAGE)

src/py/crankshaft/setup.py

@@ -40,7 +40,7 @@ setup(
 
     # The choice of component versions is dictated by what's
     # provisioned in the production servers.
-    install_requires=['pysal==1.9.1', 'scikit-learn==0.17.1'],
+    install_requires=['numpy==1.11.0', 'scipy==0.17.1', 'pysal==1.11.1', 'scikit-learn==0.17.1'],
 
     requires=['pysal', 'numpy', 'sklearn'],