From ecc9814a8831503528980007ffa885013ef33485 Mon Sep 17 00:00:00 2001 From: Javier Goizueta Date: Fri, 30 Sep 2016 11:31:57 +0200 Subject: [PATCH 1/4] Reorder package installation Fixes #138 It seems that package postgresql-9.5-postgis-2.2 is now indirectly depending on postgresql-9.5-postgis-2.3-scripts which is not compatible with the packages in cartodb launchpad repos --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index a165028..bc85047 100644 --- 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-2.2=2.2.2.0-cdb2 - 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 # 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" \ From 215e61396a76a4ae2943e5c6a101f022db311053 Mon Sep 17 00:00:00 2001 From: Javier Villar Date: Fri, 7 Oct 2016 13:45:09 +0200 Subject: [PATCH 2/4] Creating requirements.txt file for python --- src/py/crankshaft/requirements.txt | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 src/py/crankshaft/requirements.txt diff --git a/src/py/crankshaft/requirements.txt b/src/py/crankshaft/requirements.txt new file mode 100644 index 0000000..3f50cd7 --- /dev/null +++ b/src/py/crankshaft/requirements.txt @@ -0,0 +1,5 @@ +joblib==0.8.3 +numpy==1.6.1 +scipy==0.14.0 +pysal==1.11.2 +scikit-learn==0.14.1 From 83219270aea0601859058d7c45eece84e093cae8 Mon Sep 17 00:00:00 2001 From: Javier Villar Date: Fri, 7 Oct 2016 16:47:28 +0200 Subject: [PATCH 3/4] Copying requirements.txt to python 0.4.2 folder --- release/python/0.4.2/crankshaft/requirements.txt | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 release/python/0.4.2/crankshaft/requirements.txt diff --git a/release/python/0.4.2/crankshaft/requirements.txt b/release/python/0.4.2/crankshaft/requirements.txt new file mode 100644 index 0000000..3f50cd7 --- /dev/null +++ b/release/python/0.4.2/crankshaft/requirements.txt @@ -0,0 +1,5 @@ +joblib==0.8.3 +numpy==1.6.1 +scipy==0.14.0 +pysal==1.11.2 +scikit-learn==0.14.1 From 538ab9a071e6178c7196c4b793daf3f366520d9e Mon Sep 17 00:00:00 2001 From: Mario de Frutos Date: Mon, 21 Nov 2016 16:14:48 +0100 Subject: [PATCH 4/4] Changed to the last postgresql-9.5 package --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index bc85047..a5f544a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -38,7 +38,7 @@ before_install: - sudo apt-get -y remove --purge postgis - sudo apt-get -y autoremove - - sudo apt-get -y install postgresql-9.5=9.5.2-2ubuntu1 + - sudo apt-get -y install postgresql-9.5=9.5.2-3cdb1 - 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