Try testing PG 11 and 12 on travispg12

Much of the test grid disabled: reinstate and rebase before merging.

5 files changed, 12 insertions, 87 deletions

diff --git a/.appveyor.yml b/.appveyor.yml
deleted file mode 100644
index 13d4e25..0000000
--- a/.appveyor.yml
+++ /dev/null
@@ -1,79 +0,0 @@
-version : 2.x.{build}
-
-clone_folder: C:\Project
-
-environment:
-    global:
-        # MSVC Express 2008's setenv.cmd failes if /E:ON and /V:ON are not
-        # enabled in the batch script interpreter
-        CMD_IN_ENV: cmd /E:ON /V:ON /C .\appveyor\run_with_env.cmd
-
-    matrix:
-        # For Python versions available on Appveyor, see
-        # https://www.appveyor.com/docs/build-environment/
-      - {PY_VER: "27", PY_ARCH: "32"}
-      - {PY_VER: "27", PY_ARCH: "64"}
-      - {PY_VER: "37", PY_ARCH: "32"}
-      - {PY_VER: "37", PY_ARCH: "64"}
-      - {PY_VER: "36", PY_ARCH: "32"}
-      - {PY_VER: "36", PY_ARCH: "64"}
-      - {PY_VER: "35", PY_ARCH: "32"}
-      - {PY_VER: "35", PY_ARCH: "64"}
-      - {PY_VER: "34", PY_ARCH: "32"}
-      - {PY_VER: "34", PY_ARCH: "64"}
-
-    OPENSSL_VERSION: "1_1_1b"
-    POSTGRES_VERSION: "11_2"
-
-    PSYCOPG2_TESTDB: psycopg2_test
-    PSYCOPG2_TESTDB_USER: postgres
-    PSYCOPG2_TESTDB_HOST: localhost
-
-    PGUSER: postgres
-    PGPASSWORD: Password12!
-    PGSSLMODE: require
-
-    # Select according to the service enabled
-    POSTGRES_DIR: C:\Program Files\PostgreSQL\9.6\
-
-    # The python used in the build process, not the one packages are built for
-    PYEXE: C:\Python36\python.exe
-
-matrix:
-    fast_finish: false
-
-services:
-    # Note: if you change this service also change POSTGRES_DIR
-    - postgresql96
-
-cache:
-  # Rebuild cache if following file changes
-  # (See the file to zap the cache manually)
-  - C:\Others -> scripts\appveyor.cache_rebuild
-
-# Script called before repo cloning
-# init:
-
-# Repository gets cloned, Cache is restored
-
-install:
-    - "%PYEXE% scripts\\appveyor.py install"
-
-# PostgreSQL server starts now
-
-build: off
-
-build_script:
-    - "%PYEXE% scripts\\appveyor.py build_script"
-
-after_build:
-    - "%PYEXE% scripts\\appveyor.py after_build"
-
-before_test:
-    - "%PYEXE% scripts\\appveyor.py before_test"
-
-test_script:
-    - "%PYEXE% scripts\\appveyor.py test_script"
-
-
-# vim: set ts=4 sts=4 sw=4:
diff --git a/.travis.yml b/.travis.yml
index a40e807..16accc3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,12 +6,12 @@ language: python
 
 matrix:
   include:
-    - python: 2.7
+    # - python: 2.7
     - python: 3.7
-    - python: 3.6
-    - python: 3.5
-    - python: 3.4
-      dist: trusty
+    # - python: 3.6
+    # - python: 3.5
+    # - python: 3.4
+    #   dist: trusty
 
 install:
   - pip install -U pip setuptools wheel
diff --git a/doc/src/install.rst b/doc/src/install.rst
index 053b2bb..f41ca62 100644
--- a/doc/src/install.rst
+++ b/doc/src/install.rst
@@ -36,7 +36,7 @@ The current `!psycopg2` implementation supports:
 
 - Python version 2.7
 - Python 3 versions from 3.4 to 3.7
-- PostgreSQL server versions from 7.4 to 11
+- PostgreSQL server versions from 7.4 to 12
 - PostgreSQL client library version from 9.1
 
 
diff --git a/scripts/travis_prepare.sh b/scripts/travis_prepare.sh
index 26644a0..9d8e56d 100755
--- a/scripts/travis_prepare.sh
+++ b/scripts/travis_prepare.sh
@@ -117,6 +117,8 @@ cd /
 
 # Postgres versions supported by Travis CI
 if (( ! "$DONT_TEST_PRESENT" )); then
+    create 12
+    create 11
     create 10
     create 9.6
     create 9.5
@@ -140,5 +142,5 @@ fi
 
 # Postgres built from master
 if (( "$TEST_FUTURE" )); then
-    create 11 11-master
+    create 13 13-master
 fi
diff --git a/scripts/travis_test.sh b/scripts/travis_test.sh
index 5a5b765..a3de9ec 100755
--- a/scripts/travis_test.sh
+++ b/scripts/travis_test.sh
@@ -46,6 +46,8 @@ run_test () {
 
 # Postgres versions supported by Travis CI
 if (( ! "$DONT_TEST_PRESENT" )); then
+    run_test 12
+    run_test 11
     run_test 10
     run_test 9.6
     run_test 9.5
@@ -69,5 +71,5 @@ fi
 
 # Postgres built from master
 if (( "$TEST_FUTURE" )); then
-    run_test 11
+    run_test 13
 fi