Skip to content

Commit

Permalink
Merge branch 'master' into rm-3.4
Browse files Browse the repository at this point in the history
  • Loading branch information
hugovk authored Nov 13, 2020
2 parents d04a420 + 87dc783 commit d8aa602
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 4 deletions.
4 changes: 2 additions & 2 deletions doc/src/install.rst
Original file line number Diff line number Diff line change
Expand Up @@ -132,8 +132,8 @@ The current `!psycopg2` implementation supports:
NOTE: keep consistent with setup.py and the /features/ page.
- Python version 2.7
- Python 3 versions from 3.5 to 3.9
- PostgreSQL server versions from 7.4 to 12
- Python 3 versions from 3.5 to 3.8
- PostgreSQL server versions from 7.4 to 13
- PostgreSQL client library version from 9.1


Expand Down
4 changes: 3 additions & 1 deletion scripts/travis_prepare.sh
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,7 @@ if (( "$TEST_PRESENT" )); then
# Postgres versions supported by ARM64
create 10
else
create 13
create 12
create 11
create 10
Expand All @@ -150,5 +151,6 @@ fi

# Postgres built from master
if (( "$TEST_FUTURE" )); then
create 13 13-master
# create 14 14-master
true
fi
4 changes: 3 additions & 1 deletion scripts/travis_test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ if (( "$TEST_PRESENT" )); then
run_test 10
else
# Postgres versions supported by Travis CI
run_test 13
run_test 12
run_test 11
run_test 10
Expand All @@ -81,5 +82,6 @@ fi

# Postgres built from master
if (( "$TEST_FUTURE" )); then
run_test 13
# create 14 14-master
true
fi

0 comments on commit d8aa602

Please sign in to comment.