psycopg/psycopg2
1
1
Fork 0
mirror of https://github.com/psycopg/psycopg2.git synced 2024-11-10 19:16:34 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'py310'

Browse Source
This commit is contained in:
Daniele Varrazzo 2021-11-03 14:18:09 +01:00
commit 8e186dd7e9
7 changed files with 20 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.appveyor/packages.yml
View File

@ -11,6 +11,8 @@ environment:
matrix:
# For Python versions available on Appveyor, see
# https://www.appveyor.com/docs/windows-images-software/#python
- {APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019, PY_VER: "310", PY_ARCH: "32"}
- {APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019, PY_VER: "310", PY_ARCH: "64"}
- {APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019, PY_VER: "39", PY_ARCH: "32"}
- {APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019, PY_VER: "39", PY_ARCH: "64"}
- {APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015, PY_VER: "38", PY_ARCH: "32"}

2
.appveyor/tests.yml
View File

@ -6,6 +6,8 @@ environment:
matrix:
# For Python versions available on Appveyor, see
# https://www.appveyor.com/docs/windows-images-software/#python
- {APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019, PY_VER: "310", PY_ARCH: "32"}
- {APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019, PY_VER: "310", PY_ARCH: "64"}
- {APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019, PY_VER: "39", PY_ARCH: "32"}
- {APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019, PY_VER: "39", PY_ARCH: "64"}
- {APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015, PY_VER: "38", PY_ARCH: "32"}

4
.github/workflows/packages.yml vendored
View File

@ -75,7 +75,7 @@ jobs:
docker run --rm
-e PLAT=${{ matrix.tag }}_${{ matrix.arch }}
-e PACKAGE_NAME=psycopg2-binary
-e PYVERS="cp36-cp36m cp37-cp37m cp38-cp38 cp39-cp39"
-e PYVERS="cp36-cp36m cp37-cp37m cp38-cp38 cp39-cp39 cp310-cp310"
-e PSYCOPG2_TESTDB=postgres
-e PSYCOPG2_TESTDB_HOST=172.17.0.1
-e PSYCOPG2_TESTDB_USER=postgres
@ -113,7 +113,7 @@ jobs:
strategy:
fail-fast: false
matrix:
python-version: ['3.6', '3.7', '3.8', '3.9']
python-version: ['3.6', '3.7', '3.8', '3.9', '3.10']
steps:
- name: Checkout repos

24
.github/workflows/tests.yml vendored
View File

@ -13,22 +13,18 @@ jobs:
fail-fast: false
matrix:
include:
- python: 3.6
postgres: 10
- python: 3.7
postgres: 11
- python: 3.8
postgres: 12
- python: 3.9
postgres: 13
- {python: "3.6", postgres: "10"}
- {python: "3.7", postgres: "11"}
- {python: "3.8", postgres: "12"}
- {python: "3.9", postgres: "13"}
- {python: "3.10", postgres: "14"}
# Opposite extremes of the supported Py/PG range, other architecture
- python: 3.6
postgres: 13
architecture: 'x86'
- python: 3.9
postgres: 9.5
architecture: 'x86'
- {python: "3.6", postgres: "14", architecture: "x86"}
- {python: "3.7", postgres: "13", architecture: "x86"}
- {python: "3.8", postgres: "12", architecture: "x86"}
- {python: "3.9", postgres: "11", architecture: "x86"}
- {python: "3.10", postgres: "10", architecture: "x86"}
env:
PSYCOPG2_TESTDB: postgres

3
scripts/build/appveyor.py
View File

@ -657,7 +657,7 @@ class Options:
def py_ver(self):
"""The Python version to build as 2 digits string."""
rv = os.environ['PY_VER']
assert rv in ('36', '37', '38', '39'), rv
assert rv in ('36', '37', '38', '39', '310'), rv
return rv
@property
@ -743,6 +743,7 @@ class Options:
'37': '14.0',
'38': '14.0',
'39': '16.0',
'310': '16.0',
}
return vsvers[self.py_ver]

2
scripts/build/build_manylinux_2_24.sh
View File

@ -27,7 +27,7 @@ if [[ "${PACKAGE_NAME:-}" ]]; then
fi
# Install prerequisite libraries
curl -s https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add -
curl -k -s https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add -
echo "deb http://apt.postgresql.org/pub/repos/apt stretch-pgdg main" \
> /etc/apt/sources.list.d/pgdg.list
apt-get -y update

2
tox.ini
View File

@ -1,5 +1,5 @@
[tox]
envlist = {3.6,3.7,3.8,3.9}
envlist = {3.6,3.7,3.8,3.9,3.10}
[testenv]
commands = make check