Merge branch 'master' into rm-3.4

This commit is contained in:
Hugo van Kemenade 2020-11-13 21:22:26 +02:00 committed by GitHub
commit d8aa60221d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 4 deletions

View File

@ -132,8 +132,8 @@ The current `!psycopg2` implementation supports:
NOTE: keep consistent with setup.py and the /features/ page. NOTE: keep consistent with setup.py and the /features/ page.
- Python version 2.7 - Python version 2.7
- Python 3 versions from 3.5 to 3.9 - Python 3 versions from 3.5 to 3.8
- PostgreSQL server versions from 7.4 to 12 - PostgreSQL server versions from 7.4 to 13
- PostgreSQL client library version from 9.1 - PostgreSQL client library version from 9.1

View File

@ -125,6 +125,7 @@ if (( "$TEST_PRESENT" )); then
# Postgres versions supported by ARM64 # Postgres versions supported by ARM64
create 10 create 10
else else
create 13
create 12 create 12
create 11 create 11
create 10 create 10
@ -150,5 +151,6 @@ fi
# Postgres built from master # Postgres built from master
if (( "$TEST_FUTURE" )); then if (( "$TEST_FUTURE" )); then
create 13 13-master # create 14 14-master
true
fi fi

View File

@ -56,6 +56,7 @@ if (( "$TEST_PRESENT" )); then
run_test 10 run_test 10
else else
# Postgres versions supported by Travis CI # Postgres versions supported by Travis CI
run_test 13
run_test 12 run_test 12
run_test 11 run_test 11
run_test 10 run_test 10
@ -81,5 +82,6 @@ fi
# Postgres built from master # Postgres built from master
if (( "$TEST_FUTURE" )); then if (( "$TEST_FUTURE" )); then
run_test 13 # create 14 14-master
true
fi fi