From 353919239d3434269904cbdb3d12efb69207161f Mon Sep 17 00:00:00 2001 From: Raul Ochoa Date: Wed, 13 Jan 2016 18:59:33 +0100 Subject: [PATCH 1/9] Attempt to use travis' container based builds --- .travis.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index bbfbe798..5e98dd8c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,10 +1,11 @@ +sudo: false + addons: postgresql: "9.3" before_install: - sudo apt-get update - - sudo apt-get install -y pkg-config libcairo2-dev libjpeg8-dev libgif-dev - - sudo apt-get install postgresql-plpython-9.3 + - sudo apt-get install -y postgresql-plpython-9.3 pkg-config libcairo2-dev libjpeg8-dev libgif-dev - createdb template_postgis - psql -c "CREATE EXTENSION postgis" template_postgis From 8ea159e0a11cd739c1f881bd13627eb631d4ad51 Mon Sep 17 00:00:00 2001 From: Raul Ochoa Date: Wed, 13 Jan 2016 19:14:58 +0100 Subject: [PATCH 2/9] Remove sudo calls --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5e98dd8c..b9f817dd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,8 +4,8 @@ addons: postgresql: "9.3" before_install: - - sudo apt-get update - - sudo apt-get install -y postgresql-plpython-9.3 pkg-config libcairo2-dev libjpeg8-dev libgif-dev + - apt-get update + - apt-get install -y postgresql-plpython-9.3 pkg-config libcairo2-dev libjpeg8-dev libgif-dev - createdb template_postgis - psql -c "CREATE EXTENSION postgis" template_postgis From 74abee27004a5011dd1898a827a54157fa4b946d Mon Sep 17 00:00:00 2001 From: Raul Ochoa Date: Wed, 13 Jan 2016 19:23:30 +0100 Subject: [PATCH 3/9] Use apt addon instead of apt-get install --- .travis.yml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index b9f817dd..351cf755 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,10 +2,15 @@ sudo: false addons: postgresql: "9.3" + apt: + packages: + - postgresql-plpython-9.3 + - pkg-config + - libcairo2-dev + - libjpeg8-dev + - libgif-dev before_install: - - apt-get update - - apt-get install -y postgresql-plpython-9.3 pkg-config libcairo2-dev libjpeg8-dev libgif-dev - createdb template_postgis - psql -c "CREATE EXTENSION postgis" template_postgis From 553c64bd8bc687d7314a4388d65ce7c93474c94e Mon Sep 17 00:00:00 2001 From: Raul Ochoa Date: Wed, 13 Jan 2016 19:32:50 +0100 Subject: [PATCH 4/9] Create extension for plpython --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 351cf755..1fea4316 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,6 +13,7 @@ addons: before_install: - createdb template_postgis - psql -c "CREATE EXTENSION postgis" template_postgis + - psql -c "CREATE EXTENSION plpython" template_postgis env: - NPROCS=1 JOBS=1 PGUSER=postgres From 18278da4bbb9e84b856e12b05d94d2c8d0e8e73d Mon Sep 17 00:00:00 2001 From: Raul Ochoa Date: Wed, 13 Jan 2016 19:36:01 +0100 Subject: [PATCH 5/9] Create language instead of extension --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 1fea4316..9ac935ac 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,7 +13,7 @@ addons: before_install: - createdb template_postgis - psql -c "CREATE EXTENSION postgis" template_postgis - - psql -c "CREATE EXTENSION plpython" template_postgis + - psql -c "CREATE LANGUAGE plpythonu" template_postgis env: - NPROCS=1 JOBS=1 PGUSER=postgres From 04a2d1d33c795fe0264cafe02aa03ae4ff511db8 Mon Sep 17 00:00:00 2001 From: Raul Ochoa Date: Wed, 13 Jan 2016 20:11:24 +0100 Subject: [PATCH 6/9] Remove postgresql-plpython-9.3 --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 9ac935ac..9f133944 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,6 @@ addons: postgresql: "9.3" apt: packages: - - postgresql-plpython-9.3 - pkg-config - libcairo2-dev - libjpeg8-dev From 3780aed1b7509ab1d1ea7323db9da34d772a8929 Mon Sep 17 00:00:00 2001 From: Raul Ochoa Date: Wed, 13 Jan 2016 20:14:04 +0100 Subject: [PATCH 7/9] Check with no postgresql-plpython-9.3 at all --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 9f133944..41b31179 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,7 +12,6 @@ addons: before_install: - createdb template_postgis - psql -c "CREATE EXTENSION postgis" template_postgis - - psql -c "CREATE LANGUAGE plpythonu" template_postgis env: - NPROCS=1 JOBS=1 PGUSER=postgres From 19216eaa88b110eeb63dc3b59a54bfb46a41f59f Mon Sep 17 00:00:00 2001 From: Raul Ochoa Date: Wed, 13 Jan 2016 20:21:41 +0100 Subject: [PATCH 8/9] Use create language instead of extension --- test/support/prepare_db.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/support/prepare_db.sh b/test/support/prepare_db.sh index fd920e8d..ab9149a2 100755 --- a/test/support/prepare_db.sh +++ b/test/support/prepare_db.sh @@ -78,9 +78,9 @@ if test x"$PREPARE_PGSQL" = xyes; then sed "s/:TESTPASS/${TESTPASS}/" | psql -v ON_ERROR_STOP=1 ${TEST_DB} || exit 1 - psql -c "CREATE EXTENSION plpythonu;" ${TEST_DB} -# curl -L -s https://github.com/CartoDB/cartodb-postgresql/raw/cdb/scripts-available/CDB_QueryStatements.sql -o sql/CDB_QueryStatements.sql -# curl -L -s https://github.com/CartoDB/cartodb-postgresql/raw/cdb/scripts-available/CDB_QueryTables.sql -o sql/CDB_QueryTables.sql + psql -c "CREATE LANGUAGE plpythonu;" ${TEST_DB} + curl -L -s https://github.com/CartoDB/cartodb-postgresql/raw/cdb/scripts-available/CDB_QueryStatements.sql -o sql/CDB_QueryStatements.sql + curl -L -s https://github.com/CartoDB/cartodb-postgresql/raw/cdb/scripts-available/CDB_QueryTables.sql -o sql/CDB_QueryTables.sql cat sql/CDB_QueryStatements.sql sql/CDB_QueryTables.sql | psql -v ON_ERROR_STOP=1 ${TEST_DB} || exit 1 From 97d3bed1d2f5854ec3d14ff510a92e48a6b2719e Mon Sep 17 00:00:00 2001 From: Raul Ochoa Date: Wed, 13 Jan 2016 20:33:12 +0100 Subject: [PATCH 9/9] test with pg 9.4 --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 41b31179..671832f0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,9 +1,10 @@ sudo: false addons: - postgresql: "9.3" + postgresql: "9.4" apt: packages: + - postgresql-plpython-9.4 - pkg-config - libcairo2-dev - libjpeg8-dev