From 9fa532623dae4a76987f22f083e736eb65435158 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ra=C3=BAl=20Mar=C3=ADn?= <git@rmr.ninja>
Date: Tue, 24 Dec 2019 13:56:46 +0100
Subject: [PATCH] Set python3 as dependency for PG12+ again

---
 .travis.yml | 3 ---
 Makefile    | 4 +---
 NEWS.md     | 1 +
 3 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index e6f080c..f934592 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,9 +16,6 @@ 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;
diff --git a/Makefile b/Makefile
index 439e93e..d25f86c 100644
--- a/Makefile
+++ b/Makefile
@@ -140,9 +140,7 @@ 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)
-# Reverted until we are ready for PG12 support in other projects
-PLPYTHONU := plpythonu
-# PLPYTHONU := plpython3u
+PLPYTHONU := plpython3u
 endif
 PGPORT ?= '5432'
 PGUSER ?= 'postgres'
diff --git a/NEWS.md b/NEWS.md
index ab968d0..fe2bd71 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -1,5 +1,6 @@
 0.35.0 (XXXX-XX-XX)
 * Reapply the changes in 0.33.0 (the issue we were looking for was unrelated)
+* Reapply `Make PG12 depend on plpython3u instead of plpythonu`
 
 0.34.0 (2019-12-23)
 * Revert changes done in 0.33.0, keeping function signature to drop them