Skip to content

Commit

Permalink
Build Python 3.10 packages of relase 2.9.1
Browse files Browse the repository at this point in the history
  • Loading branch information
dvarrazzo committed Nov 3, 2021
1 parent b241def commit e0afdce
Show file tree
Hide file tree
Showing 6 changed files with 18 additions and 19 deletions.
2 changes: 2 additions & 0 deletions .appveyor/packages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/packages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
24 changes: 10 additions & 14 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion scripts/build/appveyor.py
Original file line number Diff line number Diff line change
Expand Up @@ -661,7 +661,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
Expand Down Expand Up @@ -747,6 +747,7 @@ def vs_ver(self):
'37': '14.0',
'38': '14.0',
'39': '16.0',
'310': '16.0',
}
return vsvers[self.py_ver]

Expand Down
2 changes: 1 addition & 1 deletion scripts/build/build_manylinux_2_24.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tox.ini
Original file line number Diff line number Diff line change
@@ -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
Expand Down

0 comments on commit e0afdce

Please sign in to comment.