Skip to content

Commit c5bbb18

Browse files
author
Raúl Marín
authored
Merge pull request #391 from Algunenano/python3again
Set python3 as dependency for PG12+ again
2 parents 921800e + 9fa5326 commit c5bbb18

File tree

3 files changed

+2
-6
lines changed

3 files changed

+2
-6
lines changed

.travis.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,6 @@ jobs:
1616
- env: POSTGRESQL_VERSION="11" POSTGIS_VERSION="2.5"
1717
- env: POSTGRESQL_VERSION="12" POSTGIS_VERSION="2.5"
1818
- env: POSTGRESQL_VERSION="12" POSTGIS_VERSION="3"
19-
allow_failures:
20-
- env: POSTGRESQL_VERSION="12" POSTGIS_VERSION="2.5"
21-
- env: POSTGRESQL_VERSION="12" POSTGIS_VERSION="3"
2219

2320
script:
2421
- sudo service postgresql stop;

Makefile

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -140,9 +140,7 @@ PG_VERSION := $(shell $(PG_CONFIG) --version | $(AWK) '{split($$2,a,"."); print
140140
PG_12_GE := $(shell [ $(PG_VERSION) -ge 12 ] && echo true)
141141
PLPYTHONU := plpythonu
142142
ifeq ($(PG_12_GE), true)
143-
# Reverted until we are ready for PG12 support in other projects
144-
PLPYTHONU := plpythonu
145-
# PLPYTHONU := plpython3u
143+
PLPYTHONU := plpython3u
146144
endif
147145
PGPORT ?= '5432'
148146
PGUSER ?= 'postgres'

NEWS.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
0.35.0 (XXXX-XX-XX)
22
* Reapply the changes in 0.33.0 (the issue we were looking for was unrelated)
3+
* Reapply `Make PG12 depend on plpython3u instead of plpythonu`
34

45
0.34.0 (2019-12-23)
56
* Revert changes done in 0.33.0, keeping function signature to drop them

0 commit comments

Comments
 (0)