fixed duplicities

v.0.0.4
Merge branch 'develop' of github.com:CartoDB/crankshaft into add-salesforce
2016-09-30 18:32:20 +02:00 · 2016-09-29 17:20:25 +02:00 · 2016-09-22 15:09:54 +02:00 · 2016-09-22 15:09:41 +02:00
4 changed files with 262 additions and 11 deletions
--- a/.travis.yml
+++ b/.travis.yml
@@ -41,8 +41,8 @@ before_install:
  - sudo apt-get -y install postgresql-9.5=9.5.2-2ubuntu1
  - sudo apt-get -y install postgresql-server-dev-9.5=9.5.2-2ubuntu1
  - sudo apt-get -y install postgresql-plpython-9.5=9.5.2-2ubuntu1
-  - sudo apt-get -y install postgresql-9.5-postgis-scripts=2.2.2.0-cdb2
  - sudo apt-get -y install postgresql-9.5-postgis-2.2=2.2.2.0-cdb2
+  - sudo apt-get -y install postgresql-9.5-postgis-scripts=2.2.2.0-cdb2

  # configure it to accept local connections from postgres
  - echo -e "# TYPE  DATABASE        USER            ADDRESS                 METHOD \nlocal   all             postgres                                trust\nlocal   all             all                                     trust\nhost    all             all             127.0.0.1/32            trust" \
--- a/release/python/0.4.2/crankshaft/requirements.txt
+++ b/release/python/0.4.2/crankshaft/requirements.txt
@@ -1,5 +0,0 @@
-joblib==0.8.3
-numpy==1.6.1
-scipy==0.14.0
-pysal==1.11.2
-scikit-learn==0.14.1
--- a/src/pg/sql/16_salesforce.sql
+++ b/src/pg/sql/16_salesforce.sql
--- a/src/py/crankshaft/requirements.txt
+++ b/src/py/crankshaft/requirements.txt
@@ -1,5 +0,0 @@
-joblib==0.8.3
-numpy==1.6.1
-scipy==0.14.0
-pysal==1.11.2
-scikit-learn==0.14.1
Author	SHA1	Message	Date
abelvm	7c4849d62e	fixed duplicities	2016-09-30 18:32:20 +02:00
abelvm	45e30973a0	v.0.0.4	2016-09-29 17:20:25 +02:00
abelvm	d51b02b61e	Merge branch 'develop' of github.com:CartoDB/crankshaft into add-salesforce	2016-09-22 15:09:54 +02:00
abelvm	9b1a889133	first commit, just to save the work	2016-09-22 15:09:41 +02:00