wip

Author: pgplatform-io

META.json

@@ -1,7 +1,7 @@
 {
     "name": "multicorn",
     "abstract": "Multicorn2 Python bindings for Postgres 10+ Foreign Data Wrapper",
-    "description": "The Multicorn2 Foreign Data Wrapper allows you to write foreign data wrappers in python.",
+    "description": "The Multicorn2 Foreign Data Wrapper allows you to write extensions in python.",
     "version": "__VERSION__",
     "maintainer": "Denis Lussier <[email protected]>",
     "license": {
@@ -20,7 +20,7 @@
     },
     "provides": {
         "multicorn": {
-            "abstract": "Multicorn Python bindings for Postgres 10+ Foreign Data Wrapper",
+            "abstract": "Multicorn Python bindings for Postgres 13+ Foreign Data Wrapper",
             "file": "sql/multicorn.sql",
             "docfile": "doc/multicorn.md",
             "version": "__VERSION__"
@@ -29,16 +29,16 @@
     "prereqs": {
         "runtime": {
             "requires": {
-                "PostgreSQL": "10.0",
-                "Python": "3.6.0"
+                "PostgreSQL": "13.0",
+                "Python": "3.9.3"
             }
         }
     },
 
     "release_status": "stable",
     "generated_by": "Lussier",
     "meta-spec": {
-        "version": "1.0.0",
+        "version": "3.1",
         "url": "http://pgxn.org/meta/spec.txt"
     },
     "tags": [

docheck

@@ -7,8 +7,6 @@ Usage: ./docheck command [args]
 
 Available commands:
 
- * py2-9.6: build and test extension in container with postgresql-9.6
- * test-in-docker: used internally by other commands
 EOF
 }
 
@@ -17,12 +15,6 @@ if [[ $# = 0 ]] ; then
 	exit 1
 fi
 
-py2_check () {
-	local v=$1
-	docker build -f docker/$v/Dockerfile docker/$v -t pg-test:$v
-	docker run -v "${PWD}:/source:ro" pg-test:$v /source/docheck test-in-docker 2.7
-}
-
 py3_check () {
 	local v=$1
 	docker build -f docker/$v/Dockerfile docker/$v -t pg-test:$v
@@ -33,17 +25,9 @@ py3_check () {
 cmd=$1
 shift 1
 case "${cmd}" in
-(py2-9.6) py2_check py2-9.6 ;;
-(py3-9.6) py3_check py3-9.6 ;;
-(py2-10)  py2_check py2-10  ;;
-(py3-10)  py3_check py3-10  ;;
-(py2-11)  py2_check py2-11  ;;
 (py3-11)  py3_check py3-11  ;;
-(py2-12)  py2_check py2-12  ;;
-(py3-12)  py3_check py3-12  ;;
+(py39-13)  py3_check py3-12  ;;
 (test-in-docker)
-	# Actually, we only need only distinguish python-2.7 and python-3.3
-	# tests.
 	PY_VERSION=$1
 	cp -r /source /build
 	cd /build

docker/py3-12/Dockerfile renamed to docker/py39-pg13/Dockerfile

@@ -1,11 +1,11 @@
-FROM postgres:12
+FROM postgres:13
 RUN apt-get update && apt-get install -y \
 	build-essential \
 	clang \
 	libpython3.9-dev \
 	python3.9-dev \
-	postgresql-client-12 \
-	postgresql-server-dev-12 \
+	postgresql-client-13 \
+	postgresql-server-dev-13 \
 	python3-setuptools
 
 ENV PGUSER postgres

test-3.12

@@ -0,0 +1 @@
+test-3.9