cartodb4/cartodb-postgresql
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Set python3 as dependency for PG12+ again

Browse Source
This commit is contained in:
Raúl Marín
2019-12-24 13:57:13 +01:00
parent 921800e6a3
commit 9fa532623d
3 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.travis.yml
-3
View File
@@ -16,9 +16,6 @@ jobs:
- env: POSTGRESQL_VERSION="11" POSTGIS_VERSION="2.5" - env: POSTGRESQL_VERSION="11" POSTGIS_VERSION="2.5"
- env: POSTGRESQL_VERSION="12" POSTGIS_VERSION="2.5" - env: POSTGRESQL_VERSION="12" POSTGIS_VERSION="2.5"
- env: POSTGRESQL_VERSION="12" POSTGIS_VERSION="3" - 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: script:
- sudo service postgresql stop; - sudo service postgresql stop;
Makefile
+1 -3
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) PG_12_GE := $(shell [ $(PG_VERSION) -ge 12 ] && echo true)
PLPYTHONU := plpythonu PLPYTHONU := plpythonu
ifeq ($(PG_12_GE), true) ifeq ($(PG_12_GE), true)
# Reverted until we are ready for PG12 support in other projects PLPYTHONU := plpython3u
PLPYTHONU := plpythonu
# PLPYTHONU := plpython3u
endif endif
PGPORT ?= '5432' PGPORT ?= '5432'
PGUSER ?= 'postgres' PGUSER ?= 'postgres'
NEWS.md
+1
View File
@@ -1,5 +1,6 @@
0.35.0 (XXXX-XX-XX) 0.35.0 (XXXX-XX-XX)
* Reapply the changes in 0.33.0 (the issue we were looking for was unrelated) * 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) 0.34.0 (2019-12-23)
* Revert changes done in 0.33.0, keeping function signature to drop them * Revert changes done in 0.33.0, keeping function signature to drop them