diff --git a/.travis.yml b/.travis.yml index 4fafe92..77adcc4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -30,7 +30,7 @@ before_install: - sudo apt-get install -y --allow-unauthenticated postgresql-$POSTGRESQL_VERSION-postgis-$POSTGIS_VERSION postgresql-$POSTGRESQL_VERSION-postgis-$POSTGIS_VERSION-scripts postgis # For pre12, install plpython2. For PG12 install plpython3 - - if [[ $POSTGRESQL_VERSION != '12' ]]; then sudo apt-get install -y postgresql-plpython-$POSTGRESQL_VERSION python python-pip python-software-properties python-joblib python-nose; else sudo apt-get install -y postgresql-plpython3-12 python3 python3-pip python3-software-properties python3-joblib python3-nose; fi; + - if [[ $POSTGRESQL_VERSION != '12' ]]; then sudo apt-get install -y postgresql-plpython-$POSTGRESQL_VERSION python python-pip python-software-properties python-joblib python-nose python-setuptools; else sudo apt-get install -y postgresql-plpython3-12 python3 python3-pip python3-software-properties python3-joblib python3-nose python3-setuptools; fi; - sudo pg_dropcluster --stop $POSTGRESQL_VERSION main - sudo rm -rf /etc/postgresql/$POSTGRESQL_VERSION /var/lib/postgresql/$POSTGRESQL_VERSION diff --git a/src/pg/Makefile b/src/pg/Makefile index d523765..f8f7a47 100644 --- a/src/pg/Makefile +++ b/src/pg/Makefile @@ -21,7 +21,7 @@ SOURCES_DATA = $(wildcard $(SOURCES_DATA_DIR)/*.sql) REPLACEMENTS = -e 's/@@VERSION@@/$(EXTVERSION)/g' ifneq ($(PYTHON3), true) - REPLACEMENTS = -e 's/@@VERSION@@/$(EXTVERSION)/g' -e + REPLACEMENTS = -e 's/@@VERSION@@/$(EXTVERSION)/g' -e 's/plpython3u/plpythonu/g' endif $(DATA): $(SOURCES_DATA)