Set python3 as dependency for PG12+ again

This commit is contained in:
Raúl Marín 2019-12-24 13:56:46 +01:00
parent 921800e6a3
commit 9fa532623d
3 changed files with 2 additions and 6 deletions

View File

@ -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;

View File

@ -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'

View File

@ -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