mirror of
https://github.com/psycopg/psycopg2.git
synced 2024-11-13 04:26:33 +03:00
Merge branch 'py311-win32'
This commit is contained in:
commit
e8d92b74fd
|
@ -11,8 +11,8 @@ environment:
|
||||||
matrix:
|
matrix:
|
||||||
# For Python versions available on Appveyor, see
|
# For Python versions available on Appveyor, see
|
||||||
# https://www.appveyor.com/docs/windows-images-software/#python
|
# https://www.appveyor.com/docs/windows-images-software/#python
|
||||||
# - {PY_VER: "311", PY_ARCH: "32", APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019}
|
- {PY_VER: "311", 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: "311", PY_ARCH: "64", 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: "32", APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019}
|
||||||
- {PY_VER: "310", PY_ARCH: "64", 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: "32", APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019}
|
||||||
|
|
|
@ -6,8 +6,8 @@ environment:
|
||||||
matrix:
|
matrix:
|
||||||
# For Python versions available on Appveyor, see
|
# For Python versions available on Appveyor, see
|
||||||
# https://www.appveyor.com/docs/windows-images-software/#python
|
# https://www.appveyor.com/docs/windows-images-software/#python
|
||||||
# - {PY_VER: "311", PY_ARCH: "32", APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019}
|
- {PY_VER: "311", PY_ARCH: "32", APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019}
|
||||||
# - {PY_VER: "311", PY_ARCH: "64", APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019}
|
- {PY_VER: "311", PY_ARCH: "64", 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: "32", APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019}
|
||||||
- {PY_VER: "310", PY_ARCH: "64", 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: "32", APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019}
|
||||||
|
|
|
@ -655,9 +655,12 @@ class Options:
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def py_ver(self):
|
def py_ver(self):
|
||||||
"""The Python version to build as 2 digits string."""
|
"""The Python version to build as 2 digits string.
|
||||||
|
|
||||||
|
For large values of 2, occasionally.
|
||||||
|
"""
|
||||||
rv = os.environ['PY_VER']
|
rv = os.environ['PY_VER']
|
||||||
assert rv in ('36', '37', '38', '39', '310'), rv
|
assert rv in ('36', '37', '38', '39', '310', '311'), rv
|
||||||
return rv
|
return rv
|
||||||
|
|
||||||
@property
|
@property
|
||||||
|
@ -744,6 +747,7 @@ class Options:
|
||||||
'38': '14.0',
|
'38': '14.0',
|
||||||
'39': '16.0',
|
'39': '16.0',
|
||||||
'310': '16.0',
|
'310': '16.0',
|
||||||
|
'311': '16.0',
|
||||||
}
|
}
|
||||||
return vsvers[self.py_ver]
|
return vsvers[self.py_ver]
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user