Merge remote-tracking branch 'carto/master' into federated_functions

.travis.yml

@@ -16,7 +16,9 @@ jobs:
     - env: POSTGRESQL_VERSION="11" POSTGIS_VERSION="2.5"
     - env: POSTGRESQL_VERSION="12" POSTGIS_VERSION="2.5"
     - env: POSTGRESQL_VERSION="12" POSTGIS_VERSION="3"
-  
+  allow_failures:
+    - env: POSTGRESQL_VERSION="12" POSTGIS_VERSION="2.5"
+    - env: POSTGRESQL_VERSION="12" POSTGIS_VERSION="3"
 
 script:
   - sudo service postgresql stop;

Makefile

@@ -138,7 +138,9 @@ PG_VERSION := $(shell $(PG_CONFIG) --version | $(AWK) '{split($$2,a,"."); print
 PG_12_GE := $(shell [ $(PG_VERSION) -ge 12 ] && echo true)
 PLPYTHONU := plpythonu
 ifeq ($(PG_12_GE), true)
-PLPYTHONU := plpython3u
+# Reverted until we are ready for PG12 support in other projects
+PLPYTHONU := plpythonu
+# PLPYTHONU := plpython3u
 endif
 PGPORT ?= '5432'
 PGUSER ?= 'postgres'

NEWS.md

@@ -1,3 +1,6 @@
+0.33.0 (XXXX-XX-XX)
+* Revert `Make PG12 depend on plpython3u instead of plpythonu`.
+
 0.32.0 (2019-11-08)
 * Fix oAuth ownership re-assignation for functions
 * Some fixes for PG12.