mirror of
https://github.com/psycopg/psycopg2.git
synced 2025-04-22 01:11:58 +03:00
Compare commits
No commits in common. "master" and "2_9_5" have entirely different histories.
19
.appveyor/cache_rebuild
Normal file
19
.appveyor/cache_rebuild
Normal file
|
|
@ -0,0 +1,19 @@
|
|||
This file is a simple placeholder for forcing the appveyor build cache
|
||||
to invalidate itself since appveyor.yml changes more frequently then
|
||||
the cache needs updating. Note, the versions list here can be
|
||||
different than what is indicated in appveyor.yml.
|
||||
|
||||
To invalidate the cache, update this file and check it into git.
|
||||
|
||||
|
||||
Currently used modules built in the cache:
|
||||
|
||||
- OPENSSL_VERSION: 1.1.1r
|
||||
- POSTGRES_VERSION: 15.0
|
||||
|
||||
|
||||
NOTE: to zap the cache manually you can also use:
|
||||
|
||||
curl -X DELETE -H "Authorization: Bearer $APPVEYOR_TOKEN" -H "Content-Type: application/json" https://ci.appveyor.com/api/projects/psycopg/psycopg2/buildcache
|
||||
|
||||
with the token from https://ci.appveyor.com/api-token
|
||||
90
.appveyor/packages.yml
Normal file
90
.appveyor/packages.yml
Normal file
|
|
@ -0,0 +1,90 @@
|
|||
version: 2.x.{build}
|
||||
|
||||
clone_folder: C:\Project
|
||||
|
||||
# We use the configuration to specify the package name
|
||||
configuration:
|
||||
- psycopg2
|
||||
- psycopg2-binary
|
||||
|
||||
environment:
|
||||
matrix:
|
||||
# For Python versions available on Appveyor, see
|
||||
# https://www.appveyor.com/docs/windows-images-software/#python
|
||||
# - {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: "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 2019}
|
||||
- {PY_VER: "38", PY_ARCH: "32", APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015}
|
||||
- {PY_VER: "38", PY_ARCH: "64", APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015}
|
||||
- {PY_VER: "37", PY_ARCH: "32", APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015}
|
||||
- {PY_VER: "37", PY_ARCH: "64", APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015}
|
||||
- {PY_VER: "36", PY_ARCH: "32", APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015}
|
||||
- {PY_VER: "36", PY_ARCH: "64", APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015}
|
||||
|
||||
WORKFLOW: packages
|
||||
|
||||
OPENSSL_VERSION: "1_1_1r"
|
||||
POSTGRES_VERSION: "15_0"
|
||||
|
||||
PSYCOPG2_TESTDB: psycopg2_test
|
||||
PSYCOPG2_TESTDB_USER: postgres
|
||||
PSYCOPG2_TESTDB_HOST: localhost
|
||||
|
||||
PGUSER: postgres
|
||||
PGPASSWORD: Password12!
|
||||
PGSSLMODE: require
|
||||
|
||||
# Add CWD to perl library path for PostgreSQL build on VS2019
|
||||
PERL5LIB: .
|
||||
|
||||
# Select according to the service enabled
|
||||
POSTGRES_DIR: C:\Program Files\PostgreSQL\9.6\
|
||||
|
||||
# The python used in the build process, not the one packages are built for
|
||||
PYEXE: C:\Python36\python.exe
|
||||
|
||||
matrix:
|
||||
fast_finish: false
|
||||
|
||||
services:
|
||||
# Note: if you change this service also change POSTGRES_DIR
|
||||
- postgresql96
|
||||
|
||||
cache:
|
||||
# Rebuild cache if following file changes
|
||||
# (See the file to zap the cache manually)
|
||||
- C:\Others -> .appveyor\cache_rebuild
|
||||
|
||||
# Script called before repo cloning
|
||||
# init:
|
||||
|
||||
# Repository gets cloned, Cache is restored
|
||||
|
||||
install:
|
||||
- "%PYEXE% scripts\\build\\appveyor.py install"
|
||||
|
||||
# PostgreSQL server starts now
|
||||
|
||||
build: "off"
|
||||
|
||||
build_script:
|
||||
- "%PYEXE% scripts\\build\\appveyor.py build_script"
|
||||
|
||||
after_build:
|
||||
- "%PYEXE% scripts\\build\\appveyor.py after_build"
|
||||
|
||||
before_test:
|
||||
- "%PYEXE% scripts\\build\\appveyor.py before_test"
|
||||
|
||||
test_script:
|
||||
- "%PYEXE% scripts\\build\\appveyor.py test_script"
|
||||
|
||||
artifacts:
|
||||
- path: dist\psycopg2-*\*.whl
|
||||
name: wheel
|
||||
|
||||
|
||||
# vim: set ts=4 sts=4 sw=4:
|
||||
81
.appveyor/tests.yml
Normal file
81
.appveyor/tests.yml
Normal file
|
|
@ -0,0 +1,81 @@
|
|||
version: 2.x.{build}
|
||||
|
||||
clone_folder: C:\Project
|
||||
|
||||
environment:
|
||||
matrix:
|
||||
# For Python versions available on Appveyor, see
|
||||
# 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: "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: "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 2019}
|
||||
- {PY_VER: "38", PY_ARCH: "32", APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015}
|
||||
- {PY_VER: "38", PY_ARCH: "64", APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015}
|
||||
- {PY_VER: "37", PY_ARCH: "32", APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015}
|
||||
- {PY_VER: "37", PY_ARCH: "64", APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015}
|
||||
- {PY_VER: "36", PY_ARCH: "32", APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015}
|
||||
- {PY_VER: "36", PY_ARCH: "64", APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015}
|
||||
|
||||
WORKFLOW: tests
|
||||
|
||||
OPENSSL_VERSION: "1_1_1r"
|
||||
POSTGRES_VERSION: "15_0"
|
||||
|
||||
PSYCOPG2_TESTDB: psycopg2_test
|
||||
PSYCOPG2_TESTDB_USER: postgres
|
||||
PSYCOPG2_TESTDB_HOST: localhost
|
||||
|
||||
PGUSER: postgres
|
||||
PGPASSWORD: Password12!
|
||||
PGSSLMODE: require
|
||||
|
||||
# Add CWD to perl library path for PostgreSQL build on VS2019
|
||||
PERL5LIB: .
|
||||
|
||||
# Select according to the service enabled
|
||||
POSTGRES_DIR: C:\Program Files\PostgreSQL\9.6\
|
||||
|
||||
# The python used in the build process, not the one packages are built for
|
||||
PYEXE: C:\Python36\python.exe
|
||||
|
||||
matrix:
|
||||
fast_finish: false
|
||||
|
||||
services:
|
||||
# Note: if you change this service also change POSTGRES_DIR
|
||||
- postgresql96
|
||||
|
||||
cache:
|
||||
# Rebuild cache if following file changes
|
||||
# (See the file to zap the cache manually)
|
||||
- C:\Others -> .appveyor\cache_rebuild
|
||||
|
||||
# Script called before repo cloning
|
||||
# init:
|
||||
|
||||
# Repository gets cloned, Cache is restored
|
||||
|
||||
install:
|
||||
- "%PYEXE% scripts\\build\\appveyor.py install"
|
||||
|
||||
# PostgreSQL server starts now
|
||||
|
||||
build: "off"
|
||||
|
||||
build_script:
|
||||
- "%PYEXE% scripts\\build\\appveyor.py build_script"
|
||||
|
||||
after_build:
|
||||
- "%PYEXE% scripts\\build\\appveyor.py after_build"
|
||||
|
||||
before_test:
|
||||
- "%PYEXE% scripts\\build\\appveyor.py before_test"
|
||||
|
||||
test_script:
|
||||
- "%PYEXE% scripts\\build\\appveyor.py test_script"
|
||||
|
||||
|
||||
# vim: set ts=4 sts=4 sw=4:
|
||||
6
.github/dependabot.yml
vendored
6
.github/dependabot.yml
vendored
|
|
@ -1,6 +0,0 @@
|
|||
version: 2
|
||||
updates:
|
||||
- package-ecosystem: "github-actions"
|
||||
directory: "/"
|
||||
schedule:
|
||||
interval: "monthly"
|
||||
2
.github/workflows/docs.yml
vendored
2
.github/workflows/docs.yml
vendored
|
|
@ -11,7 +11,7 @@ jobs:
|
|||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Trigger docs build
|
||||
uses: peter-evans/repository-dispatch@v3
|
||||
uses: peter-evans/repository-dispatch@v1
|
||||
with:
|
||||
repository: psycopg/psycopg-website
|
||||
event-type: psycopg2-commit
|
||||
|
|
|
|||
233
.github/workflows/packages.yml
vendored
233
.github/workflows/packages.yml
vendored
|
|
@ -3,14 +3,9 @@ name: Build packages
|
|||
on:
|
||||
- workflow_dispatch
|
||||
|
||||
env:
|
||||
PIP_BREAK_SYSTEM_PACKAGES: "1"
|
||||
LIBPQ_VERSION: "16.0"
|
||||
OPENSSL_VERSION: "1.1.1w"
|
||||
|
||||
jobs:
|
||||
sdist: # {{{
|
||||
if: true
|
||||
build-sdist:
|
||||
strategy:
|
||||
fail-fast: false
|
||||
matrix:
|
||||
|
|
@ -21,7 +16,7 @@ jobs:
|
|||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Checkout repos
|
||||
uses: actions/checkout@v4
|
||||
uses: actions/checkout@v3
|
||||
|
||||
- name: Build sdist
|
||||
run: ./scripts/build/build_sdist.sh
|
||||
|
|
@ -29,11 +24,11 @@ jobs:
|
|||
PACKAGE_NAME: ${{ matrix.package_name }}
|
||||
|
||||
- name: Upload artifacts
|
||||
uses: actions/upload-artifact@v4
|
||||
uses: actions/upload-artifact@v3
|
||||
with:
|
||||
name: sdist-${{ matrix.package_name }}
|
||||
name: packages_sdist
|
||||
path: |
|
||||
dist/*.tar.gz
|
||||
dist/*/*.tar.gz
|
||||
|
||||
env:
|
||||
PSYCOPG2_TESTDB: postgres
|
||||
|
|
@ -44,7 +39,7 @@ jobs:
|
|||
|
||||
services:
|
||||
postgresql:
|
||||
image: postgres:16
|
||||
image: postgres:13
|
||||
env:
|
||||
POSTGRES_PASSWORD: password
|
||||
ports:
|
||||
|
|
@ -56,68 +51,55 @@ jobs:
|
|||
--health-timeout 5s
|
||||
--health-retries 5
|
||||
|
||||
# }}}
|
||||
|
||||
linux: # {{{
|
||||
if: true
|
||||
|
||||
build-manylinux:
|
||||
strategy:
|
||||
fail-fast: false
|
||||
matrix:
|
||||
platform: [manylinux, musllinux]
|
||||
arch: [x86_64, i686, aarch64, ppc64le]
|
||||
pyver: [cp38, cp39, cp310, cp311, cp312, cp313]
|
||||
include:
|
||||
- {tag: manylinux2014, arch: x86_64}
|
||||
- {tag: manylinux2014, arch: i686}
|
||||
- {tag: manylinux_2_24, arch: aarch64}
|
||||
- {tag: manylinux_2_24, arch: ppc64le}
|
||||
- {tag: musllinux_1_1, arch: x86_64}
|
||||
- {tag: musllinux_1_1, arch: i686}
|
||||
- {tag: musllinux_1_1, arch: aarch64}
|
||||
- {tag: musllinux_1_1, arch: ppc64le}
|
||||
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Checkout repos
|
||||
uses: actions/checkout@v4
|
||||
uses: actions/checkout@v3
|
||||
|
||||
- name: Set up QEMU for multi-arch build
|
||||
uses: docker/setup-qemu-action@v3
|
||||
uses: docker/setup-qemu-action@v1
|
||||
|
||||
- name: Cache libpq build
|
||||
uses: actions/cache@v4
|
||||
- name: Build packages
|
||||
run: >-
|
||||
docker run --rm
|
||||
-e PLAT=${{ matrix.tag }}_${{ matrix.arch }}
|
||||
-e PACKAGE_NAME=psycopg2-binary
|
||||
-e PYVERS="cp36-cp36m cp37-cp37m cp38-cp38 cp39-cp39 cp310-cp310 cp311-cp311"
|
||||
-e PSYCOPG2_TESTDB=postgres
|
||||
-e PSYCOPG2_TESTDB_HOST=172.17.0.1
|
||||
-e PSYCOPG2_TESTDB_USER=postgres
|
||||
-e PSYCOPG2_TESTDB_PASSWORD=password
|
||||
-e PSYCOPG2_TEST_FAST=1
|
||||
-v `pwd`:/src
|
||||
--workdir /src
|
||||
quay.io/pypa/${{ matrix.tag }}_${{ matrix.arch }}
|
||||
./scripts/build/build_${{ matrix.tag }}.sh
|
||||
|
||||
- name: Upload artifacts
|
||||
uses: actions/upload-artifact@v3
|
||||
with:
|
||||
path: /tmp/libpq.build
|
||||
key: libpq-${{ env.LIBPQ_VERSION }}-${{ matrix.platform }}-${{ matrix.arch }}
|
||||
|
||||
- name: Build wheels
|
||||
uses: pypa/cibuildwheel@v2.23.2
|
||||
env:
|
||||
CIBW_MANYLINUX_X86_64_IMAGE: manylinux2014
|
||||
CIBW_MANYLINUX_I686_IMAGE: manylinux2014
|
||||
CIBW_MANYLINUX_AARCH64_IMAGE: manylinux2014
|
||||
CIBW_MANYLINUX_PPC64LE_IMAGE: manylinux2014
|
||||
CIBW_BUILD: ${{matrix.pyver}}-${{matrix.platform}}_${{matrix.arch}}
|
||||
CIBW_ARCHS_LINUX: auto aarch64 ppc64le
|
||||
CIBW_BEFORE_ALL_LINUX: ./scripts/build/wheel_linux_before_all.sh
|
||||
CIBW_REPAIR_WHEEL_COMMAND: >-
|
||||
./scripts/build/strip_wheel.sh {wheel}
|
||||
&& auditwheel repair -w {dest_dir} {wheel}
|
||||
CIBW_TEST_COMMAND: >-
|
||||
export PYTHONPATH={project} &&
|
||||
python -c "import tests; tests.unittest.main(defaultTest='tests.test_suite')"
|
||||
CIBW_ENVIRONMENT_PASS_LINUX: LIBPQ_VERSION OPENSSL_VERSION
|
||||
CIBW_ENVIRONMENT: >-
|
||||
PACKAGE_NAME=psycopg2-binary
|
||||
LIBPQ_BUILD_PREFIX=/host/tmp/libpq.build
|
||||
PATH="$LIBPQ_BUILD_PREFIX/bin:$PATH"
|
||||
LD_LIBRARY_PATH="$LIBPQ_BUILD_PREFIX/lib:$LIBPQ_BUILD_PREFIX/lib64"
|
||||
PSYCOPG2_TESTDB=postgres
|
||||
PSYCOPG2_TESTDB_HOST=172.17.0.1
|
||||
PSYCOPG2_TESTDB_USER=postgres
|
||||
PSYCOPG2_TESTDB_PASSWORD=password
|
||||
PSYCOPG2_TEST_FAST=1
|
||||
|
||||
- uses: actions/upload-artifact@v4
|
||||
with:
|
||||
name: linux-${{matrix.pyver}}-${{matrix.platform}}_${{matrix.arch}}
|
||||
path: ./wheelhouse/*.whl
|
||||
name: packages_${{ matrix.tag }}_${{ matrix.arch }}
|
||||
path: |
|
||||
dist/*/*${{ matrix.tag }}_${{ matrix.arch }}.whl
|
||||
|
||||
services:
|
||||
postgresql:
|
||||
image: postgres:16
|
||||
image: postgres:13
|
||||
env:
|
||||
POSTGRES_PASSWORD: password
|
||||
ports:
|
||||
|
|
@ -129,138 +111,33 @@ jobs:
|
|||
--health-timeout 5s
|
||||
--health-retries 5
|
||||
|
||||
# }}}
|
||||
|
||||
macos: # {{{
|
||||
build-macos:
|
||||
runs-on: macos-latest
|
||||
if: true
|
||||
|
||||
strategy:
|
||||
fail-fast: false
|
||||
matrix:
|
||||
# These archs require an Apple M1 runner: [arm64, universal2]
|
||||
arch: [x86_64, arm64]
|
||||
pyver: [cp39, cp310, cp311, cp312, cp313]
|
||||
python-version: ['3.6', '3.7', '3.8', '3.9', '3.10']
|
||||
|
||||
steps:
|
||||
- name: Checkout repos
|
||||
uses: actions/checkout@v4
|
||||
uses: actions/checkout@v3
|
||||
|
||||
- name: Cache libpq build
|
||||
uses: actions/cache@v4
|
||||
- name: Set up Python
|
||||
uses: actions/setup-python@v4
|
||||
with:
|
||||
path: /tmp/libpq.build
|
||||
key: libpq-${{ env.LIBPQ_VERSION }}-macos-${{ matrix.arch }}
|
||||
python-version: ${{ matrix.python-version }}
|
||||
|
||||
- name: Build wheels
|
||||
uses: pypa/cibuildwheel@v2.23.2
|
||||
- name: Build packages
|
||||
run: ./scripts/build/build_macos.sh
|
||||
env:
|
||||
CIBW_BUILD: ${{matrix.pyver}}-macosx_${{matrix.arch}}
|
||||
CIBW_ARCHS_MACOS: ${{matrix.arch}}
|
||||
MACOSX_ARCHITECTURE: ${{matrix.arch}}
|
||||
CIBW_BEFORE_ALL_MACOS: ./scripts/build/wheel_macos_before_all.sh
|
||||
CIBW_TEST_COMMAND: >-
|
||||
export PYTHONPATH={project} &&
|
||||
python -c "import tests; tests.unittest.main(defaultTest='tests.test_suite')"
|
||||
CIBW_ENVIRONMENT: >-
|
||||
PG_VERSION=16
|
||||
PACKAGE_NAME=psycopg2-binary
|
||||
PSYCOPG2_TESTDB=postgres
|
||||
PATH="/tmp/libpq.build/bin:$PATH"
|
||||
PACKAGE_NAME: psycopg2-binary
|
||||
PSYCOPG2_TESTDB: postgres
|
||||
PSYCOPG2_TEST_FAST: 1
|
||||
|
||||
- name: Upload artifacts
|
||||
uses: actions/upload-artifact@v4
|
||||
uses: actions/upload-artifact@v3
|
||||
with:
|
||||
name: macos-${{matrix.pyver}}-macos-${{matrix.arch}}
|
||||
path: ./wheelhouse/*.whl
|
||||
|
||||
# }}}
|
||||
|
||||
windows: # {{{
|
||||
runs-on: windows-latest
|
||||
if: true
|
||||
|
||||
strategy:
|
||||
fail-fast: false
|
||||
matrix:
|
||||
arch: [win_amd64]
|
||||
pyver: [cp38, cp39, cp310, cp311, cp312, cp313]
|
||||
package_name: [psycopg2, psycopg2-binary]
|
||||
|
||||
defaults:
|
||||
run:
|
||||
shell: bash
|
||||
|
||||
steps:
|
||||
# there are some other libpq in PATH
|
||||
- name: Drop spurious libpq in the path
|
||||
run: rm -rf c:/tools/php C:/Strawberry/c/bin
|
||||
|
||||
- name: Checkout repo
|
||||
uses: actions/checkout@v4
|
||||
|
||||
- name: Start PostgreSQL service for test
|
||||
run: |
|
||||
$PgSvc = Get-Service "postgresql*"
|
||||
Set-Service $PgSvc.Name -StartupType manual
|
||||
$PgSvc.Start()
|
||||
shell: powershell
|
||||
|
||||
- name: Export GitHub Actions cache environment variables
|
||||
uses: actions/github-script@v7
|
||||
with:
|
||||
script: |
|
||||
const path = require('path')
|
||||
core.exportVariable('ACTIONS_CACHE_URL', process.env.ACTIONS_CACHE_URL || '');
|
||||
core.exportVariable('ACTIONS_RUNTIME_TOKEN', process.env.ACTIONS_RUNTIME_TOKEN || '');
|
||||
core.addPath(path.join(process.env.VCPKG_INSTALLATION_ROOT, 'installed/x64-windows-release/lib'));
|
||||
core.addPath(path.join(process.env.VCPKG_INSTALLATION_ROOT, 'installed/x64-windows-release/bin'));
|
||||
|
||||
- name: Create the binary package source tree
|
||||
run: >-
|
||||
sed -i 's/^setup(name="psycopg2"/setup(name="${{matrix.package_name}}"/'
|
||||
setup.py
|
||||
if: ${{ matrix.package_name != 'psycopg2' }}
|
||||
|
||||
- name: Build wheels
|
||||
uses: pypa/cibuildwheel@v2.23.2
|
||||
env:
|
||||
VCPKG_BINARY_SOURCES: "clear;x-gha,readwrite" # cache vcpkg
|
||||
CIBW_BUILD: ${{matrix.pyver}}-${{matrix.arch}}
|
||||
CIBW_ARCHS_WINDOWS: AMD64 x86
|
||||
CIBW_BEFORE_BUILD_WINDOWS: '.\scripts\build\wheel_win32_before_build.bat'
|
||||
CIBW_REPAIR_WHEEL_COMMAND_WINDOWS: >-
|
||||
delvewheel repair -w {dest_dir}
|
||||
--no-mangle "libiconv-2.dll;libwinpthread-1.dll" {wheel}
|
||||
CIBW_TEST_COMMAND: >-
|
||||
set PYTHONPATH={project} &&
|
||||
python -c "import tests; tests.unittest.main(defaultTest='tests.test_suite')"
|
||||
# Note: no fast test because we don't run Windows tests
|
||||
CIBW_ENVIRONMENT_WINDOWS: >-
|
||||
PSYCOPG2_TESTDB=postgres
|
||||
PSYCOPG2_TESTDB_USER=postgres
|
||||
PSYCOPG2_TESTDB_HOST=localhost
|
||||
|
||||
- name: Upload artifacts
|
||||
uses: actions/upload-artifact@v4
|
||||
with:
|
||||
name: windows-${{ matrix.package_name }}-${{matrix.pyver}}-${{matrix.arch}}
|
||||
path: ./wheelhouse/*.whl
|
||||
|
||||
# }}}
|
||||
|
||||
merge: # {{{
|
||||
runs-on: ubuntu-latest
|
||||
needs:
|
||||
- sdist
|
||||
- linux
|
||||
- macos
|
||||
- windows
|
||||
steps:
|
||||
- name: Merge Artifacts
|
||||
uses: actions/upload-artifact/merge@v4
|
||||
with:
|
||||
name: psycopg2-artifacts
|
||||
delete-merged: true
|
||||
|
||||
# }}}
|
||||
name: packages_macos
|
||||
path: |
|
||||
dist/*/*${{ matrix.platform }}.whl
|
||||
|
|
|
|||
29
.github/workflows/tests.yml
vendored
29
.github/workflows/tests.yml
vendored
|
|
@ -1,35 +1,32 @@
|
|||
name: Tests
|
||||
|
||||
env:
|
||||
PIP_BREAK_SYSTEM_PACKAGES: "1"
|
||||
|
||||
on:
|
||||
push:
|
||||
pull_request:
|
||||
|
||||
jobs:
|
||||
linux:
|
||||
tests:
|
||||
name: Unit tests run
|
||||
runs-on: ubuntu-latest
|
||||
if: true
|
||||
|
||||
strategy:
|
||||
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.10", postgres: "14"}
|
||||
- {python: "3.11", postgres: "15"}
|
||||
- {python: "3.12", postgres: "16"}
|
||||
- {python: "3.13", postgres: "17"}
|
||||
|
||||
# Opposite extremes of the supported Py/PG range, other architecture
|
||||
- {python: "3.8", postgres: "17", architecture: "x86"}
|
||||
- {python: "3.9", postgres: "16", architecture: "x86"}
|
||||
- {python: "3.10", postgres: "15", architecture: "x86"}
|
||||
- {python: "3.11", postgres: "14", architecture: "x86"}
|
||||
- {python: "3.12", postgres: "13", architecture: "x86"}
|
||||
- {python: "3.13", postgres: "12", architecture: "x86"}
|
||||
- {python: "3.6", postgres: "15", architecture: "x86"}
|
||||
- {python: "3.7", postgres: "14", architecture: "x86"}
|
||||
- {python: "3.8", postgres: "13", architecture: "x86"}
|
||||
- {python: "3.9", postgres: "12", architecture: "x86"}
|
||||
- {python: "3.10", postgres: "11", architecture: "x86"}
|
||||
- {python: "3.11", postgres: "10", architecture: "x86"}
|
||||
|
||||
env:
|
||||
PSYCOPG2_TESTDB: postgres
|
||||
|
|
@ -52,7 +49,7 @@ jobs:
|
|||
--health-retries 5
|
||||
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
- uses: actions/checkout@v3
|
||||
|
||||
# Can enable to test an unreleased libpq version.
|
||||
- name: install libpq 16
|
||||
|
|
@ -68,8 +65,8 @@ jobs:
|
|||
sudo apt-get -qq -y install "libpq-dev=${pqver}" "libpq5=${pqver}"
|
||||
|
||||
- name: Install tox
|
||||
run: pip install "tox < 4"
|
||||
- uses: actions/setup-python@v5
|
||||
run: pip install tox
|
||||
- uses: actions/setup-python@v4
|
||||
with:
|
||||
python-version: ${{ matrix.python }}
|
||||
- name: Run tests
|
||||
|
|
|
|||
69
NEWS
69
NEWS
|
|
@ -1,54 +1,13 @@
|
|||
Current release
|
||||
---------------
|
||||
|
||||
What's new in psycopg 2.9.10
|
||||
^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
||||
|
||||
- Add support for Python 3.13.
|
||||
- Receive notifications on commit (:ticket:`#1728`).
|
||||
- `~psycopg2.errorcodes` map and `~psycopg2.errors` classes updated to
|
||||
PostgreSQL 17.
|
||||
- Drop support for Python 3.7.
|
||||
|
||||
|
||||
What's new in psycopg 2.9.9
|
||||
^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
||||
|
||||
- Add support for Python 3.12.
|
||||
- Drop support for Python 3.6.
|
||||
|
||||
|
||||
What's new in psycopg 2.9.8
|
||||
^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
||||
|
||||
- Wheel package bundled with PostgreSQL 16 libpq in order to add support for
|
||||
recent features, such as ``sslcertmode``.
|
||||
|
||||
|
||||
What's new in psycopg 2.9.7
|
||||
^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
||||
|
||||
- Fix propagation of exceptions raised during module initialization
|
||||
(:ticket:`#1598`).
|
||||
- Fix building when pg_config returns an empty string (:ticket:`#1599`).
|
||||
- Wheel package bundled with OpenSSL 1.1.1v.
|
||||
|
||||
|
||||
What's new in psycopg 2.9.6
|
||||
^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
||||
|
||||
- Package manylinux 2014 for aarch64 and ppc64le platforms, in order to
|
||||
include libpq 15 in the binary package (:ticket:`#1396`).
|
||||
- Wheel package bundled with OpenSSL 1.1.1t.
|
||||
|
||||
|
||||
What's new in psycopg 2.9.5
|
||||
^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
||||
|
||||
- Add support for Python 3.11.
|
||||
- Add support for rowcount in MERGE statements in binary packages
|
||||
(:ticket:`#1497`).
|
||||
- Wheel package bundled with OpenSSL 1.1.1r and PostgreSQL 15 libpq.
|
||||
- Wheel package compiled against OpenSSL 1.1.1r and PostgreSQL 15 libpq.
|
||||
|
||||
|
||||
What's new in psycopg 2.9.4
|
||||
|
|
@ -62,7 +21,7 @@ What's new in psycopg 2.9.4
|
|||
binary packages (:ticket:`#1365`).
|
||||
- `~psycopg2.errorcodes` map and `~psycopg2.errors` classes updated to
|
||||
PostgreSQL 15.
|
||||
- Wheel package bundled with OpenSSL 1.1.1q and PostgreSQL 14.4 libpq.
|
||||
- Wheel package compiled against OpenSSL 1.1.1q and PostgreSQL 14.4 libpq.
|
||||
|
||||
|
||||
What's new in psycopg 2.9.3
|
||||
|
|
@ -79,7 +38,7 @@ What's new in psycopg 2.9.2
|
|||
- `~psycopg2.errorcodes` map and `~psycopg2.errors` classes updated to
|
||||
PostgreSQL 14.
|
||||
- Add preliminary support for Python 3.11 (:tickets:`#1376, #1386`).
|
||||
- Wheel package bundled with OpenSSL 1.1.1l and PostgreSQL 14.1 libpq
|
||||
- Wheel package compiled against OpenSSL 1.1.1l and PostgreSQL 14.1 libpq
|
||||
(:ticket:`#1388`).
|
||||
|
||||
|
||||
|
|
@ -116,7 +75,7 @@ Other changes:
|
|||
platforms.
|
||||
- Provide :pep:`600` wheels packages (manylinux_2_24 tag) for aarch64 and
|
||||
ppc64le platforms.
|
||||
- Wheel package bundled with OpenSSL 1.1.1k and PostgreSQL 13.3 libpq.
|
||||
- Wheel package compiled against OpenSSL 1.1.1k and PostgreSQL 13.3 libpq.
|
||||
- Build system for Linux/MacOS binary packages moved to GitHub Actions.
|
||||
|
||||
|
||||
|
|
@ -140,7 +99,7 @@ What's new in psycopg 2.8.6
|
|||
- `~psycopg2.errorcodes` map and `~psycopg2.errors` classes updated to
|
||||
PostgreSQL 13.
|
||||
- Added wheel packages for ARM architecture (:ticket:`#1125`).
|
||||
- Wheel package bundled with OpenSSL 1.1.1g.
|
||||
- Wheel package compiled against OpenSSL 1.1.1g.
|
||||
|
||||
|
||||
What's new in psycopg 2.8.5
|
||||
|
|
@ -169,7 +128,7 @@ What's new in psycopg 2.8.4
|
|||
and `~psycopg2.extensions.Column.type_code` (:ticket:`#961`).
|
||||
- `~psycopg2.errorcodes` map and `~psycopg2.errors` classes updated to
|
||||
PostgreSQL 12.
|
||||
- Wheel package bundled with OpenSSL 1.1.1d and PostgreSQL at least 11.4.
|
||||
- Wheel package compiled against OpenSSL 1.1.1d and PostgreSQL at least 11.4.
|
||||
|
||||
|
||||
What's new in psycopg 2.8.3
|
||||
|
|
@ -258,7 +217,7 @@ Other changes:
|
|||
source files are now compatible with Python 2 & 3 as is.
|
||||
- The `!psycopg2.test` package is no longer installed by ``python setup.py
|
||||
install``.
|
||||
- Wheel package bundled with OpenSSL 1.0.2r and PostgreSQL 11.2 libpq.
|
||||
- Wheel package compiled against OpenSSL 1.0.2r and PostgreSQL 11.2 libpq.
|
||||
|
||||
|
||||
What's new in psycopg 2.7.7
|
||||
|
|
@ -266,14 +225,14 @@ What's new in psycopg 2.7.7
|
|||
|
||||
- Cleanup of the cursor results assignment code, which might have solved
|
||||
double free and inconsistencies in concurrent usage (:tickets:`#346, #384`).
|
||||
- Wheel package bundled with OpenSSL 1.0.2q.
|
||||
- Wheel package compiled against OpenSSL 1.0.2q.
|
||||
|
||||
|
||||
What's new in psycopg 2.7.6.1
|
||||
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
||||
|
||||
- Fixed binary package broken on OS X 10.12 (:ticket:`#807`).
|
||||
- Wheel package bundled with PostgreSQL 11.1 libpq.
|
||||
- Wheel package compiled against PostgreSQL 11.1 libpq.
|
||||
|
||||
|
||||
What's new in psycopg 2.7.6
|
||||
|
|
@ -290,7 +249,7 @@ What's new in psycopg 2.7.6
|
|||
- `~psycopg2.extras.execute_values()` accepts `~psycopg2.sql.Composable`
|
||||
objects (:ticket:`#794`).
|
||||
- `~psycopg2.errorcodes` map updated to PostgreSQL 11.
|
||||
- Wheel package bundled with PostgreSQL 10.5 libpq and OpenSSL 1.0.2p.
|
||||
- Wheel package compiled against PostgreSQL 10.5 libpq and OpenSSL 1.0.2p.
|
||||
|
||||
|
||||
What's new in psycopg 2.7.5
|
||||
|
|
@ -304,7 +263,7 @@ What's new in psycopg 2.7.5
|
|||
- Maybe fixed building on MSYS2 (as reported in :ticket:`#658`).
|
||||
- Allow string subclasses in connection and other places (:ticket:`#679`).
|
||||
- Don't raise an exception closing an unused named cursor (:ticket:`#716`).
|
||||
- Wheel package bundled with PostgreSQL 10.4 libpq and OpenSSL 1.0.2o.
|
||||
- Wheel package compiled against PostgreSQL 10.4 libpq and OpenSSL 1.0.2o.
|
||||
|
||||
|
||||
What's new in psycopg 2.7.4
|
||||
|
|
@ -326,7 +285,7 @@ What's new in psycopg 2.7.4
|
|||
- Fixed `~cursor.rowcount` after `~cursor.executemany()` with :sql:`RETURNING`
|
||||
statements (:ticket:`#633`).
|
||||
- Fixed compatibility problem with pypy3 (:ticket:`#649`).
|
||||
- Wheel packages bundled with PostgreSQL 10.1 libpq and OpenSSL 1.0.2n.
|
||||
- Wheel packages compiled against PostgreSQL 10.1 libpq and OpenSSL 1.0.2n.
|
||||
- Wheel packages for Python 2.6 no more available (support dropped from
|
||||
wheel building infrastructure).
|
||||
|
||||
|
|
@ -334,7 +293,7 @@ What's new in psycopg 2.7.4
|
|||
What's new in psycopg 2.7.3.2
|
||||
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
||||
|
||||
- Wheel package bundled with PostgreSQL 10.0 libpq and OpenSSL 1.0.2l
|
||||
- Wheel package compiled against PostgreSQL 10.0 libpq and OpenSSL 1.0.2l
|
||||
(:tickets:`#601, #602`).
|
||||
|
||||
|
||||
|
|
@ -407,7 +366,7 @@ New features:
|
|||
them together.
|
||||
- Added `~psycopg2.__libpq_version__` and
|
||||
`~psycopg2.extensions.libpq_version()` to inspect the version of the
|
||||
``libpq`` library the module was bundled with
|
||||
``libpq`` library the module was compiled/loaded with
|
||||
(:tickets:`#35, #323`).
|
||||
- The attributes `~connection.notices` and `~connection.notifies` can be
|
||||
customized replacing them with any object exposing an `!append()` method
|
||||
|
|
|
|||
21
README.rst
21
README.rst
|
|
@ -17,18 +17,6 @@ flexible objects adaptation system.
|
|||
|
||||
Psycopg 2 is both Unicode and Python 3 friendly.
|
||||
|
||||
.. Note::
|
||||
|
||||
The psycopg2 package is still widely used and actively maintained, but it
|
||||
is not expected to receive new features.
|
||||
|
||||
`Psycopg 3`__ is the evolution of psycopg2 and is where `new features are
|
||||
being developed`__: if you are starting a new project you should probably
|
||||
start from 3!
|
||||
|
||||
.. __: https://pypi.org/project/psycopg/
|
||||
.. __: https://www.psycopg.org/psycopg3/docs/index.html
|
||||
|
||||
|
||||
Documentation
|
||||
-------------
|
||||
|
|
@ -73,8 +61,13 @@ production it is advised to use the package built from sources.
|
|||
.. _install: https://www.psycopg.org/docs/install.html#install-from-source
|
||||
.. _faq: https://www.psycopg.org/docs/faq.html#faq-compile
|
||||
|
||||
:Build status: |gh-actions|
|
||||
:Linux/OSX: |gh-actions|
|
||||
:Windows: |appveyor|
|
||||
|
||||
.. |gh-actions| image:: https://github.com/psycopg/psycopg2/actions/workflows/tests.yml/badge.svg
|
||||
:target: https://github.com/psycopg/psycopg2/actions/workflows/tests.yml
|
||||
:alt: Build status
|
||||
:alt: Linux and OSX build status
|
||||
|
||||
.. |appveyor| image:: https://ci.appveyor.com/api/projects/status/github/psycopg/psycopg2?branch=master&svg=true
|
||||
:target: https://ci.appveyor.com/project/psycopg/psycopg2/branch/master
|
||||
:alt: Windows build status
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
GNU LESSER GENERAL PUBLIC LICENSE
|
||||
Version 3, 29 June 2007
|
||||
|
||||
Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
|
||||
Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
|
||||
Everyone is permitted to copy and distribute verbatim copies
|
||||
of this license document, but changing it is not allowed.
|
||||
|
||||
|
|
|
|||
|
|
@ -16,9 +16,10 @@ How to make a psycopg2 release
|
|||
$ export VERSION=2.8.4
|
||||
|
||||
- Push psycopg2 to master or to the maint branch. Make sure tests on `GitHub
|
||||
Actions`__.
|
||||
Actions`__ and AppVeyor__ pass.
|
||||
|
||||
.. __: https://github.com/psycopg/psycopg2/actions/workflows/tests.yml
|
||||
.. __: https://ci.appveyor.com/project/psycopg/psycopg2
|
||||
|
||||
- Create a signed tag with the content of the relevant NEWS bit and push it.
|
||||
E.g.::
|
||||
|
|
@ -40,10 +41,18 @@ How to make a psycopg2 release
|
|||
|
||||
- On GitHub Actions run manually a `package build workflow`__.
|
||||
|
||||
.. __: https://github.com/psycopg/psycopg2/actions/workflows/packages.yml
|
||||
- On Appveyor change the `build settings`__ and replace the custom
|
||||
configuration file name from ``.appveyor/tests.yml`` to
|
||||
``.appveyor/packages.yml`` (yeah, that sucks a bit. Remember to put it
|
||||
back to testing).
|
||||
|
||||
- When the workflows have finished download the packages from the job
|
||||
artifacts.
|
||||
.. __: https://github.com/psycopg/psycopg2/actions/workflows/packages.yml
|
||||
.. __: https://ci.appveyor.com/project/psycopg/psycopg2/settings
|
||||
|
||||
- When the workflows have finished download the packages using the
|
||||
``download_packages_{github|appveyor}.py`` scripts from the
|
||||
``scripts/build`` directory. They will be saved in a
|
||||
``wheelhouse/psycopg2-${VERSION}`` directory.
|
||||
|
||||
- Only for stable packages: upload the signed packages on PyPI::
|
||||
|
||||
|
|
|
|||
|
|
@ -1,44 +1,50 @@
|
|||
#
|
||||
# This file is autogenerated by pip-compile with Python 3.10
|
||||
# by the following command:
|
||||
# This file is autogenerated by pip-compile with python 3.8
|
||||
# To update, run:
|
||||
#
|
||||
# pip-compile requirements.in
|
||||
#
|
||||
alabaster==0.7.13
|
||||
alabaster==0.7.12
|
||||
# via sphinx
|
||||
babel==2.12.1
|
||||
babel==2.9.1
|
||||
# via sphinx
|
||||
certifi>=2023.7.22
|
||||
certifi==2021.10.8
|
||||
# via requests
|
||||
charset-normalizer==3.1.0
|
||||
charset-normalizer==2.0.12
|
||||
# via requests
|
||||
docutils==0.19
|
||||
docutils==0.17.1
|
||||
# via sphinx
|
||||
idna==3.4
|
||||
idna==3.3
|
||||
# via requests
|
||||
imagesize==1.4.1
|
||||
imagesize==1.3.0
|
||||
# via sphinx
|
||||
jinja2==3.1.2
|
||||
importlib-metadata==4.11.3
|
||||
# via sphinx
|
||||
markupsafe==2.1.2
|
||||
jinja2==3.1.1
|
||||
# via sphinx
|
||||
markupsafe==2.1.1
|
||||
# via jinja2
|
||||
packaging==23.1
|
||||
packaging==21.3
|
||||
# via sphinx
|
||||
pygments==2.15.0
|
||||
pygments==2.11.2
|
||||
# via sphinx
|
||||
requests==2.31.0
|
||||
pyparsing==3.0.7
|
||||
# via packaging
|
||||
pytz==2022.1
|
||||
# via babel
|
||||
requests==2.27.1
|
||||
# via sphinx
|
||||
snowballstemmer==2.2.0
|
||||
# via sphinx
|
||||
sphinx==6.1.3
|
||||
sphinx==4.4.0
|
||||
# via -r requirements.in
|
||||
sphinx-better-theme==0.1.5
|
||||
# via -r requirements.in
|
||||
sphinxcontrib-applehelp==1.0.4
|
||||
sphinxcontrib-applehelp==1.0.2
|
||||
# via sphinx
|
||||
sphinxcontrib-devhelp==1.0.2
|
||||
# via sphinx
|
||||
sphinxcontrib-htmlhelp==2.0.1
|
||||
sphinxcontrib-htmlhelp==2.0.0
|
||||
# via sphinx
|
||||
sphinxcontrib-jsmath==1.0.1
|
||||
# via sphinx
|
||||
|
|
@ -46,5 +52,7 @@ sphinxcontrib-qthelp==1.0.3
|
|||
# via sphinx
|
||||
sphinxcontrib-serializinghtml==1.1.5
|
||||
# via sphinx
|
||||
urllib3==1.26.17
|
||||
urllib3==1.26.9
|
||||
# via requests
|
||||
zipp==3.7.0
|
||||
# via importlib-metadata
|
||||
|
|
|
|||
|
|
@ -226,7 +226,7 @@ read:
|
|||
|
||||
>>> cur.execute("SELECT '(10.2,20.3)'::point")
|
||||
>>> point = cur.fetchone()[0]
|
||||
>>> print(type(point), point.x, point.y)
|
||||
>>> print type(point), point.x, point.y
|
||||
<class 'Point'> 10.2 20.3
|
||||
|
||||
A typecaster created by `!new_type()` can be also used with
|
||||
|
|
@ -284,15 +284,15 @@ something to read::
|
|||
curs = conn.cursor()
|
||||
curs.execute("LISTEN test;")
|
||||
|
||||
print("Waiting for notifications on channel 'test'")
|
||||
print "Waiting for notifications on channel 'test'"
|
||||
while True:
|
||||
if select.select([conn],[],[],5) == ([],[],[]):
|
||||
print("Timeout")
|
||||
print "Timeout"
|
||||
else:
|
||||
conn.poll()
|
||||
while conn.notifies:
|
||||
notify = conn.notifies.pop(0)
|
||||
print("Got NOTIFY:", notify.pid, notify.channel, notify.payload)
|
||||
print "Got NOTIFY:", notify.pid, notify.channel, notify.payload
|
||||
|
||||
Running the script and executing a command such as :sql:`NOTIFY test, 'hello'`
|
||||
in a separate :program:`psql` shell, the output may look similar to:
|
||||
|
|
|
|||
|
|
@ -255,7 +255,6 @@ latex_documents = [
|
|||
# If false, no module index is generated.
|
||||
# latex_use_modindex = True
|
||||
|
||||
toc_object_entries = False
|
||||
|
||||
doctest_global_setup = """
|
||||
|
||||
|
|
|
|||
|
|
@ -292,7 +292,7 @@ The ``cursor`` class
|
|||
|
||||
>>> cur.execute("SELECT * FROM test;")
|
||||
>>> for record in cur:
|
||||
... print(record)
|
||||
... print record
|
||||
...
|
||||
(1, 100, "abc'def")
|
||||
(2, None, 'dada')
|
||||
|
|
|
|||
|
|
@ -18,8 +18,6 @@
|
|||
|
||||
.. versionchanged:: 2.9.4 added errors introduced in PostgreSQL 15
|
||||
|
||||
.. versionchanged:: 2.9.10 added errors introduced in PostgreSQL 17
|
||||
|
||||
This module exposes the classes psycopg raises upon receiving an error from
|
||||
the database with a :sql:`SQLSTATE` value attached (available in the
|
||||
`~psycopg2.Error.pgcode` attribute). The content of the module is generated
|
||||
|
|
|
|||
|
|
@ -131,8 +131,8 @@ The current `!psycopg2` implementation supports:
|
|||
..
|
||||
NOTE: keep consistent with setup.py and the /features/ page.
|
||||
|
||||
- Python versions from 3.8 to 3.13
|
||||
- PostgreSQL server versions from 7.4 to 17
|
||||
- Python versions from 3.6 to 3.11
|
||||
- PostgreSQL server versions from 7.4 to 15
|
||||
- PostgreSQL client library version from 9.1
|
||||
|
||||
.. note::
|
||||
|
|
|
|||
|
|
@ -168,7 +168,7 @@ available through the following exceptions:
|
|||
|
||||
>>> e.pgcode
|
||||
'42P01'
|
||||
>>> print(e.pgerror)
|
||||
>>> print e.pgerror
|
||||
ERROR: relation "barf" does not exist
|
||||
LINE 1: SELECT * FROM barf
|
||||
^
|
||||
|
|
@ -184,7 +184,7 @@ available through the following exceptions:
|
|||
|
||||
>>> try:
|
||||
... cur.execute("SELECT * FROM barf")
|
||||
... except psycopg2.Error as e:
|
||||
... except psycopg2.Error, e:
|
||||
... pass
|
||||
|
||||
>>> e.diag.severity
|
||||
|
|
|
|||
|
|
@ -407,7 +407,7 @@ defined on the database connection (the `PostgreSQL encoding`__, available in
|
|||
`connection.encoding`, is translated into a `Python encoding`__ using the
|
||||
`~psycopg2.extensions.encodings` mapping)::
|
||||
|
||||
>>> print(u, type(u))
|
||||
>>> print u, type(u)
|
||||
àèìòù€ <type 'unicode'>
|
||||
|
||||
>>> cur.execute("INSERT INTO test (num, data) VALUES (%s,%s);", (74, u))
|
||||
|
|
@ -418,19 +418,19 @@ defined on the database connection (the `PostgreSQL encoding`__, available in
|
|||
When reading data from the database, in Python 2 the strings returned are
|
||||
usually 8 bit `!str` objects encoded in the database client encoding::
|
||||
|
||||
>>> print(conn.encoding)
|
||||
>>> print conn.encoding
|
||||
UTF8
|
||||
|
||||
>>> cur.execute("SELECT data FROM test WHERE num = 74")
|
||||
>>> x = cur.fetchone()[0]
|
||||
>>> print(x, type(x), repr(x))
|
||||
>>> print x, type(x), repr(x)
|
||||
àèìòù€ <type 'str'> '\xc3\xa0\xc3\xa8\xc3\xac\xc3\xb2\xc3\xb9\xe2\x82\xac'
|
||||
|
||||
>>> conn.set_client_encoding('LATIN9')
|
||||
|
||||
>>> cur.execute("SELECT data FROM test WHERE num = 74")
|
||||
>>> x = cur.fetchone()[0]
|
||||
>>> print(type(x), repr(x))
|
||||
>>> print type(x), repr(x)
|
||||
<type 'str'> '\xe0\xe8\xec\xf2\xf9\xa4'
|
||||
|
||||
In Python 3 instead the strings are automatically *decoded* in the connection
|
||||
|
|
@ -442,7 +442,7 @@ In Python 2 you must register a :ref:`typecaster
|
|||
|
||||
>>> cur.execute("SELECT data FROM test WHERE num = 74")
|
||||
>>> x = cur.fetchone()[0]
|
||||
>>> print(x, type(x), repr(x))
|
||||
>>> print x, type(x), repr(x)
|
||||
àèìòù€ <type 'unicode'> u'\xe0\xe8\xec\xf2\xf9\u20ac'
|
||||
|
||||
In the above example, the `~psycopg2.extensions.UNICODE` typecaster is
|
||||
|
|
@ -814,7 +814,7 @@ is rolled back.
|
|||
When a cursor exits the ``with`` block it is closed, releasing any resource
|
||||
eventually associated with it. The state of the transaction is not affected.
|
||||
|
||||
A connection can be used in more than one ``with`` statement
|
||||
A connection can be used in more than a ``with`` statement
|
||||
and each ``with`` block is effectively wrapped in a separate transaction::
|
||||
|
||||
conn = psycopg2.connect(DSN)
|
||||
|
|
@ -860,7 +860,7 @@ Server side cursors
|
|||
|
||||
When a database query is executed, the Psycopg `cursor` usually fetches
|
||||
all the records returned by the backend, transferring them to the client
|
||||
process. If the query returns a huge amount of data, a proportionally large
|
||||
process. If the query returned an huge amount of data, a proportionally large
|
||||
amount of memory will be allocated by the client.
|
||||
|
||||
If the dataset is too large to be practically handled on the client side, it is
|
||||
|
|
@ -1053,7 +1053,7 @@ using the |lo_import|_ and |lo_export|_ libpq functions.
|
|||
|
||||
If Psycopg was built with 64 bits large objects support (i.e. the first
|
||||
two conditions above are verified), the `psycopg2.__version__` constant
|
||||
will contain the ``lo64`` flag. If any of the condition is not met
|
||||
will contain the ``lo64`` flag. If any of the contition is not met
|
||||
several `!lobject` methods will fail if the arguments exceed 2GB.
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -256,7 +256,6 @@ HELD_CURSOR_REQUIRES_SAME_ISOLATION_LEVEL = '25008'
|
|||
NO_ACTIVE_SQL_TRANSACTION = '25P01'
|
||||
IN_FAILED_SQL_TRANSACTION = '25P02'
|
||||
IDLE_IN_TRANSACTION_SESSION_TIMEOUT = '25P03'
|
||||
TRANSACTION_TIMEOUT = '25P04'
|
||||
|
||||
# Class 26 - Invalid SQL Statement Name
|
||||
INVALID_SQL_STATEMENT_NAME = '26000'
|
||||
|
|
|
|||
|
|
@ -1344,11 +1344,6 @@ conn_set_session(connectionObject *self, int autocommit,
|
|||
}
|
||||
}
|
||||
|
||||
Py_BLOCK_THREADS;
|
||||
conn_notifies_process(self);
|
||||
conn_notice_process(self);
|
||||
Py_UNBLOCK_THREADS;
|
||||
|
||||
if (autocommit != SRV_STATE_UNCHANGED) {
|
||||
self->autocommit = autocommit;
|
||||
}
|
||||
|
|
@ -1413,11 +1408,6 @@ conn_set_client_encoding(connectionObject *self, const char *pgenc)
|
|||
goto endlock;
|
||||
}
|
||||
|
||||
Py_BLOCK_THREADS;
|
||||
conn_notifies_process(self);
|
||||
conn_notice_process(self);
|
||||
Py_UNBLOCK_THREADS;
|
||||
|
||||
endlock:
|
||||
pthread_mutex_unlock(&self->lock);
|
||||
Py_END_ALLOW_THREADS;
|
||||
|
|
|
|||
|
|
@ -64,7 +64,7 @@ psyco_lobj_close(lobjectObject *self, PyObject *args)
|
|||
/* write method - write data to the lobject */
|
||||
|
||||
#define psyco_lobj_write_doc \
|
||||
"write(str | bytes) -- Write a string or bytes to the large object."
|
||||
"write(str) -- Write a string to the large object."
|
||||
|
||||
static PyObject *
|
||||
psyco_lobj_write(lobjectObject *self, PyObject *args)
|
||||
|
|
|
|||
|
|
@ -412,7 +412,6 @@ pq_commit(connectionObject *conn)
|
|||
}
|
||||
|
||||
Py_BLOCK_THREADS;
|
||||
conn_notifies_process(conn);
|
||||
conn_notice_process(conn);
|
||||
Py_UNBLOCK_THREADS;
|
||||
|
||||
|
|
@ -469,7 +468,6 @@ pq_abort(connectionObject *conn)
|
|||
retvalue = pq_abort_locked(conn, &_save);
|
||||
|
||||
Py_BLOCK_THREADS;
|
||||
conn_notifies_process(conn);
|
||||
conn_notice_process(conn);
|
||||
Py_UNBLOCK_THREADS;
|
||||
|
||||
|
|
@ -540,7 +538,6 @@ pq_reset(connectionObject *conn)
|
|||
|
||||
Py_BLOCK_THREADS;
|
||||
conn_notice_process(conn);
|
||||
conn_notifies_process(conn);
|
||||
Py_UNBLOCK_THREADS;
|
||||
|
||||
pthread_mutex_unlock(&conn->lock);
|
||||
|
|
|
|||
|
|
@ -27,7 +27,6 @@
|
|||
#ifndef PSYCOPG_H
|
||||
#define PSYCOPG_H 1
|
||||
|
||||
#include <pg_config.h>
|
||||
#if PG_VERSION_NUM < 90100
|
||||
#error "Psycopg requires PostgreSQL client library (libpq) >= 9.1"
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -1001,35 +1001,32 @@ INIT_MODULE(_psycopg)(void)
|
|||
|
||||
/* initialize types and objects not exposed to the module */
|
||||
Py_SET_TYPE(&typecastType, &PyType_Type);
|
||||
if (0 > PyType_Ready(&typecastType)) { goto error; }
|
||||
if (0 > PyType_Ready(&typecastType)) { goto exit; }
|
||||
|
||||
Py_SET_TYPE(&chunkType, &PyType_Type);
|
||||
if (0 > PyType_Ready(&chunkType)) { goto error; }
|
||||
if (0 > PyType_Ready(&chunkType)) { goto exit; }
|
||||
|
||||
Py_SET_TYPE(&errorType, &PyType_Type);
|
||||
errorType.tp_base = (PyTypeObject *)PyExc_StandardError;
|
||||
if (0 > PyType_Ready(&errorType)) { goto error; }
|
||||
if (0 > PyType_Ready(&errorType)) { goto exit; }
|
||||
|
||||
if (!(psyco_null = Bytes_FromString("NULL"))) { goto error; }
|
||||
if (!(psyco_null = Bytes_FromString("NULL"))) { goto exit; }
|
||||
|
||||
/* initialize the module */
|
||||
module = PyModule_Create(&psycopgmodule);
|
||||
if (!module) { goto error; }
|
||||
if (!module) { goto exit; }
|
||||
|
||||
if (0 > add_module_constants(module)) { goto error; }
|
||||
if (0 > add_module_types(module)) { goto error; }
|
||||
if (0 > datetime_init()) { goto error; }
|
||||
if (0 > encodings_init(module)) { goto error; }
|
||||
if (0 > typecast_init(module)) { goto error; }
|
||||
if (0 > adapters_init(module)) { goto error; }
|
||||
if (0 > basic_errors_init(module)) { goto error; }
|
||||
if (0 > sqlstate_errors_init(module)) { goto error; }
|
||||
if (0 > add_module_constants(module)) { goto exit; }
|
||||
if (0 > add_module_types(module)) { goto exit; }
|
||||
if (0 > datetime_init()) { goto exit; }
|
||||
if (0 > encodings_init(module)) { goto exit; }
|
||||
if (0 > typecast_init(module)) { goto exit; }
|
||||
if (0 > adapters_init(module)) { goto exit; }
|
||||
if (0 > basic_errors_init(module)) { goto exit; }
|
||||
if (0 > sqlstate_errors_init(module)) { goto exit; }
|
||||
|
||||
Dprintf("psycopgmodule: module initialization complete");
|
||||
return module;
|
||||
|
||||
error:
|
||||
if (module)
|
||||
Py_DECREF(module);
|
||||
return NULL;
|
||||
exit:
|
||||
return module;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -27,8 +27,8 @@
|
|||
#ifndef PSYCOPG_PYTHON_H
|
||||
#define PSYCOPG_PYTHON_H 1
|
||||
|
||||
#if PY_VERSION_HEX < 0x03080000
|
||||
#error "psycopg requires Python 3.8"
|
||||
#if PY_VERSION_HEX < 0x03060000
|
||||
#error "psycopg requires Python 3.6"
|
||||
#endif
|
||||
|
||||
#include <structmember.h>
|
||||
|
|
|
|||
|
|
@ -144,7 +144,6 @@
|
|||
{"25P01", "NoActiveSqlTransaction"},
|
||||
{"25P02", "InFailedSqlTransaction"},
|
||||
{"25P03", "IdleInTransactionSessionTimeout"},
|
||||
{"25P04", "TransactionTimeout"},
|
||||
|
||||
/* Class 26 - Invalid SQL Statement Name */
|
||||
{"26000", "InvalidSqlStatementName"},
|
||||
|
|
|
|||
|
|
@ -103,8 +103,18 @@ _parse_inftz(const char *str, PyObject *curs)
|
|||
goto exit;
|
||||
}
|
||||
|
||||
#if defined(PYPY_VERSION) || PY_VERSION_HEX < 0x03070000
|
||||
{
|
||||
PyObject *tzoff;
|
||||
if (!(tzoff = PyDelta_FromDSU(0, 0, 0))) { goto exit; }
|
||||
tzinfo = PyObject_CallFunctionObjArgs(tzinfo_factory, tzoff, NULL);
|
||||
Py_DECREF(tzoff);
|
||||
if (!tzinfo) { goto exit; }
|
||||
}
|
||||
#else
|
||||
tzinfo = PyDateTime_TimeZone_UTC;
|
||||
Py_INCREF(tzinfo);
|
||||
#endif
|
||||
|
||||
/* m.replace(tzinfo=tzinfo) */
|
||||
if (!(args = PyTuple_New(0))) { goto exit; }
|
||||
|
|
@ -168,6 +178,11 @@ _parse_noninftz(const char *str, Py_ssize_t len, PyObject *curs)
|
|||
appropriate tzinfo object calling the factory */
|
||||
Dprintf("typecast_PYDATETIMETZ_cast: UTC offset = %ds", tzsec);
|
||||
|
||||
#if PY_VERSION_HEX < 0x03070000
|
||||
/* Before Python 3.7 the timezone offset had to be a whole number
|
||||
* of minutes, so round the seconds to the closest minute */
|
||||
tzsec = 60 * (int)round(tzsec / 60.0);
|
||||
#endif
|
||||
if (!(tzoff = PyDelta_FromDSU(0, tzsec, 0))) { goto exit; }
|
||||
if (!(tzinfo = PyObject_CallFunctionObjArgs(
|
||||
tzinfo_factory, tzoff, NULL))) {
|
||||
|
|
@ -255,6 +270,11 @@ typecast_PYTIME_cast(const char *str, Py_ssize_t len, PyObject *curs)
|
|||
appropriate tzinfo object calling the factory */
|
||||
Dprintf("typecast_PYTIME_cast: UTC offset = %ds", tzsec);
|
||||
|
||||
#if PY_VERSION_HEX < 0x03070000
|
||||
/* Before Python 3.7 the timezone offset had to be a whole number
|
||||
* of minutes, so round the seconds to the closest minute */
|
||||
tzsec = 60 * (int)round(tzsec / 60.0);
|
||||
#endif
|
||||
if (!(tzoff = PyDelta_FromDSU(0, tzsec, 0))) { goto exit; }
|
||||
if (!(tzinfo = PyObject_CallFunctionObjArgs(tzinfo_factory, tzoff, NULL))) {
|
||||
goto exit;
|
||||
|
|
|
|||
|
|
@ -392,10 +392,7 @@ psyco_set_error(PyObject *exc, cursorObject *curs, const char *msg)
|
|||
static int
|
||||
psyco_is_main_interp(void)
|
||||
{
|
||||
#if PY_VERSION_HEX >= 0x030d0000
|
||||
/* tested with Python 3.13.0a6 */
|
||||
return PyInterpreterState_Get() == PyInterpreterState_Main();
|
||||
#elif PY_VERSION_HEX >= 0x03080000
|
||||
#if PY_VERSION_HEX >= 0x03080000
|
||||
/* tested with Python 3.8.0a2 */
|
||||
return _PyInterpreterState_Get() == PyInterpreterState_Main();
|
||||
#else
|
||||
|
|
|
|||
845
scripts/build/appveyor.py
Executable file
845
scripts/build/appveyor.py
Executable file
|
|
@ -0,0 +1,845 @@
|
|||
#!/usr/bin/env python3
|
||||
"""
|
||||
Build steps for the windows binary packages.
|
||||
|
||||
The script is designed to be called by appveyor. Subcommands map the steps in
|
||||
'appveyor.yml'.
|
||||
|
||||
"""
|
||||
|
||||
import re
|
||||
import os
|
||||
import sys
|
||||
import json
|
||||
import shutil
|
||||
import logging
|
||||
import subprocess as sp
|
||||
from glob import glob
|
||||
from pathlib import Path
|
||||
from zipfile import ZipFile
|
||||
from argparse import ArgumentParser
|
||||
from tempfile import NamedTemporaryFile
|
||||
from urllib.request import urlopen
|
||||
|
||||
opt = None
|
||||
STEP_PREFIX = 'step_'
|
||||
|
||||
logger = logging.getLogger()
|
||||
logging.basicConfig(
|
||||
level=logging.INFO, format='%(asctime)s %(levelname)s %(message)s'
|
||||
)
|
||||
|
||||
|
||||
def main():
|
||||
global opt
|
||||
opt = parse_cmdline()
|
||||
logger.setLevel(opt.loglevel)
|
||||
|
||||
cmd = globals()[STEP_PREFIX + opt.step]
|
||||
cmd()
|
||||
|
||||
|
||||
def setup_build_env():
|
||||
"""
|
||||
Set the environment variables according to the build environment
|
||||
"""
|
||||
setenv('VS_VER', opt.vs_ver)
|
||||
|
||||
path = [
|
||||
str(opt.py_dir),
|
||||
str(opt.py_dir / 'Scripts'),
|
||||
r'C:\Strawberry\Perl\bin',
|
||||
r'C:\Program Files\Git\mingw64\bin',
|
||||
str(opt.ssl_build_dir / 'bin'),
|
||||
os.environ['PATH'],
|
||||
]
|
||||
setenv('PATH', os.pathsep.join(path))
|
||||
|
||||
logger.info("Configuring compiler")
|
||||
bat_call([opt.vc_dir / "vcvarsall.bat", 'x86' if opt.arch_32 else 'amd64'])
|
||||
|
||||
|
||||
def python_info():
|
||||
logger.info("Python Information")
|
||||
run_python(['--version'], stderr=sp.STDOUT)
|
||||
run_python(
|
||||
['-c', "import sys; print('64bit: %s' % (sys.maxsize > 2**32))"]
|
||||
)
|
||||
|
||||
|
||||
def step_install():
|
||||
python_info()
|
||||
configure_sdk()
|
||||
configure_postgres()
|
||||
|
||||
if opt.is_wheel:
|
||||
install_wheel_support()
|
||||
|
||||
|
||||
def install_wheel_support():
|
||||
"""
|
||||
Install an up-to-date pip wheel package to build wheels.
|
||||
"""
|
||||
run_python("-m pip install --upgrade pip".split())
|
||||
run_python("-m pip install wheel".split())
|
||||
|
||||
|
||||
def configure_sdk():
|
||||
# The program rc.exe on 64bit with some versions look in the wrong path
|
||||
# location when building postgresql. This cheats by copying the x64 bit
|
||||
# files to that location.
|
||||
if opt.arch_64:
|
||||
for fn in glob(
|
||||
r'C:\Program Files\Microsoft SDKs\Windows\v7.0\Bin\x64\rc*'
|
||||
):
|
||||
copy_file(
|
||||
fn, r"C:\Program Files (x86)\Microsoft SDKs\Windows\v7.0A\Bin"
|
||||
)
|
||||
|
||||
|
||||
def configure_postgres():
|
||||
"""
|
||||
Set up PostgreSQL config before the service starts.
|
||||
"""
|
||||
logger.info("Configuring Postgres")
|
||||
with (opt.pg_data_dir / 'postgresql.conf').open('a') as f:
|
||||
# allow > 1 prepared transactions for test cases
|
||||
print("max_prepared_transactions = 10", file=f)
|
||||
print("ssl = on", file=f)
|
||||
|
||||
# Create openssl certificate to allow ssl connection
|
||||
cwd = os.getcwd()
|
||||
os.chdir(opt.pg_data_dir)
|
||||
run_openssl(
|
||||
'req -new -x509 -days 365 -nodes -text '
|
||||
'-out server.crt -keyout server.key -subj /CN=initd.org'.split()
|
||||
)
|
||||
run_openssl(
|
||||
'req -new -nodes -text -out root.csr -keyout root.key '
|
||||
'-subj /CN=initd.org'.split()
|
||||
)
|
||||
|
||||
run_openssl(
|
||||
'x509 -req -in root.csr -text -days 3650 -extensions v3_ca '
|
||||
'-signkey root.key -out root.crt'.split()
|
||||
)
|
||||
|
||||
run_openssl(
|
||||
'req -new -nodes -text -out server.csr -keyout server.key '
|
||||
'-subj /CN=initd.org'.split()
|
||||
)
|
||||
|
||||
run_openssl(
|
||||
'x509 -req -in server.csr -text -days 365 -CA root.crt '
|
||||
'-CAkey root.key -CAcreateserial -out server.crt'.split()
|
||||
)
|
||||
|
||||
os.chdir(cwd)
|
||||
|
||||
|
||||
def run_openssl(args):
|
||||
"""Run the appveyor-installed openssl with some args."""
|
||||
# https://www.appveyor.com/docs/windows-images-software/
|
||||
openssl = Path(r"C:\OpenSSL-v111-Win64") / 'bin' / 'openssl'
|
||||
return run_command([openssl] + args)
|
||||
|
||||
|
||||
def step_build_script():
|
||||
setup_build_env()
|
||||
build_openssl()
|
||||
build_libpq()
|
||||
build_psycopg()
|
||||
|
||||
if opt.is_wheel:
|
||||
build_binary_packages()
|
||||
|
||||
|
||||
def build_openssl():
|
||||
top = opt.ssl_build_dir
|
||||
if (top / 'lib' / 'libssl.lib').exists():
|
||||
return
|
||||
|
||||
logger.info("Building OpenSSL")
|
||||
|
||||
# Setup directories for building OpenSSL libraries
|
||||
ensure_dir(top / 'include' / 'openssl')
|
||||
ensure_dir(top / 'lib')
|
||||
|
||||
# Setup OpenSSL Environment Variables based on processor architecture
|
||||
if opt.arch_32:
|
||||
target = 'VC-WIN32'
|
||||
setenv('VCVARS_PLATFORM', 'x86')
|
||||
else:
|
||||
target = 'VC-WIN64A'
|
||||
setenv('VCVARS_PLATFORM', 'amd64')
|
||||
setenv('CPU', 'AMD64')
|
||||
|
||||
ver = os.environ['OPENSSL_VERSION']
|
||||
|
||||
# Download OpenSSL source
|
||||
zipname = f'OpenSSL_{ver}.zip'
|
||||
zipfile = opt.cache_dir / zipname
|
||||
if not zipfile.exists():
|
||||
download(
|
||||
f"https://github.com/openssl/openssl/archive/{zipname}", zipfile
|
||||
)
|
||||
|
||||
with ZipFile(zipfile) as z:
|
||||
z.extractall(path=opt.build_dir)
|
||||
|
||||
sslbuild = opt.build_dir / f"openssl-OpenSSL_{ver}"
|
||||
os.chdir(sslbuild)
|
||||
run_command(
|
||||
['perl', 'Configure', target, 'no-asm']
|
||||
+ ['no-shared', 'no-zlib', f'--prefix={top}', f'--openssldir={top}']
|
||||
)
|
||||
|
||||
run_command("nmake build_libs install_sw".split())
|
||||
|
||||
assert (top / 'lib' / 'libssl.lib').exists()
|
||||
|
||||
os.chdir(opt.clone_dir)
|
||||
shutil.rmtree(sslbuild)
|
||||
|
||||
|
||||
def build_libpq():
|
||||
top = opt.pg_build_dir
|
||||
if (top / 'lib' / 'libpq.lib').exists():
|
||||
return
|
||||
|
||||
logger.info("Building libpq")
|
||||
|
||||
# Setup directories for building PostgreSQL librarires
|
||||
ensure_dir(top / 'include')
|
||||
ensure_dir(top / 'lib')
|
||||
ensure_dir(top / 'bin')
|
||||
|
||||
ver = os.environ['POSTGRES_VERSION']
|
||||
|
||||
# Download PostgreSQL source
|
||||
zipname = f'postgres-REL_{ver}.zip'
|
||||
zipfile = opt.cache_dir / zipname
|
||||
if not zipfile.exists():
|
||||
download(
|
||||
f"https://github.com/postgres/postgres/archive/REL_{ver}.zip",
|
||||
zipfile,
|
||||
)
|
||||
|
||||
with ZipFile(zipfile) as z:
|
||||
z.extractall(path=opt.build_dir)
|
||||
|
||||
pgbuild = opt.build_dir / f"postgres-REL_{ver}"
|
||||
os.chdir(pgbuild)
|
||||
|
||||
# Setup build config file (config.pl)
|
||||
os.chdir("src/tools/msvc")
|
||||
with open("config.pl", 'w') as f:
|
||||
print(
|
||||
"""\
|
||||
$config->{ldap} = 0;
|
||||
$config->{openssl} = "%s";
|
||||
|
||||
1;
|
||||
"""
|
||||
% str(opt.ssl_build_dir).replace('\\', '\\\\'),
|
||||
file=f,
|
||||
)
|
||||
|
||||
# Hack the Mkvcbuild.pm file so we build the lib version of libpq
|
||||
file_replace('Mkvcbuild.pm', "'libpq', 'dll'", "'libpq', 'lib'")
|
||||
|
||||
# Build libpgport, libpgcommon, libpq
|
||||
run_command([which("build"), "libpgport"])
|
||||
run_command([which("build"), "libpgcommon"])
|
||||
run_command([which("build"), "libpq"])
|
||||
|
||||
# Install includes
|
||||
with (pgbuild / "src/backend/parser/gram.h").open("w") as f:
|
||||
print("", file=f)
|
||||
|
||||
# Copy over built libraries
|
||||
file_replace("Install.pm", "qw(Install)", "qw(Install CopyIncludeFiles)")
|
||||
run_command(
|
||||
["perl", "-MInstall=CopyIncludeFiles", "-e"]
|
||||
+ [f"chdir('../../..'); CopyIncludeFiles('{top}')"]
|
||||
)
|
||||
|
||||
for lib in ('libpgport', 'libpgcommon', 'libpq'):
|
||||
copy_file(pgbuild / f'Release/{lib}/{lib}.lib', top / 'lib')
|
||||
|
||||
# Prepare local include directory for building from
|
||||
for dir in ('win32', 'win32_msvc'):
|
||||
merge_dir(pgbuild / f"src/include/port/{dir}", pgbuild / "src/include")
|
||||
|
||||
# Build pg_config in place
|
||||
os.chdir(pgbuild / 'src/bin/pg_config')
|
||||
run_command(
|
||||
['cl', 'pg_config.c', '/MT', '/nologo', fr'/I{pgbuild}\src\include']
|
||||
+ ['/link', fr'/LIBPATH:{top}\lib']
|
||||
+ ['libpgcommon.lib', 'libpgport.lib', 'advapi32.lib']
|
||||
+ ['/NODEFAULTLIB:libcmt.lib']
|
||||
+ [fr'/OUT:{top}\bin\pg_config.exe']
|
||||
)
|
||||
|
||||
assert (top / 'lib' / 'libpq.lib').exists()
|
||||
assert (top / 'bin' / 'pg_config.exe').exists()
|
||||
|
||||
os.chdir(opt.clone_dir)
|
||||
shutil.rmtree(pgbuild)
|
||||
|
||||
|
||||
def build_psycopg():
|
||||
os.chdir(opt.package_dir)
|
||||
patch_package_name()
|
||||
add_pg_config_path()
|
||||
run_python(
|
||||
["setup.py", "build_ext", "--have-ssl"]
|
||||
+ ["-l", "libpgcommon libpgport"]
|
||||
+ ["-L", opt.ssl_build_dir / 'lib']
|
||||
+ ['-I', opt.ssl_build_dir / 'include']
|
||||
)
|
||||
run_python(["setup.py", "build_py"])
|
||||
|
||||
|
||||
def patch_package_name():
|
||||
"""Change the psycopg2 package name in the setup.py if required."""
|
||||
if opt.package_name == 'psycopg2':
|
||||
return
|
||||
|
||||
logger.info("changing package name to %s", opt.package_name)
|
||||
|
||||
with (opt.package_dir / 'setup.py').open() as f:
|
||||
data = f.read()
|
||||
|
||||
# Replace the name of the package with what desired
|
||||
rex = re.compile(r"""name=["']psycopg2["']""")
|
||||
assert len(rex.findall(data)) == 1, rex.findall(data)
|
||||
data = rex.sub(f'name="{opt.package_name}"', data)
|
||||
|
||||
with (opt.package_dir / 'setup.py').open('w') as f:
|
||||
f.write(data)
|
||||
|
||||
|
||||
def build_binary_packages():
|
||||
"""Create wheel binary packages."""
|
||||
os.chdir(opt.package_dir)
|
||||
|
||||
add_pg_config_path()
|
||||
|
||||
# Build .whl packages
|
||||
run_python(['setup.py', 'bdist_wheel', "-d", opt.dist_dir])
|
||||
|
||||
|
||||
def step_after_build():
|
||||
if not opt.is_wheel:
|
||||
install_built_package()
|
||||
else:
|
||||
install_binary_package()
|
||||
|
||||
|
||||
def install_built_package():
|
||||
"""Install the package just built by setup build."""
|
||||
os.chdir(opt.package_dir)
|
||||
|
||||
# Install the psycopg just built
|
||||
add_pg_config_path()
|
||||
run_python(["setup.py", "install"])
|
||||
shutil.rmtree("psycopg2.egg-info")
|
||||
|
||||
|
||||
def install_binary_package():
|
||||
"""Install the package from a packaged wheel."""
|
||||
run_python(
|
||||
['-m', 'pip', 'install', '--no-index', '-f', opt.dist_dir]
|
||||
+ [opt.package_name]
|
||||
)
|
||||
|
||||
|
||||
def add_pg_config_path():
|
||||
"""Allow finding in the path the pg_config just built."""
|
||||
pg_path = str(opt.pg_build_dir / 'bin')
|
||||
if pg_path not in os.environ['PATH'].split(os.pathsep):
|
||||
setenv('PATH', os.pathsep.join([pg_path, os.environ['PATH']]))
|
||||
|
||||
|
||||
def step_before_test():
|
||||
print_psycopg2_version()
|
||||
|
||||
# Create and setup PostgreSQL database for the tests
|
||||
run_command([opt.pg_bin_dir / 'createdb', os.environ['PSYCOPG2_TESTDB']])
|
||||
run_command(
|
||||
[opt.pg_bin_dir / 'psql', '-d', os.environ['PSYCOPG2_TESTDB']]
|
||||
+ ['-c', "CREATE EXTENSION hstore"]
|
||||
)
|
||||
|
||||
|
||||
def print_psycopg2_version():
|
||||
"""Print psycopg2 and libpq versions installed."""
|
||||
for expr in (
|
||||
'psycopg2.__version__',
|
||||
'psycopg2.__libpq_version__',
|
||||
'psycopg2.extensions.libpq_version()',
|
||||
):
|
||||
out = out_python(['-c', f"import psycopg2; print({expr})"])
|
||||
logger.info("built %s: %s", expr, out.decode('ascii'))
|
||||
|
||||
|
||||
def step_test_script():
|
||||
check_libpq_version()
|
||||
run_test_suite()
|
||||
|
||||
|
||||
def check_libpq_version():
|
||||
"""
|
||||
Fail if the package installed is not using the expected libpq version.
|
||||
"""
|
||||
want_ver = tuple(map(int, os.environ['POSTGRES_VERSION'].split('_')))
|
||||
want_ver = "%d%04d" % want_ver
|
||||
got_ver = (
|
||||
out_python(
|
||||
['-c']
|
||||
+ ["import psycopg2; print(psycopg2.extensions.libpq_version())"]
|
||||
)
|
||||
.decode('ascii')
|
||||
.rstrip()
|
||||
)
|
||||
assert want_ver == got_ver, f"libpq version mismatch: {want_ver!r} != {got_ver!r}"
|
||||
|
||||
|
||||
def run_test_suite():
|
||||
# Remove this var, which would make badly a configured OpenSSL 1.1 work
|
||||
os.environ.pop('OPENSSL_CONF', None)
|
||||
|
||||
# Run the unit test
|
||||
args = [
|
||||
'-c',
|
||||
"import tests; tests.unittest.main(defaultTest='tests.test_suite')",
|
||||
]
|
||||
|
||||
if opt.is_wheel:
|
||||
os.environ['PSYCOPG2_TEST_FAST'] = '1'
|
||||
else:
|
||||
args.append('--verbose')
|
||||
|
||||
os.chdir(opt.package_dir)
|
||||
run_python(args)
|
||||
|
||||
|
||||
def step_on_success():
|
||||
print_sha1_hashes()
|
||||
if setup_ssh():
|
||||
upload_packages()
|
||||
|
||||
|
||||
def print_sha1_hashes():
|
||||
"""
|
||||
Print the packages sha1 so their integrity can be checked upon signing.
|
||||
"""
|
||||
logger.info("artifacts SHA1 hashes:")
|
||||
|
||||
os.chdir(opt.package_dir / 'dist')
|
||||
run_command([which('sha1sum'), '-b', 'psycopg2-*/*'])
|
||||
|
||||
|
||||
def setup_ssh():
|
||||
"""
|
||||
Configure ssh to upload built packages where they can be retrieved.
|
||||
|
||||
Return False if can't configure and upload shoould be skipped.
|
||||
"""
|
||||
# If we are not on the psycopg AppVeyor account, the environment variable
|
||||
# REMOTE_KEY will not be decrypted. In that case skip uploading.
|
||||
if os.environ['APPVEYOR_ACCOUNT_NAME'] != 'psycopg':
|
||||
logger.warn("skipping artifact upload: you are not psycopg")
|
||||
return False
|
||||
|
||||
pkey = os.environ.get('REMOTE_KEY', None)
|
||||
if not pkey:
|
||||
logger.warn("skipping artifact upload: no remote key")
|
||||
return False
|
||||
|
||||
# Write SSH Private Key file from environment variable
|
||||
pkey = pkey.replace(' ', '\n')
|
||||
with (opt.clone_dir / 'data/id_rsa-psycopg-upload').open('w') as f:
|
||||
f.write(
|
||||
f"""\
|
||||
-----BEGIN RSA PRIVATE KEY-----
|
||||
{pkey}
|
||||
-----END RSA PRIVATE KEY-----
|
||||
"""
|
||||
)
|
||||
|
||||
# Make a directory to please MinGW's version of ssh
|
||||
ensure_dir(r"C:\MinGW\msys\1.0\home\appveyor\.ssh")
|
||||
|
||||
return True
|
||||
|
||||
|
||||
def upload_packages():
|
||||
# Upload built artifacts
|
||||
logger.info("uploading artifacts")
|
||||
|
||||
os.chdir(opt.clone_dir)
|
||||
run_command(
|
||||
[r"C:\MinGW\msys\1.0\bin\rsync", "-avr"]
|
||||
+ ["-e", r"C:\MinGW\msys\1.0\bin\ssh -F data/ssh_config"]
|
||||
+ ["psycopg2/dist/", "upload:"]
|
||||
)
|
||||
|
||||
|
||||
def download(url, fn):
|
||||
"""Download a file locally"""
|
||||
logger.info("downloading %s", url)
|
||||
with open(fn, 'wb') as fo, urlopen(url) as fi:
|
||||
while 1:
|
||||
data = fi.read(8192)
|
||||
if not data:
|
||||
break
|
||||
fo.write(data)
|
||||
|
||||
logger.info("file downloaded: %s", fn)
|
||||
|
||||
|
||||
def file_replace(fn, s1, s2):
|
||||
"""
|
||||
Replace all the occurrences of the string s1 into s2 in the file fn.
|
||||
"""
|
||||
assert os.path.exists(fn)
|
||||
with open(fn, 'r+') as f:
|
||||
data = f.read()
|
||||
f.seek(0)
|
||||
f.write(data.replace(s1, s2))
|
||||
f.truncate()
|
||||
|
||||
|
||||
def merge_dir(src, tgt):
|
||||
"""
|
||||
Merge the content of the directory src into the directory tgt
|
||||
|
||||
Reproduce the semantic of "XCOPY /Y /S src/* tgt"
|
||||
"""
|
||||
src = str(src)
|
||||
for dp, _dns, fns in os.walk(src):
|
||||
logger.debug("dirpath %s", dp)
|
||||
if not fns:
|
||||
continue
|
||||
assert dp.startswith(src)
|
||||
subdir = dp[len(src) :].lstrip(os.sep)
|
||||
tgtdir = ensure_dir(os.path.join(tgt, subdir))
|
||||
for fn in fns:
|
||||
copy_file(os.path.join(dp, fn), tgtdir)
|
||||
|
||||
|
||||
def bat_call(cmdline):
|
||||
"""
|
||||
Simulate 'CALL' from a batch file
|
||||
|
||||
Execute CALL *cmdline* and export the changed environment to the current
|
||||
environment.
|
||||
|
||||
nana-nana-nana-nana...
|
||||
|
||||
"""
|
||||
if not isinstance(cmdline, str):
|
||||
cmdline = map(str, cmdline)
|
||||
cmdline = ' '.join(c if ' ' not in c else '"%s"' % c for c in cmdline)
|
||||
|
||||
data = f"""\
|
||||
CALL {cmdline}
|
||||
{opt.py_exe} -c "import os, sys, json; \
|
||||
json.dump(dict(os.environ), sys.stdout, indent=2)"
|
||||
"""
|
||||
|
||||
logger.debug("preparing file to batcall:\n\n%s", data)
|
||||
|
||||
with NamedTemporaryFile(suffix='.bat') as tmp:
|
||||
fn = tmp.name
|
||||
|
||||
with open(fn, "w") as f:
|
||||
f.write(data)
|
||||
|
||||
try:
|
||||
out = out_command(fn)
|
||||
# be vewwy vewwy caweful to print the env var as it might contain
|
||||
# secwet things like your pwecious pwivate key.
|
||||
# logger.debug("output of command:\n\n%s", out.decode('utf8', 'replace'))
|
||||
|
||||
# The output has some useless crap on stdout, because sure, and json
|
||||
# indented so the last { on column 1 is where we have to start parsing
|
||||
|
||||
m = list(re.finditer(b'^{', out, re.MULTILINE))[-1]
|
||||
out = out[m.start() :]
|
||||
env = json.loads(out)
|
||||
for k, v in env.items():
|
||||
if os.environ.get(k) != v:
|
||||
setenv(k, v)
|
||||
finally:
|
||||
os.remove(fn)
|
||||
|
||||
|
||||
def ensure_dir(dir):
|
||||
if not isinstance(dir, Path):
|
||||
dir = Path(dir)
|
||||
|
||||
if not dir.is_dir():
|
||||
logger.info("creating directory %s", dir)
|
||||
dir.mkdir(parents=True)
|
||||
|
||||
return dir
|
||||
|
||||
|
||||
def run_command(cmdline, **kwargs):
|
||||
"""Run a command, raise on error."""
|
||||
if not isinstance(cmdline, str):
|
||||
cmdline = list(map(str, cmdline))
|
||||
logger.info("running command: %s", cmdline)
|
||||
sp.check_call(cmdline, **kwargs)
|
||||
|
||||
|
||||
def out_command(cmdline, **kwargs):
|
||||
"""Run a command, return its output, raise on error."""
|
||||
if not isinstance(cmdline, str):
|
||||
cmdline = list(map(str, cmdline))
|
||||
logger.info("running command: %s", cmdline)
|
||||
data = sp.check_output(cmdline, **kwargs)
|
||||
return data
|
||||
|
||||
|
||||
def run_python(args, **kwargs):
|
||||
"""
|
||||
Run a script in the target Python.
|
||||
"""
|
||||
return run_command([opt.py_exe] + args, **kwargs)
|
||||
|
||||
|
||||
def out_python(args, **kwargs):
|
||||
"""
|
||||
Return the output of a script run in the target Python.
|
||||
"""
|
||||
return out_command([opt.py_exe] + args, **kwargs)
|
||||
|
||||
|
||||
def copy_file(src, dst):
|
||||
logger.info("copying file %s -> %s", src, dst)
|
||||
shutil.copy(src, dst)
|
||||
|
||||
|
||||
def setenv(k, v):
|
||||
logger.debug("setting %s=%s", k, v)
|
||||
os.environ[k] = v
|
||||
|
||||
|
||||
def which(name):
|
||||
"""
|
||||
Return the full path of a command found on the path
|
||||
"""
|
||||
base, ext = os.path.splitext(name)
|
||||
if not ext:
|
||||
exts = ('.com', '.exe', '.bat', '.cmd')
|
||||
else:
|
||||
exts = (ext,)
|
||||
|
||||
for dir in ['.'] + os.environ['PATH'].split(os.pathsep):
|
||||
for ext in exts:
|
||||
fn = os.path.join(dir, base + ext)
|
||||
if os.path.isfile(fn):
|
||||
return fn
|
||||
|
||||
raise Exception(f"couldn't find program on path: {name}")
|
||||
|
||||
|
||||
class Options:
|
||||
"""
|
||||
An object exposing the script configuration from env vars and command line.
|
||||
"""
|
||||
|
||||
@property
|
||||
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', '310'), rv
|
||||
return rv
|
||||
|
||||
@property
|
||||
def py_arch(self):
|
||||
"""The Python architecture to build, 32 or 64."""
|
||||
rv = os.environ['PY_ARCH']
|
||||
assert rv in ('32', '64'), rv
|
||||
return int(rv)
|
||||
|
||||
@property
|
||||
def arch_32(self):
|
||||
"""True if the Python architecture to build is 32 bits."""
|
||||
return self.py_arch == 32
|
||||
|
||||
@property
|
||||
def arch_64(self):
|
||||
"""True if the Python architecture to build is 64 bits."""
|
||||
return self.py_arch == 64
|
||||
|
||||
@property
|
||||
def package_name(self):
|
||||
return os.environ.get('CONFIGURATION', 'psycopg2')
|
||||
|
||||
@property
|
||||
def package_version(self):
|
||||
"""The psycopg2 version number to build."""
|
||||
with (self.package_dir / 'setup.py').open() as f:
|
||||
data = f.read()
|
||||
|
||||
m = re.search(
|
||||
r"""^PSYCOPG_VERSION\s*=\s*['"](.*)['"]""", data, re.MULTILINE
|
||||
)
|
||||
return m.group(1)
|
||||
|
||||
@property
|
||||
def is_wheel(self):
|
||||
"""Are we building the wheel packages or just the extension?"""
|
||||
workflow = os.environ["WORKFLOW"]
|
||||
return workflow == "packages"
|
||||
|
||||
@property
|
||||
def py_dir(self):
|
||||
"""
|
||||
The path to the target python binary to execute.
|
||||
"""
|
||||
dirname = ''.join(
|
||||
[r"C:\Python", self.py_ver, '-x64' if self.arch_64 else '']
|
||||
)
|
||||
return Path(dirname)
|
||||
|
||||
@property
|
||||
def py_exe(self):
|
||||
"""
|
||||
The full path of the target python executable.
|
||||
"""
|
||||
return self.py_dir / 'python.exe'
|
||||
|
||||
@property
|
||||
def vc_dir(self):
|
||||
"""
|
||||
The path of the Visual C compiler.
|
||||
"""
|
||||
if self.vs_ver == '16.0':
|
||||
path = Path(
|
||||
r"C:\Program Files (x86)\Microsoft Visual Studio\2019"
|
||||
r"\Community\VC\Auxiliary\Build"
|
||||
)
|
||||
else:
|
||||
path = Path(
|
||||
r"C:\Program Files (x86)\Microsoft Visual Studio %s\VC"
|
||||
% self.vs_ver
|
||||
)
|
||||
return path
|
||||
|
||||
@property
|
||||
def vs_ver(self):
|
||||
# https://wiki.python.org/moin/WindowsCompilers
|
||||
# https://www.appveyor.com/docs/windows-images-software/#python
|
||||
# Py 3.6--3.8 = VS Ver. 14.0 (VS 2015)
|
||||
# Py 3.9 = VS Ver. 16.0 (VS 2019)
|
||||
vsvers = {
|
||||
'36': '14.0',
|
||||
'37': '14.0',
|
||||
'38': '14.0',
|
||||
'39': '16.0',
|
||||
'310': '16.0',
|
||||
}
|
||||
return vsvers[self.py_ver]
|
||||
|
||||
@property
|
||||
def clone_dir(self):
|
||||
"""The directory where the repository is cloned."""
|
||||
return Path(r"C:\Project")
|
||||
|
||||
@property
|
||||
def appveyor_pg_dir(self):
|
||||
"""The directory of the postgres service made available by Appveyor."""
|
||||
return Path(os.environ['POSTGRES_DIR'])
|
||||
|
||||
@property
|
||||
def pg_data_dir(self):
|
||||
"""The data dir of the appveyor postgres service."""
|
||||
return self.appveyor_pg_dir / 'data'
|
||||
|
||||
@property
|
||||
def pg_bin_dir(self):
|
||||
"""The bin dir of the appveyor postgres service."""
|
||||
return self.appveyor_pg_dir / 'bin'
|
||||
|
||||
@property
|
||||
def pg_build_dir(self):
|
||||
"""The directory where to build the postgres libraries for psycopg."""
|
||||
return self.cache_arch_dir / 'postgresql'
|
||||
|
||||
@property
|
||||
def ssl_build_dir(self):
|
||||
"""The directory where to build the openssl libraries for psycopg."""
|
||||
return self.cache_arch_dir / 'openssl'
|
||||
|
||||
@property
|
||||
def cache_arch_dir(self):
|
||||
rv = self.cache_dir / str(self.py_arch) / self.vs_ver
|
||||
return ensure_dir(rv)
|
||||
|
||||
@property
|
||||
def cache_dir(self):
|
||||
return Path(r"C:\Others")
|
||||
|
||||
@property
|
||||
def build_dir(self):
|
||||
rv = self.cache_arch_dir / 'Builds'
|
||||
return ensure_dir(rv)
|
||||
|
||||
@property
|
||||
def package_dir(self):
|
||||
return self.clone_dir
|
||||
|
||||
@property
|
||||
def dist_dir(self):
|
||||
"""The directory where to build packages to distribute."""
|
||||
return (
|
||||
self.package_dir / 'dist' / (f'psycopg2-{self.package_version}')
|
||||
)
|
||||
|
||||
|
||||
def parse_cmdline():
|
||||
parser = ArgumentParser(description=__doc__)
|
||||
|
||||
g = parser.add_mutually_exclusive_group()
|
||||
g.add_argument(
|
||||
'-q',
|
||||
'--quiet',
|
||||
help="Talk less",
|
||||
dest='loglevel',
|
||||
action='store_const',
|
||||
const=logging.WARN,
|
||||
default=logging.INFO,
|
||||
)
|
||||
g.add_argument(
|
||||
'-v',
|
||||
'--verbose',
|
||||
help="Talk more",
|
||||
dest='loglevel',
|
||||
action='store_const',
|
||||
const=logging.DEBUG,
|
||||
default=logging.INFO,
|
||||
)
|
||||
|
||||
steps = [
|
||||
n[len(STEP_PREFIX) :]
|
||||
for n in globals()
|
||||
if n.startswith(STEP_PREFIX) and callable(globals()[n])
|
||||
]
|
||||
|
||||
parser.add_argument(
|
||||
'step', choices=steps, help="the appveyor step to execute"
|
||||
)
|
||||
|
||||
opt = parser.parse_args(namespace=Options())
|
||||
|
||||
return opt
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
sys.exit(main())
|
||||
|
|
@ -1,156 +1,43 @@
|
|||
#!/bin/bash
|
||||
|
||||
# Build a modern version of libpq and depending libs from source on Centos 5, Alpine or macOS
|
||||
# Build a modern version of libpq and depending libs from source on Centos 5
|
||||
|
||||
set -euo pipefail
|
||||
set -x
|
||||
|
||||
# Last release: https://www.postgresql.org/ftp/source/
|
||||
# IMPORTANT! Change the cache key in packages.yml when upgrading libraries
|
||||
postgres_version="${LIBPQ_VERSION}"
|
||||
|
||||
postgres_version="15.0"
|
||||
# last release: https://www.openssl.org/source/
|
||||
openssl_version="${OPENSSL_VERSION}"
|
||||
|
||||
# last release: https://kerberos.org/dist/
|
||||
krb5_version="1.21.3"
|
||||
|
||||
openssl_version="1.1.1r"
|
||||
# last release: https://openldap.org/software/download/
|
||||
ldap_version="2.6.8"
|
||||
|
||||
ldap_version="2.4.59"
|
||||
# last release: https://github.com/cyrusimap/cyrus-sasl/releases
|
||||
sasl_version="2.1.28"
|
||||
|
||||
export LIBPQ_BUILD_PREFIX=${LIBPQ_BUILD_PREFIX:-/tmp/libpq.build}
|
||||
|
||||
case "$(uname)" in
|
||||
Darwin)
|
||||
ID=macos
|
||||
library_suffix=dylib
|
||||
;;
|
||||
|
||||
Linux)
|
||||
source /etc/os-release
|
||||
library_suffix=so
|
||||
;;
|
||||
|
||||
*)
|
||||
echo "$0: unexpected Operating system: '$(uname)'" >&2
|
||||
exit 1
|
||||
;;
|
||||
esac
|
||||
|
||||
if [[ -f "${LIBPQ_BUILD_PREFIX}/lib/libpq.${library_suffix}" ]]; then
|
||||
echo "libpq already available: build skipped" >&2
|
||||
exit 0
|
||||
fi
|
||||
|
||||
case "$ID" in
|
||||
centos)
|
||||
yum update -y
|
||||
yum install -y zlib-devel krb5-devel pam-devel
|
||||
;;
|
||||
|
||||
alpine)
|
||||
apk upgrade
|
||||
apk add --no-cache zlib-dev krb5-dev linux-pam-dev openldap-dev openssl-dev
|
||||
;;
|
||||
|
||||
macos)
|
||||
brew install automake m4 libtool
|
||||
# If available, libpq seemingly insists on linking against homebrew's
|
||||
# openssl no matter what so remove it. Since homebrew's curl depends on
|
||||
# it, force use of system curl.
|
||||
brew uninstall --force --ignore-dependencies openssl gettext curl
|
||||
if [ -z "${MACOSX_ARCHITECTURE:-}" ]; then
|
||||
MACOSX_ARCHITECTURE="$(uname -m)"
|
||||
fi
|
||||
# Set the deployment target to be <= to that of the oldest supported Python version.
|
||||
# e.g. https://www.python.org/downloads/release/python-380/
|
||||
if [ "$MACOSX_ARCHITECTURE" == "x86_64" ]; then
|
||||
export MACOSX_DEPLOYMENT_TARGET=10.9
|
||||
else
|
||||
export MACOSX_DEPLOYMENT_TARGET=11.0
|
||||
fi
|
||||
;;
|
||||
|
||||
*)
|
||||
echo "$0: unexpected Linux distribution: '$ID'" >&2
|
||||
exit 1
|
||||
;;
|
||||
esac
|
||||
|
||||
|
||||
if [ "$ID" == "macos" ]; then
|
||||
make_configure_standard_flags=( \
|
||||
--prefix=${LIBPQ_BUILD_PREFIX} \
|
||||
"CPPFLAGS=-I${LIBPQ_BUILD_PREFIX}/include/ -arch $MACOSX_ARCHITECTURE" \
|
||||
"LDFLAGS=-L${LIBPQ_BUILD_PREFIX}/lib -arch $MACOSX_ARCHITECTURE" \
|
||||
)
|
||||
else
|
||||
make_configure_standard_flags=( \
|
||||
--prefix=${LIBPQ_BUILD_PREFIX} \
|
||||
CPPFLAGS=-I${LIBPQ_BUILD_PREFIX}/include/ \
|
||||
LDFLAGS=-L${LIBPQ_BUILD_PREFIX}/lib \
|
||||
)
|
||||
fi
|
||||
|
||||
|
||||
if [ "$ID" == "centos" ] || [ "$ID" == "macos" ]; then
|
||||
|
||||
# Build openssl if needed
|
||||
openssl_tag="OpenSSL_${openssl_version//./_}"
|
||||
openssl_dir="openssl-${openssl_tag}"
|
||||
if [ ! -d "${openssl_dir}" ]; then
|
||||
curl -sL \
|
||||
if [ ! -d "${openssl_dir}" ]; then curl -sL \
|
||||
https://github.com/openssl/openssl/archive/${openssl_tag}.tar.gz \
|
||||
| tar xzf -
|
||||
|
||||
pushd "${openssl_dir}"
|
||||
|
||||
options=(--prefix=${LIBPQ_BUILD_PREFIX} --openssldir=${LIBPQ_BUILD_PREFIX} \
|
||||
zlib -fPIC shared)
|
||||
if [ -z "${MACOSX_ARCHITECTURE:-}" ]; then
|
||||
./config $options
|
||||
else
|
||||
./configure "darwin64-$MACOSX_ARCHITECTURE-cc" $options
|
||||
fi
|
||||
cd "${openssl_dir}"
|
||||
|
||||
./config --prefix=/usr/local/ --openssldir=/usr/local/ \
|
||||
zlib -fPIC shared
|
||||
make depend
|
||||
make
|
||||
else
|
||||
pushd "${openssl_dir}"
|
||||
cd "${openssl_dir}"
|
||||
fi
|
||||
|
||||
# Install openssl
|
||||
make install_sw
|
||||
popd
|
||||
cd ..
|
||||
|
||||
fi
|
||||
|
||||
|
||||
if [ "$ID" == "macos" ]; then
|
||||
|
||||
# Build kerberos if needed
|
||||
krb5_dir="krb5-${krb5_version}/src"
|
||||
if [ ! -d "${krb5_dir}" ]; then
|
||||
curl -sL "https://kerberos.org/dist/krb5/${krb5_version%.*}/krb5-${krb5_version}.tar.gz" \
|
||||
| tar xzf -
|
||||
|
||||
pushd "${krb5_dir}"
|
||||
./configure "${make_configure_standard_flags[@]}"
|
||||
make
|
||||
else
|
||||
pushd "${krb5_dir}"
|
||||
fi
|
||||
|
||||
make install
|
||||
popd
|
||||
|
||||
fi
|
||||
|
||||
|
||||
if [ "$ID" == "centos" ] || [ "$ID" == "macos" ]; then
|
||||
|
||||
# Build libsasl2 if needed
|
||||
# The system package (cyrus-sasl-devel) causes an amazing error on i686:
|
||||
|
|
@ -163,25 +50,21 @@ if [ "$ID" == "centos" ] || [ "$ID" == "macos" ]; then
|
|||
https://github.com/cyrusimap/cyrus-sasl/archive/${sasl_tag}.tar.gz \
|
||||
| tar xzf -
|
||||
|
||||
pushd "${sasl_dir}"
|
||||
cd "${sasl_dir}"
|
||||
|
||||
autoreconf -i
|
||||
./configure "${make_configure_standard_flags[@]}" --disable-macos-framework
|
||||
./configure
|
||||
make
|
||||
else
|
||||
pushd "${sasl_dir}"
|
||||
cd "${sasl_dir}"
|
||||
fi
|
||||
|
||||
# Install libsasl2
|
||||
# requires missing nroff to build
|
||||
touch saslauthd/saslauthd.8
|
||||
make install
|
||||
popd
|
||||
cd ..
|
||||
|
||||
fi
|
||||
|
||||
|
||||
if [ "$ID" == "centos" ] || [ "$ID" == "macos" ]; then
|
||||
|
||||
# Build openldap if needed
|
||||
ldap_tag="${ldap_version}"
|
||||
|
|
@ -191,26 +74,25 @@ if [ "$ID" == "centos" ] || [ "$ID" == "macos" ]; then
|
|||
https://www.openldap.org/software/download/OpenLDAP/openldap-release/openldap-${ldap_tag}.tgz \
|
||||
| tar xzf -
|
||||
|
||||
pushd "${ldap_dir}"
|
||||
|
||||
./configure "${make_configure_standard_flags[@]}" --enable-backends=no --enable-null
|
||||
cd "${ldap_dir}"
|
||||
|
||||
./configure --enable-backends=no --enable-null
|
||||
make depend
|
||||
make -C libraries/liblutil/
|
||||
make -C libraries/liblber/
|
||||
make -C libraries/libldap/
|
||||
make -C libraries/libldap_r/
|
||||
else
|
||||
pushd "${ldap_dir}"
|
||||
cd "${ldap_dir}"
|
||||
fi
|
||||
|
||||
# Install openldap
|
||||
make -C libraries/liblber/ install
|
||||
make -C libraries/libldap/ install
|
||||
make -C libraries/libldap_r/ install
|
||||
make -C include/ install
|
||||
chmod +x ${LIBPQ_BUILD_PREFIX}/lib/{libldap,liblber}*.${library_suffix}*
|
||||
popd
|
||||
|
||||
fi
|
||||
chmod +x /usr/local/lib/{libldap,liblber}*.so*
|
||||
cd ..
|
||||
|
||||
|
||||
# Build libpq if needed
|
||||
|
|
@ -221,33 +103,33 @@ if [ ! -d "${postgres_dir}" ]; then
|
|||
https://github.com/postgres/postgres/archive/${postgres_tag}.tar.gz \
|
||||
| tar xzf -
|
||||
|
||||
pushd "${postgres_dir}"
|
||||
cd "${postgres_dir}"
|
||||
|
||||
if [ "$ID" != "macos" ]; then
|
||||
# Match the default unix socket dir default with what defined on Ubuntu and
|
||||
# Red Hat, which seems the most common location
|
||||
sed -i 's|#define DEFAULT_PGSOCKET_DIR .*'\
|
||||
'|#define DEFAULT_PGSOCKET_DIR "/var/run/postgresql"|' \
|
||||
src/include/pg_config_manual.h
|
||||
|
||||
# Without this, libpq ./configure fails on i686
|
||||
if [[ "$(uname -m)" == "i686" ]]; then
|
||||
export LD_LIBRARY_PATH=/usr/local/lib
|
||||
fi
|
||||
|
||||
# Often needed, but currently set by the workflow
|
||||
# export LD_LIBRARY_PATH="${LIBPQ_BUILD_PREFIX}/lib"
|
||||
|
||||
./configure "${make_configure_standard_flags[@]}" --sysconfdir=/etc/postgresql-common \
|
||||
./configure --prefix=/usr/local --without-readline \
|
||||
--with-gssapi --with-openssl --with-pam --with-ldap \
|
||||
--without-readline --without-icu
|
||||
--sysconfdir=/etc/postgresql-common
|
||||
make -C src/interfaces/libpq
|
||||
make -C src/bin/pg_config
|
||||
make -C src/include
|
||||
else
|
||||
pushd "${postgres_dir}"
|
||||
cd "${postgres_dir}"
|
||||
fi
|
||||
|
||||
# Install libpq
|
||||
make -C src/interfaces/libpq install
|
||||
make -C src/bin/pg_config install
|
||||
make -C src/include install
|
||||
popd
|
||||
cd ..
|
||||
|
||||
find ${LIBPQ_BUILD_PREFIX} -name \*.${library_suffix}.\* -type f -exec strip --strip-unneeded {} \;
|
||||
find /usr/local/ -name \*.so.\* -type f -exec strip --strip-unneeded {} \;
|
||||
|
|
|
|||
82
scripts/build/build_macos.sh
Executable file
82
scripts/build/build_macos.sh
Executable file
|
|
@ -0,0 +1,82 @@
|
|||
#!/bin/bash
|
||||
|
||||
# Create macOS wheels for psycopg2
|
||||
#
|
||||
# Following instructions from https://github.com/MacPython/wiki/wiki/Spinning-wheels
|
||||
# Cargoculting pieces of implementation from https://github.com/matthew-brett/multibuild
|
||||
|
||||
set -euo pipefail
|
||||
set -x
|
||||
|
||||
dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
|
||||
prjdir="$( cd "${dir}/../.." && pwd )"
|
||||
|
||||
brew update
|
||||
brew install gnu-sed postgresql@14
|
||||
# Fetch 14.1 if 14.0 is still the default version
|
||||
brew reinstall postgresql
|
||||
|
||||
# Start the database for testing
|
||||
brew services start postgresql
|
||||
|
||||
for i in $(seq 10 -1 0); do
|
||||
eval pg_isready && break
|
||||
if [ $i == 0 ]; then
|
||||
echo "PostgreSQL service not ready, giving up"
|
||||
exit 1
|
||||
fi
|
||||
echo "PostgreSQL service not ready, waiting a bit, attempts left: $i"
|
||||
sleep 5
|
||||
done
|
||||
|
||||
# Find psycopg version
|
||||
version=$(grep -e ^PSYCOPG_VERSION "${prjdir}/setup.py" | gsed "s/.*'\(.*\)'/\1/")
|
||||
# A gratuitous comment to fix broken vim syntax file: '")
|
||||
distdir="${prjdir}/dist/psycopg2-$version"
|
||||
mkdir -p "$distdir"
|
||||
|
||||
# Install required python packages
|
||||
pip install -U pip wheel delocate
|
||||
|
||||
# Replace the package name
|
||||
if [[ "${PACKAGE_NAME:-}" ]]; then
|
||||
gsed -i "s/^setup(name=\"psycopg2\"/setup(name=\"${PACKAGE_NAME}\"/" \
|
||||
"${prjdir}/setup.py"
|
||||
fi
|
||||
|
||||
# Build the wheels
|
||||
wheeldir="${prjdir}/wheels"
|
||||
pip wheel -w ${wheeldir} .
|
||||
delocate-listdeps ${wheeldir}/*.whl
|
||||
|
||||
# Check where is the libpq. I'm gonna kill it for testing
|
||||
if [[ -z "${LIBPQ:-}" ]]; then
|
||||
export LIBPQ=$(delocate-listdeps ${wheeldir}/*.whl | grep libpq)
|
||||
fi
|
||||
|
||||
delocate-wheel ${wheeldir}/*.whl
|
||||
# https://github.com/MacPython/wiki/wiki/Spinning-wheels#question-will-pip-give-me-a-broken-wheel
|
||||
delocate-addplat --rm-orig -x 10_9 -x 10_10 ${wheeldir}/*.whl
|
||||
cp ${wheeldir}/*.whl ${distdir}
|
||||
|
||||
# kill the libpq to make sure tests don't depend on it
|
||||
mv "$LIBPQ" "${LIBPQ}-bye"
|
||||
|
||||
# Install and test the built wheel
|
||||
pip install ${PACKAGE_NAME:-psycopg2} --no-index -f "$distdir"
|
||||
|
||||
# Print psycopg and libpq versions
|
||||
python -c "import psycopg2; print(psycopg2.__version__)"
|
||||
python -c "import psycopg2; print(psycopg2.__libpq_version__)"
|
||||
python -c "import psycopg2; print(psycopg2.extensions.libpq_version())"
|
||||
|
||||
# fail if we are not using the expected libpq library
|
||||
# Disabled as we just use what's available on the system on macOS
|
||||
# if [[ "${WANT_LIBPQ:-}" ]]; then
|
||||
# python -c "import psycopg2, sys; sys.exit(${WANT_LIBPQ} != psycopg2.extensions.libpq_version())"
|
||||
# fi
|
||||
|
||||
python -c "import tests; tests.unittest.main(defaultTest='tests.test_suite')"
|
||||
|
||||
# just because I'm a boy scout
|
||||
mv "${LIBPQ}-bye" "$LIBPQ"
|
||||
|
|
@ -8,14 +8,10 @@
|
|||
# so it can pretty much only be executed by a sudo user as it is.
|
||||
|
||||
set -euo pipefail
|
||||
# set -x
|
||||
set -x
|
||||
|
||||
python_versions="3.8.18 3.9.18 3.10.13 3.11.6 3.12.0"
|
||||
pg_version=16
|
||||
|
||||
function log {
|
||||
echo "$@" >&2
|
||||
}
|
||||
python_versions="3.8.10 3.9.13 3.10.5 3.11"
|
||||
postgres_version=15
|
||||
|
||||
# Move to the root of the project
|
||||
dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
|
||||
|
|
@ -30,7 +26,6 @@ fi
|
|||
if [[ -x /opt/homebrew/bin/brew ]]; then
|
||||
eval "$(/opt/homebrew/bin/brew shellenv)"
|
||||
else
|
||||
log "installing brew"
|
||||
command -v brew > /dev/null || (
|
||||
# Not necessary: already installed
|
||||
# xcode-select --install
|
||||
|
|
@ -40,33 +35,21 @@ else
|
|||
eval "$(/opt/homebrew/bin/brew shellenv)"
|
||||
fi
|
||||
|
||||
export PGDATA=/opt/homebrew/var/postgresql@${pg_version}
|
||||
|
||||
# Install PostgreSQL, if necessary
|
||||
command -v pg_config > /dev/null || (
|
||||
log "installing postgres"
|
||||
brew install postgresql@${pg_version}
|
||||
)
|
||||
|
||||
# Starting from PostgreSQL 15, the bin path is not in the path.
|
||||
export PATH="$(ls -d1 /opt/homebrew/Cellar/postgresql@${pg_version}/*/bin):$PATH"
|
||||
|
||||
# Make sure the server is running
|
||||
|
||||
brew install postgresql@${postgres_version}
|
||||
# Currently not working
|
||||
# brew services start postgresql@${pg_version}
|
||||
|
||||
if ! pg_ctl status; then
|
||||
log "starting the server"
|
||||
pg_ctl -l "/opt/homebrew/var/log/postgresql@${pg_version}.log" start
|
||||
fi
|
||||
|
||||
# brew services start postgresql@${postgres_version}
|
||||
pg_ctl \
|
||||
-D /opt/homebrew/var/postgresql@${postgres_version} \
|
||||
-l /opt/homebrew/var/log/postgresql@${postgres_version}.log \
|
||||
start
|
||||
)
|
||||
|
||||
# Install the Python versions we want to build
|
||||
for ver3 in $python_versions; do
|
||||
ver2=$(echo $ver3 | sed 's/\([^\.]*\)\(\.[^\.]*\)\(.*\)/\1\2/')
|
||||
command -v python${ver2} > /dev/null || (
|
||||
log "installing Python $ver3"
|
||||
(cd /tmp &&
|
||||
curl -fsSl -O \
|
||||
https://www.python.org/ftp/python/${ver3}/python-${ver3}-macos11.pkg)
|
||||
|
|
@ -76,20 +59,16 @@ done
|
|||
|
||||
# Create a virtualenv where to work
|
||||
if [[ ! -x .venv/bin/python ]]; then
|
||||
log "creating a virtualenv"
|
||||
python3 -m venv .venv
|
||||
fi
|
||||
|
||||
log "installing cibuildwheel"
|
||||
source .venv/bin/activate
|
||||
pip install cibuildwheel
|
||||
|
||||
log "building wheels"
|
||||
|
||||
# Build the binary packages
|
||||
export CIBW_PLATFORM=macos
|
||||
export CIBW_ARCHS=arm64
|
||||
export CIBW_BUILD='cp{38,39,310,311,312}-*'
|
||||
export CIBW_BUILD='cp{38,39,310}-*'
|
||||
export CIBW_TEST_COMMAND='python -c "import tests; tests.unittest.main(defaultTest=\"tests.test_suite\")"'
|
||||
|
||||
export PSYCOPG2_TESTDB=postgres
|
||||
|
|
|
|||
76
scripts/build/build_manylinux2014.sh
Executable file
76
scripts/build/build_manylinux2014.sh
Executable file
|
|
@ -0,0 +1,76 @@
|
|||
#!/bin/bash
|
||||
|
||||
# Create manylinux2014 wheels for psycopg2
|
||||
#
|
||||
# manylinux2014 is built on CentOS 7, which packages an old version of the
|
||||
# libssl, (1.0, which has concurrency problems with the Python libssl). So we
|
||||
# need to build these libraries from source.
|
||||
#
|
||||
# Look at the .github/workflows/packages.yml file for hints about how to use it.
|
||||
|
||||
set -euo pipefail
|
||||
set -x
|
||||
|
||||
dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
|
||||
prjdir="$( cd "${dir}/../.." && pwd )"
|
||||
|
||||
# Build all the available versions, or just the ones specified in PYVERS
|
||||
if [ ! "${PYVERS:-}" ]; then
|
||||
PYVERS="$(ls /opt/python/)"
|
||||
fi
|
||||
|
||||
# Find psycopg version
|
||||
version=$(grep -e ^PSYCOPG_VERSION "${prjdir}/setup.py" | sed "s/.*'\(.*\)'/\1/")
|
||||
# A gratuitous comment to fix broken vim syntax file: '")
|
||||
distdir="${prjdir}/dist/psycopg2-$version"
|
||||
|
||||
# Replace the package name
|
||||
if [[ "${PACKAGE_NAME:-}" ]]; then
|
||||
sed -i "s/^setup(name=\"psycopg2\"/setup(name=\"${PACKAGE_NAME}\"/" \
|
||||
"${prjdir}/setup.py"
|
||||
fi
|
||||
|
||||
# Build depending libraries
|
||||
"${dir}/build_libpq.sh" > /dev/null
|
||||
|
||||
# Create the wheel packages
|
||||
for pyver in $PYVERS; do
|
||||
pybin="/opt/python/${pyver}/bin"
|
||||
"${pybin}/pip" wheel "${prjdir}" -w "${prjdir}/dist/"
|
||||
done
|
||||
|
||||
# Bundle external shared libraries into the wheels
|
||||
for whl in "${prjdir}"/dist/*.whl; do
|
||||
"${dir}/strip_wheel.sh" "$whl"
|
||||
auditwheel repair "$whl" -w "$distdir"
|
||||
done
|
||||
|
||||
# Make sure the libpq is not in the system
|
||||
for f in $(find /usr/local/lib -name libpq\*) ; do
|
||||
mkdir -pv "/libpqbak/$(dirname $f)"
|
||||
mv -v "$f" "/libpqbak/$(dirname $f)"
|
||||
done
|
||||
|
||||
# Install packages and test
|
||||
cd "${prjdir}"
|
||||
for pyver in $PYVERS; do
|
||||
pybin="/opt/python/${pyver}/bin"
|
||||
"${pybin}/pip" install ${PACKAGE_NAME:-psycopg2} --no-index -f "$distdir"
|
||||
|
||||
# Print psycopg and libpq versions
|
||||
"${pybin}/python" -c "import psycopg2; print(psycopg2.__version__)"
|
||||
"${pybin}/python" -c "import psycopg2; print(psycopg2.__libpq_version__)"
|
||||
"${pybin}/python" -c "import psycopg2; print(psycopg2.extensions.libpq_version())"
|
||||
|
||||
# Fail if we are not using the expected libpq library
|
||||
if [[ "${WANT_LIBPQ:-}" ]]; then
|
||||
"${pybin}/python" -c "import psycopg2, sys; sys.exit(${WANT_LIBPQ} != psycopg2.extensions.libpq_version())"
|
||||
fi
|
||||
|
||||
"${pybin}/python" -c "import tests; tests.unittest.main(defaultTest='tests.test_suite')"
|
||||
done
|
||||
|
||||
# Restore the libpq packages
|
||||
for f in $(cd /libpqbak/ && find . -not -type d); do
|
||||
mv -v "/libpqbak/$f" "/$f"
|
||||
done
|
||||
76
scripts/build/build_manylinux_2_24.sh
Executable file
76
scripts/build/build_manylinux_2_24.sh
Executable file
|
|
@ -0,0 +1,76 @@
|
|||
#!/bin/bash
|
||||
|
||||
# Create manylinux_2_24 wheels for psycopg2
|
||||
#
|
||||
# Look at the .github/workflows/packages.yml file for hints about how to use it.
|
||||
|
||||
set -euo pipefail
|
||||
set -x
|
||||
|
||||
dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
|
||||
prjdir="$( cd "${dir}/../.." && pwd )"
|
||||
|
||||
# Build all the available versions, or just the ones specified in PYVERS
|
||||
if [ ! "${PYVERS:-}" ]; then
|
||||
PYVERS="$(ls /opt/python/)"
|
||||
fi
|
||||
|
||||
# Find psycopg version
|
||||
version=$(grep -e ^PSYCOPG_VERSION "${prjdir}/setup.py" | sed "s/.*'\(.*\)'/\1/")
|
||||
# A gratuitous comment to fix broken vim syntax file: '")
|
||||
distdir="${prjdir}/dist/psycopg2-$version"
|
||||
|
||||
# Replace the package name
|
||||
if [[ "${PACKAGE_NAME:-}" ]]; then
|
||||
sed -i "s/^setup(name=\"psycopg2\"/setup(name=\"${PACKAGE_NAME}\"/" \
|
||||
"${prjdir}/setup.py"
|
||||
fi
|
||||
|
||||
# Install prerequisite libraries
|
||||
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
|
||||
apt-get install -y libpq-dev
|
||||
|
||||
# Create the wheel packages
|
||||
for pyver in $PYVERS; do
|
||||
pybin="/opt/python/${pyver}/bin"
|
||||
"${pybin}/pip" wheel "${prjdir}" -w "${prjdir}/dist/"
|
||||
done
|
||||
|
||||
# Bundle external shared libraries into the wheels
|
||||
for whl in "${prjdir}"/dist/*.whl; do
|
||||
"${dir}/strip_wheel.sh" "$whl"
|
||||
auditwheel repair "$whl" -w "$distdir"
|
||||
done
|
||||
|
||||
# Make sure the libpq is not in the system
|
||||
for f in $(find /usr/lib /usr/lib64 -name libpq\*) ; do
|
||||
mkdir -pv "/libpqbak/$(dirname $f)"
|
||||
mv -v "$f" "/libpqbak/$(dirname $f)"
|
||||
done
|
||||
|
||||
# Install packages and test
|
||||
cd "${prjdir}"
|
||||
for pyver in $PYVERS; do
|
||||
pybin="/opt/python/${pyver}/bin"
|
||||
"${pybin}/pip" install ${PACKAGE_NAME:-psycopg2} --no-index -f "$distdir"
|
||||
|
||||
# Print psycopg and libpq versions
|
||||
"${pybin}/python" -c "import psycopg2; print(psycopg2.__version__)"
|
||||
"${pybin}/python" -c "import psycopg2; print(psycopg2.__libpq_version__)"
|
||||
"${pybin}/python" -c "import psycopg2; print(psycopg2.extensions.libpq_version())"
|
||||
|
||||
# Fail if we are not using the expected libpq library
|
||||
if [[ "${WANT_LIBPQ:-}" ]]; then
|
||||
"${pybin}/python" -c "import psycopg2, sys; sys.exit(${WANT_LIBPQ} != psycopg2.extensions.libpq_version())"
|
||||
fi
|
||||
|
||||
"${pybin}/python" -c "import tests; tests.unittest.main(defaultTest='tests.test_suite')"
|
||||
done
|
||||
|
||||
# Restore the libpq packages
|
||||
for f in $(cd /libpqbak/ && find . -not -type d); do
|
||||
mv -v "/libpqbak/$f" "/$f"
|
||||
done
|
||||
68
scripts/build/build_musllinux_1_1.sh
Executable file
68
scripts/build/build_musllinux_1_1.sh
Executable file
|
|
@ -0,0 +1,68 @@
|
|||
#!/bin/bash
|
||||
|
||||
# Create musllinux_1_1 wheels for psycopg2
|
||||
#
|
||||
# Look at the .github/workflows/packages.yml file for hints about how to use it.
|
||||
|
||||
set -euo pipefail
|
||||
set -x
|
||||
|
||||
dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
|
||||
prjdir="$( cd "${dir}/../.." && pwd )"
|
||||
|
||||
# Build all the available versions, or just the ones specified in PYVERS
|
||||
if [ ! "${PYVERS:-}" ]; then
|
||||
PYVERS="$(ls /opt/python/)"
|
||||
fi
|
||||
|
||||
# Find psycopg version
|
||||
version=$(grep -e ^PSYCOPG_VERSION "${prjdir}/setup.py" | sed "s/.*'\(.*\)'/\1/")
|
||||
# A gratuitous comment to fix broken vim syntax file: '")
|
||||
distdir="${prjdir}/dist/psycopg2-$version"
|
||||
|
||||
# Replace the package name
|
||||
if [[ "${PACKAGE_NAME:-}" ]]; then
|
||||
sed -i "s/^setup(name=\"psycopg2\"/setup(name=\"${PACKAGE_NAME}\"/" \
|
||||
"${prjdir}/setup.py"
|
||||
fi
|
||||
|
||||
# Install prerequisite libraries
|
||||
apk update
|
||||
apk add postgresql-dev
|
||||
# Add findutils because the Busybox version lacks the `-ls` flag, used by the
|
||||
# `strip_wheel.sh` script.
|
||||
apk add findutils
|
||||
|
||||
# Create the wheel packages
|
||||
for pyver in $PYVERS; do
|
||||
pybin="/opt/python/${pyver}/bin"
|
||||
"${pybin}/python" -m build -w -o "${prjdir}/dist/" "${prjdir}"
|
||||
done
|
||||
|
||||
# Bundle external shared libraries into the wheels
|
||||
for whl in "${prjdir}"/dist/*.whl; do
|
||||
"${dir}/strip_wheel.sh" "$whl"
|
||||
auditwheel repair "$whl" -w "$distdir"
|
||||
done
|
||||
|
||||
# Make sure the postgresql-dev is not in the system
|
||||
apk del postgresql-dev
|
||||
|
||||
# Install packages and test
|
||||
cd "${prjdir}"
|
||||
for pyver in $PYVERS; do
|
||||
pybin="/opt/python/${pyver}/bin"
|
||||
"${pybin}/pip" install ${PACKAGE_NAME:-psycopg2} --no-index -f "$distdir"
|
||||
|
||||
# Print psycopg and libpq versions
|
||||
"${pybin}/python" -c "import psycopg2; print(psycopg2.__version__)"
|
||||
"${pybin}/python" -c "import psycopg2; print(psycopg2.__libpq_version__)"
|
||||
"${pybin}/python" -c "import psycopg2; print(psycopg2.extensions.libpq_version())"
|
||||
|
||||
# Fail if we are not using the expected libpq library
|
||||
if [[ "${WANT_LIBPQ:-}" ]]; then
|
||||
"${pybin}/python" -c "import psycopg2, sys; sys.exit(${WANT_LIBPQ} != psycopg2.extensions.libpq_version())"
|
||||
fi
|
||||
|
||||
"${pybin}/python" -c "import tests; tests.unittest.main(defaultTest='tests.test_suite')"
|
||||
done
|
||||
|
|
@ -9,7 +9,7 @@ prjdir="$( cd "${dir}/../.." && pwd )"
|
|||
# Find psycopg version
|
||||
version=$(grep -e ^PSYCOPG_VERSION setup.py | sed "s/.*'\(.*\)'/\1/")
|
||||
# A gratuitous comment to fix broken vim syntax file: '")
|
||||
distdir="${prjdir}/dist"
|
||||
distdir="${prjdir}/dist/psycopg2-$version"
|
||||
|
||||
# Replace the package name
|
||||
if [[ "${PACKAGE_NAME:-}" ]]; then
|
||||
|
|
|
|||
117
scripts/build/download_packages_appveyor.py
Executable file
117
scripts/build/download_packages_appveyor.py
Executable file
|
|
@ -0,0 +1,117 @@
|
|||
#!/usr/bin/env python
|
||||
"""Download packages from appveyor artifacts
|
||||
"""
|
||||
|
||||
import os
|
||||
import re
|
||||
import sys
|
||||
import logging
|
||||
import datetime as dt
|
||||
from pathlib import Path
|
||||
from argparse import ArgumentParser
|
||||
|
||||
import requests
|
||||
|
||||
logger = logging.getLogger()
|
||||
logging.basicConfig(level=logging.INFO, format="%(asctime)s %(levelname)s %(message)s")
|
||||
|
||||
API_URL = "https://ci.appveyor.com/api"
|
||||
REPOS = "psycopg/psycopg2"
|
||||
WORKFLOW_NAME = "Build packages"
|
||||
|
||||
|
||||
class ScriptError(Exception):
|
||||
"""Controlled exception raised by the script."""
|
||||
|
||||
|
||||
def main():
|
||||
opt = parse_cmdline()
|
||||
try:
|
||||
token = os.environ["APPVEYOR_TOKEN"]
|
||||
except KeyError:
|
||||
raise ScriptError("please set a APPVEYOR_TOKEN to download artifacts")
|
||||
|
||||
s = requests.Session()
|
||||
s.headers["Content-Type"] = "application/json"
|
||||
s.headers["Authorization"] = f"Bearer {token}"
|
||||
|
||||
if opt.build:
|
||||
logger.info("fetching build %s", opt.build)
|
||||
resp = s.get(f"{API_URL}/projects/{REPOS}/build/{opt.build}")
|
||||
else:
|
||||
logger.info("fetching last run")
|
||||
resp = s.get(f"{API_URL}/projects/{REPOS}")
|
||||
|
||||
resp.raise_for_status()
|
||||
data = resp.json()
|
||||
|
||||
updated_at = dt.datetime.fromisoformat(
|
||||
re.sub(r"\.\d+", "", data["build"]["finished"])
|
||||
)
|
||||
now = dt.datetime.now(dt.timezone.utc)
|
||||
age = now - updated_at
|
||||
logger.info(
|
||||
f"found build {data['build']['version']} updated {pretty_interval(age)} ago"
|
||||
)
|
||||
if age > dt.timedelta(hours=6):
|
||||
logger.warning("maybe it's a bit old?")
|
||||
|
||||
jobs = data["build"]["jobs"]
|
||||
for job in jobs:
|
||||
if job["status"] != "success":
|
||||
raise ScriptError(f"status for job {job['jobId']} is {job['status']}")
|
||||
|
||||
logger.info(f"fetching artifacts info for {job['name']}")
|
||||
resp = s.get(f"{API_URL}/buildjobs/{job['jobId']}/artifacts/")
|
||||
resp.raise_for_status()
|
||||
afs = resp.json()
|
||||
for af in afs:
|
||||
fn = af["fileName"]
|
||||
if fn.startswith("dist/"):
|
||||
fn = fn.split("/", 1)[1]
|
||||
dest = Path("wheelhouse") / fn
|
||||
logger.info(f"downloading {dest}")
|
||||
resp = s.get(
|
||||
f"{API_URL}/buildjobs/{job['jobId']}/artifacts/{af['fileName']}"
|
||||
)
|
||||
resp.raise_for_status()
|
||||
if not dest.parent.exists():
|
||||
dest.parent.mkdir(parents=True)
|
||||
|
||||
with dest.open("wb") as f:
|
||||
f.write(resp.content)
|
||||
|
||||
logger.info("now you can run: 'twine upload -s wheelhouse/*'")
|
||||
|
||||
|
||||
def parse_cmdline():
|
||||
parser = ArgumentParser(description=__doc__)
|
||||
parser.add_argument("--build", help="build version to download [default: latest]")
|
||||
opt = parser.parse_args()
|
||||
return opt
|
||||
|
||||
|
||||
def pretty_interval(td):
|
||||
secs = td.total_seconds()
|
||||
mins, secs = divmod(secs, 60)
|
||||
hours, mins = divmod(mins, 60)
|
||||
days, hours = divmod(hours, 24)
|
||||
if days:
|
||||
return f"{int(days)} days, {int(hours)} hours, {int(mins)} minutes"
|
||||
elif hours:
|
||||
return f"{int(hours)} hours, {int(mins)} minutes"
|
||||
else:
|
||||
return f"{int(mins)} minutes"
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
try:
|
||||
sys.exit(main())
|
||||
|
||||
except ScriptError as e:
|
||||
logger.error("%s", e)
|
||||
sys.exit(1)
|
||||
|
||||
except KeyboardInterrupt:
|
||||
logger.info("user interrupt")
|
||||
sys.exit(1)
|
||||
99
scripts/build/download_packages_github.py
Executable file
99
scripts/build/download_packages_github.py
Executable file
|
|
@ -0,0 +1,99 @@
|
|||
#!/usr/bin/env python
|
||||
"""Download packages from github actions artifacts
|
||||
"""
|
||||
|
||||
import io
|
||||
import os
|
||||
import sys
|
||||
import logging
|
||||
import datetime as dt
|
||||
from pathlib import Path
|
||||
from zipfile import ZipFile
|
||||
|
||||
import requests
|
||||
|
||||
logger = logging.getLogger()
|
||||
logging.basicConfig(level=logging.INFO, format="%(asctime)s %(levelname)s %(message)s")
|
||||
|
||||
REPOS = "psycopg/psycopg2"
|
||||
WORKFLOW_NAME = "Build packages"
|
||||
|
||||
|
||||
class ScriptError(Exception):
|
||||
"""Controlled exception raised by the script."""
|
||||
|
||||
|
||||
def main():
|
||||
try:
|
||||
token = os.environ["GITHUB_TOKEN"]
|
||||
except KeyError:
|
||||
raise ScriptError("please set a GITHUB_TOKEN to download artifacts")
|
||||
|
||||
s = requests.Session()
|
||||
s.headers["Accept"] = "application/vnd.github.v3+json"
|
||||
s.headers["Authorization"] = f"token {token}"
|
||||
|
||||
logger.info("looking for recent runs")
|
||||
resp = s.get(f"https://api.github.com/repos/{REPOS}/actions/runs?per_page=10")
|
||||
resp.raise_for_status()
|
||||
for run in resp.json()["workflow_runs"]:
|
||||
if run["name"] == WORKFLOW_NAME:
|
||||
break
|
||||
else:
|
||||
raise ScriptError(f"couldn't find {WORKFLOW_NAME!r} in recent runs")
|
||||
|
||||
if run["status"] != "completed":
|
||||
raise ScriptError(f"run #{run['run_number']} is in status {run['status']}")
|
||||
|
||||
updated_at = dt.datetime.fromisoformat(run["updated_at"].replace("Z", "+00:00"))
|
||||
now = dt.datetime.now(dt.timezone.utc)
|
||||
age = now - updated_at
|
||||
logger.info(f"found run #{run['run_number']} updated {pretty_interval(age)} ago")
|
||||
if age > dt.timedelta(hours=6):
|
||||
logger.warning("maybe it's a bit old?")
|
||||
|
||||
logger.info(f"looking for run #{run['run_number']} artifacts")
|
||||
resp = s.get(f"{run['url']}/artifacts")
|
||||
resp.raise_for_status()
|
||||
artifacts = resp.json()["artifacts"]
|
||||
|
||||
dest = Path("wheelhouse")
|
||||
if not dest.exists():
|
||||
logger.info(f"creating dir {dest}")
|
||||
dest.mkdir(parents=True)
|
||||
|
||||
for artifact in artifacts:
|
||||
logger.info(f"downloading {artifact['name']} archive")
|
||||
zip_url = artifact["archive_download_url"]
|
||||
resp = s.get(zip_url)
|
||||
with ZipFile(io.BytesIO(resp.content)) as zf:
|
||||
logger.info("extracting archive content")
|
||||
zf.extractall(dest)
|
||||
|
||||
logger.info(f"now you can run: 'twine upload -s {dest}/*'")
|
||||
|
||||
|
||||
def pretty_interval(td):
|
||||
secs = td.total_seconds()
|
||||
mins, secs = divmod(secs, 60)
|
||||
hours, mins = divmod(mins, 60)
|
||||
days, hours = divmod(hours, 24)
|
||||
if days:
|
||||
return f"{int(days)} days, {int(hours)} hours, {int(mins)} minutes"
|
||||
elif hours:
|
||||
return f"{int(hours)} hours, {int(mins)} minutes"
|
||||
else:
|
||||
return f"{int(mins)} minutes"
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
try:
|
||||
sys.exit(main())
|
||||
|
||||
except ScriptError as e:
|
||||
logger.error("%s", e)
|
||||
sys.exit(1)
|
||||
|
||||
except KeyboardInterrupt:
|
||||
logger.info("user interrupt")
|
||||
sys.exit(1)
|
||||
|
|
@ -1,101 +0,0 @@
|
|||
#!/usr/bin/env python
|
||||
"""
|
||||
We use vcpkg in github actions to build psycopg-binary.
|
||||
|
||||
This is a stub to work as `pg_config --libdir` or `pg_config --includedir` to
|
||||
make it work with vcpkg.
|
||||
|
||||
You will need install `vcpkg`, set `VCPKG_ROOT` env, and run `vcpkg install
|
||||
libpq:x64-windows-release` before using this script.
|
||||
"""
|
||||
|
||||
import os
|
||||
import sys
|
||||
import platform
|
||||
from pathlib import Path
|
||||
from argparse import ArgumentParser, Namespace, RawDescriptionHelpFormatter
|
||||
|
||||
|
||||
class ScriptError(Exception):
|
||||
"""Controlled exception raised by the script."""
|
||||
|
||||
|
||||
def _main() -> None:
|
||||
# only x64-windows
|
||||
if not (sys.platform == "win32" and platform.machine() == "AMD64"):
|
||||
raise ScriptError("this script should only be used in x64-windows")
|
||||
|
||||
vcpkg_root = os.environ.get(
|
||||
"VCPKG_ROOT", os.environ.get("VCPKG_INSTALLATION_ROOT", "")
|
||||
)
|
||||
if not vcpkg_root:
|
||||
raise ScriptError("VCPKG_ROOT/VCPKG_INSTALLATION_ROOT env var not specified")
|
||||
vcpkg_platform_root = (Path(vcpkg_root) / "installed/x64-windows-release").resolve()
|
||||
|
||||
args = parse_cmdline()
|
||||
|
||||
if args.libdir:
|
||||
if not (f := vcpkg_platform_root / "lib/libpq.lib").exists():
|
||||
raise ScriptError(f"libpq library not found: {f}")
|
||||
print(vcpkg_platform_root.joinpath("lib"))
|
||||
|
||||
elif args.includedir or args.includedir_server:
|
||||
# NOTE: on linux, the includedir-server dir contains pg_config.h
|
||||
# which we need because it includes the PG_VERSION_NUM macro.
|
||||
# In the vcpkg directory this file is in the includedir directory,
|
||||
# therefore we return the same value.
|
||||
if not (d := vcpkg_platform_root / "include/libpq").is_dir():
|
||||
raise ScriptError(f"libpq include directory not found: {d}")
|
||||
print(vcpkg_platform_root.joinpath("include"))
|
||||
|
||||
elif args.cppflags or args.ldflags:
|
||||
print("")
|
||||
|
||||
else:
|
||||
raise ScriptError("command not handled")
|
||||
|
||||
|
||||
def parse_cmdline() -> Namespace:
|
||||
parser = ArgumentParser(
|
||||
description=__doc__, formatter_class=RawDescriptionHelpFormatter
|
||||
)
|
||||
g = parser.add_mutually_exclusive_group(required=True)
|
||||
g.add_argument(
|
||||
"--libdir",
|
||||
action="store_true",
|
||||
help="show location of object code libraries",
|
||||
)
|
||||
g.add_argument(
|
||||
"--includedir",
|
||||
action="store_true",
|
||||
help="show location of C header files of the client interfaces",
|
||||
)
|
||||
g.add_argument(
|
||||
"--includedir-server",
|
||||
action="store_true",
|
||||
help="show location of C header files for the server",
|
||||
)
|
||||
g.add_argument(
|
||||
"--cppflags",
|
||||
action="store_true",
|
||||
help="(dummy) show CPPFLAGS value used when PostgreSQL was built",
|
||||
)
|
||||
g.add_argument(
|
||||
"--ldflags",
|
||||
action="store_true",
|
||||
help="(dummy) show LDFLAGS value used when PostgreSQL was built",
|
||||
)
|
||||
opt = parser.parse_args()
|
||||
return opt
|
||||
|
||||
|
||||
def main() -> None:
|
||||
try:
|
||||
_main()
|
||||
except ScriptError as e:
|
||||
print(f"ERROR: {e}.", file=sys.stderr)
|
||||
sys.exit(1)
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
main()
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
[build-system]
|
||||
requires = ["setuptools"]
|
||||
build-backend = "setuptools.build_meta"
|
||||
|
||||
[project]
|
||||
name = 'pg_config_vcpkg_stub'
|
||||
version = "0"
|
||||
description = "see docs string in pg_config_vcpkg_stub for more details"
|
||||
|
||||
[project.scripts]
|
||||
pg_config = 'pg_config_vcpkg_stub:main'
|
||||
|
|
@ -1,37 +0,0 @@
|
|||
#!/bin/bash
|
||||
|
||||
# Take a .so file as input and print the Debian packages and versions of the
|
||||
# libraries it links.
|
||||
|
||||
set -euo pipefail
|
||||
# set -x
|
||||
|
||||
source /etc/os-release
|
||||
|
||||
sofile="$1"
|
||||
|
||||
case "$ID" in
|
||||
alpine)
|
||||
depfiles=$( (ldd "$sofile" 2>/dev/null || true) | grep '=>' | sed 's/.*=> \(.*\) (.*)/\1/')
|
||||
(for depfile in $depfiles; do
|
||||
echo "$(basename "$depfile") => $(apk info --who-owns "${depfile}" | awk '{print $(NF)}')"
|
||||
done) | sort | uniq
|
||||
;;
|
||||
|
||||
debian)
|
||||
depfiles=$(ldd "$sofile" | grep '=>' | sed 's/.*=> \(.*\) (.*)/\1/')
|
||||
(for depfile in $depfiles; do
|
||||
pkgname=$(dpkg -S "${depfile}" | sed 's/\(\): .*/\1/')
|
||||
dpkg -l "${pkgname}" | grep '^ii' | awk '{print $2 " => " $3}'
|
||||
done) | sort | uniq
|
||||
;;
|
||||
|
||||
centos)
|
||||
echo "TODO!"
|
||||
;;
|
||||
|
||||
*)
|
||||
echo "$0: unexpected Linux distribution: '$ID'" >&2
|
||||
exit 1
|
||||
;;
|
||||
esac
|
||||
|
|
@ -5,61 +5,36 @@
|
|||
# This script is designed to run on a local machine: it will clone the repos
|
||||
# remotely and execute the `build_macos_arm64.sh` script remotely, then will
|
||||
# download the built packages. A tag to build must be specified.
|
||||
|
||||
# The script requires a Scaleway secret key in the SCW_SECRET_KEY env var:
|
||||
# It will use scaleway_m1.sh to provision a server and use it.
|
||||
#
|
||||
# In order to run the script, the `m1` host must be specified in
|
||||
# `~/.ssh/config`; for instance:
|
||||
#
|
||||
# Host m1
|
||||
# User m1
|
||||
# HostName 1.2.3.4
|
||||
|
||||
set -euo pipefail
|
||||
# set -x
|
||||
|
||||
function log {
|
||||
echo "$@" >&2
|
||||
}
|
||||
function error {
|
||||
# Print an error message and exit.
|
||||
log "ERROR: $@"
|
||||
exit 1
|
||||
}
|
||||
|
||||
tag=${1:-}
|
||||
|
||||
if [[ ! "${tag}" ]]; then
|
||||
error "Usage: $0 REF"
|
||||
echo "Usage: $0 TAG" >&2
|
||||
exit 2
|
||||
fi
|
||||
|
||||
dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
||||
|
||||
server=$("${dir}/scaleway_m1.sh" ensure)
|
||||
|
||||
status=$(echo "$server" | jq -r .status)
|
||||
if [[ "$status" != "ready" ]]; then
|
||||
error "server status is $status"
|
||||
fi
|
||||
|
||||
# Get user, password, ip from vnc url
|
||||
tmp=$(echo "$server" | jq -r .vnc_url) # vnc://m1:PASS@1.2.3.4:5900
|
||||
tmp=${tmp/vnc:\/\//} # m1:PASS@1.2.3.4:5900
|
||||
user=${tmp%%:*} # m1
|
||||
tmp=${tmp#*:} # PASS@1.2.3.4:5900
|
||||
password=${tmp%%@*} # PASS
|
||||
tmp=${tmp#*@} # 1.2.3.4:5900
|
||||
host=${tmp%%:*} # 1.2.3.4
|
||||
|
||||
ssh="ssh ${user}@${host} -o StrictHostKeyChecking=no"
|
||||
|
||||
# Allow the user to sudo without asking for password.
|
||||
echo "$password" | \
|
||||
$ssh sh -c "test -f /etc/sudoers.d/${user} \
|
||||
|| sudo -S --prompt= sh -c \
|
||||
'echo \"${user} ALL=(ALL) NOPASSWD:ALL\" > /etc/sudoers.d/${user}'"
|
||||
rdir=psycobuild
|
||||
|
||||
# Clone the repos
|
||||
rdir=psycobuild
|
||||
$ssh rm -rf "${rdir}"
|
||||
$ssh git clone https://github.com/psycopg/psycopg2.git --branch ${tag} "${rdir}"
|
||||
ssh m1 rm -rf "${rdir}"
|
||||
ssh m1 git clone https://github.com/psycopg/psycopg2.git --branch ${tag} "${rdir}"
|
||||
|
||||
# Allow sudoing without password, to allow brew to install
|
||||
ssh -t m1 bash -c \
|
||||
'test -f /etc/sudoers.d/m1 || echo "m1 ALL=(ALL) NOPASSWD:ALL" | sudo tee /etc/sudoers.d/m1'
|
||||
|
||||
# Build the wheel packages
|
||||
$ssh "${rdir}/scripts/build/build_macos_arm64.sh"
|
||||
ssh m1 "${rdir}/scripts/build/build_macos_arm64.sh"
|
||||
|
||||
# Transfer the packages locally
|
||||
scp -r "${user}@${host}:${rdir}/wheelhouse" .
|
||||
scp -r "m1:${rdir}/wheelhouse" .
|
||||
|
|
|
|||
|
|
@ -1,119 +0,0 @@
|
|||
#!/bin/bash
|
||||
|
||||
# Implement the following commands:
|
||||
#
|
||||
# ensure:
|
||||
#
|
||||
# Get data about currently provisioned M1 server on Scaleway. If needed,
|
||||
# provision one.
|
||||
#
|
||||
# The script requires the SCW_SECRET_KEY env var set to a valid secret.
|
||||
#
|
||||
# If successful, return the response data on stdout. It may look like:
|
||||
#
|
||||
# {
|
||||
# "id": "8b196119-3cea-4a9d-b916-265037a85e60",
|
||||
# "type": "M1-M",
|
||||
# "name": "mac-m1-psycopg",
|
||||
# "project_id": "4cf7a85e-f21e-40d4-b758-21d1f4ad3dfb",
|
||||
# "organization_id": "4cf7a85e-f21e-40d4-b758-21d1f4ad3dfb",
|
||||
# "ip": "1.2.3.4",
|
||||
# "vnc_url": "vnc://m1:PASSWORD@1.2.3.4:5900",
|
||||
# "status": "starting",
|
||||
# "created_at": "2023-09-22T18:00:18.754646Z",
|
||||
# "updated_at": "2023-09-22T18:00:18.754646Z",
|
||||
# "deletable_at": "2023-09-23T18:00:18.754646Z",
|
||||
# "zone": "fr-par-3"
|
||||
# }
|
||||
#
|
||||
# delete:
|
||||
#
|
||||
# Delete one provisioned server, if available.
|
||||
#
|
||||
# See https://www.scaleway.com/en/developers/api/apple-silicon/ for api docs.
|
||||
|
||||
set -euo pipefail
|
||||
# set -x
|
||||
|
||||
project_id="4cf7a85e-f21e-40d4-b758-21d1f4ad3dfb"
|
||||
zone=fr-par-3
|
||||
servers_url="https://api.scaleway.com/apple-silicon/v1alpha1/zones/${zone}/servers"
|
||||
|
||||
function log {
|
||||
echo "$@" >&2
|
||||
}
|
||||
function error {
|
||||
log "ERROR: $@"
|
||||
exit 1
|
||||
}
|
||||
|
||||
function req {
|
||||
method=$1
|
||||
shift
|
||||
curl -sSL --fail-with-body -X $method \
|
||||
-H "Content-Type: application/json" \
|
||||
-H "X-Auth-Token: ${SCW_SECRET_KEY}" \
|
||||
"$@"
|
||||
}
|
||||
function get {
|
||||
req GET "$@"
|
||||
}
|
||||
function post {
|
||||
req POST "$@"
|
||||
}
|
||||
function delete {
|
||||
req DELETE "$@"
|
||||
}
|
||||
|
||||
function server_id {
|
||||
# Return the id of the first server available, else the empty string
|
||||
servers=$(get $servers_url || error "failed to request servers list")
|
||||
server_ids=$(echo "$servers" | jq -r ".servers[].id")
|
||||
for id in $server_ids; do
|
||||
echo $id
|
||||
break
|
||||
done
|
||||
}
|
||||
|
||||
function maybe_jq {
|
||||
# Process the output via jq if displaying on console, otherwise leave
|
||||
# it unprocessed.
|
||||
if [ -t 1 ]; then
|
||||
jq .
|
||||
else
|
||||
cat
|
||||
fi
|
||||
}
|
||||
|
||||
cmd=${1:-list}
|
||||
case $cmd in
|
||||
ensure)
|
||||
id=$(server_id)
|
||||
if [[ "$id" ]]; then
|
||||
log "You have servers."
|
||||
get "$servers_url/$id" | maybe_jq
|
||||
else
|
||||
log "Creating new server."
|
||||
post $servers_url -d "
|
||||
{
|
||||
\"name\": \"mac-m1-psycopg\",
|
||||
\"project_id\": \"$project_id\",
|
||||
\"type\": \"M1-M\"
|
||||
}" | maybe_jq
|
||||
fi
|
||||
;;
|
||||
delete)
|
||||
id=$(server_id)
|
||||
if [[ "$id" ]]; then
|
||||
log "Deleting server $id."
|
||||
delete "$servers_url/$id" | maybe_jq
|
||||
else
|
||||
log "No server found."
|
||||
fi
|
||||
;;
|
||||
list)
|
||||
get $servers_url | maybe_jq
|
||||
;;
|
||||
*)
|
||||
error "Usage: $(basename $0) [list|ensure|delete]"
|
||||
esac
|
||||
|
|
@ -14,36 +14,28 @@
|
|||
# This script is designed to run on a wheel archive before auditwheel.
|
||||
|
||||
set -euo pipefail
|
||||
# set -x
|
||||
|
||||
source /etc/os-release
|
||||
dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
|
||||
set -x
|
||||
|
||||
wheel=$(realpath "$1")
|
||||
shift
|
||||
|
||||
# python or python3?
|
||||
if which python > /dev/null; then
|
||||
py=python
|
||||
else
|
||||
py=python3
|
||||
fi
|
||||
|
||||
tmpdir=$(mktemp -d)
|
||||
trap "rm -r ${tmpdir}" EXIT
|
||||
|
||||
cd "${tmpdir}"
|
||||
python -m zipfile -e "${wheel}" .
|
||||
$py -m zipfile -e "${wheel}" .
|
||||
|
||||
echo "
|
||||
Libs before:"
|
||||
# Busybox doesn't have "find -ls"
|
||||
find . -name \*.so | xargs ls -l
|
||||
find . -name *.so -ls -exec strip "$@" {} \;
|
||||
# Display the size after strip
|
||||
find . -name *.so -ls
|
||||
|
||||
# On Debian, print the package versions libraries come from
|
||||
echo "
|
||||
Dependencies versions of '_psycopg.so' library:"
|
||||
"${dir}/print_so_versions.sh" "$(find . -name \*_psycopg\*.so)"
|
||||
|
||||
find . -name \*.so -exec strip "$@" {} \;
|
||||
|
||||
echo "
|
||||
Libs after:"
|
||||
find . -name \*.so | xargs ls -l
|
||||
|
||||
python -m zipfile -c ${wheel} *
|
||||
$py -m zipfile -c "${wheel}" *
|
||||
|
||||
cd -
|
||||
|
|
|
|||
|
|
@ -1,53 +0,0 @@
|
|||
#!/bin/bash
|
||||
|
||||
# Configure the libraries needed to build wheel packages on linux.
|
||||
# This script is designed to be used by cibuildwheel as CIBW_BEFORE_ALL_LINUX
|
||||
|
||||
set -euo pipefail
|
||||
set -x
|
||||
|
||||
dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
|
||||
prjdir="$( cd "${dir}/../.." && pwd )"
|
||||
|
||||
source /etc/os-release
|
||||
|
||||
# Install PostgreSQL development files.
|
||||
case "$ID" in
|
||||
alpine)
|
||||
"${dir}/build_libpq.sh" > /dev/null
|
||||
;;
|
||||
|
||||
debian)
|
||||
# Note that the pgdg doesn't have an aarch64 repository so wheels are
|
||||
# build with the libpq packaged with Debian 9, which is 9.6.
|
||||
if [ "$AUDITWHEEL_ARCH" != 'aarch64' ]; then
|
||||
echo "deb http://apt.postgresql.org/pub/repos/apt $VERSION_CODENAME-pgdg main" \
|
||||
> /etc/apt/sources.list.d/pgdg.list
|
||||
# TODO: On 2021-11-09 curl fails on 'ppc64le' with:
|
||||
# curl: (60) SSL certificate problem: certificate has expired
|
||||
# Test again later if -k can be removed.
|
||||
curl -skf https://www.postgresql.org/media/keys/ACCC4CF8.asc \
|
||||
> /etc/apt/trusted.gpg.d/postgresql.asc
|
||||
fi
|
||||
|
||||
apt-get update
|
||||
apt-get -y upgrade
|
||||
apt-get -y install libpq-dev
|
||||
;;
|
||||
|
||||
centos)
|
||||
"${dir}/build_libpq.sh" > /dev/null
|
||||
;;
|
||||
|
||||
*)
|
||||
echo "$0: unexpected Linux distribution: '$ID'" >&2
|
||||
exit 1
|
||||
;;
|
||||
esac
|
||||
|
||||
# Replace the package name
|
||||
if [[ "${PACKAGE_NAME:-}" ]]; then
|
||||
sed -i "s/^setup(name=\"psycopg2\"/setup(name=\"${PACKAGE_NAME}\"/" \
|
||||
"${prjdir}/setup.py"
|
||||
fi
|
||||
|
||||
|
|
@ -1,41 +0,0 @@
|
|||
#!/bin/bash
|
||||
|
||||
# Configure the environment needed to build wheel packages on Mac OS.
|
||||
# This script is designed to be used by cibuildwheel as CIBW_BEFORE_ALL_MACOS
|
||||
#
|
||||
# The PG_VERSION env var must be set to a Postgres major version (e.g. 16).
|
||||
|
||||
set -euo pipefail
|
||||
set -x
|
||||
|
||||
dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
|
||||
prjdir="$( cd "${dir}/../.." && pwd )"
|
||||
|
||||
# Build dependency libraries
|
||||
"${prjdir}/scripts/build/build_libpq.sh"
|
||||
|
||||
# Show dependency tree
|
||||
otool -L /tmp/libpq.build/lib/*.dylib
|
||||
|
||||
brew install gnu-sed postgresql@${PG_VERSION}
|
||||
brew link --overwrite postgresql@${PG_VERSION}
|
||||
|
||||
# Start the database for testing
|
||||
brew services start postgresql@${PG_VERSION}
|
||||
|
||||
# Wait for postgres to come up
|
||||
for i in $(seq 10 -1 0); do
|
||||
eval pg_isready && break
|
||||
if [ $i == 0 ]; then
|
||||
echo "PostgreSQL service not ready, giving up"
|
||||
exit 1
|
||||
fi
|
||||
echo "PostgreSQL service not ready, waiting a bit, attempts left: $i"
|
||||
sleep 5
|
||||
done
|
||||
|
||||
# Replace the package name
|
||||
if [[ "${PACKAGE_NAME:-}" ]]; then
|
||||
gsed -i "s/^setup(name=\"psycopg2\"/setup(name=\"${PACKAGE_NAME}\"/" \
|
||||
"${prjdir}/setup.py"
|
||||
fi
|
||||
|
|
@ -1,7 +0,0 @@
|
|||
@echo on
|
||||
|
||||
pip install delvewheel wheel
|
||||
|
||||
vcpkg install libpq:x64-windows-release
|
||||
|
||||
pipx install .\scripts\build\pg_config_vcpkg_stub\
|
||||
|
|
@ -19,7 +19,6 @@ The script can be run at a new PostgreSQL release to refresh the module.
|
|||
|
||||
import re
|
||||
import sys
|
||||
import time
|
||||
from urllib.request import urlopen
|
||||
from collections import defaultdict
|
||||
|
||||
|
|
@ -33,7 +32,8 @@ def main():
|
|||
|
||||
file_start = read_base_file(filename)
|
||||
# If you add a version to the list fix the docs (in errorcodes.rst)
|
||||
classes, errors = fetch_errors("11 12 13 14 15 16 17".split())
|
||||
classes, errors = fetch_errors(
|
||||
'9.1 9.2 9.3 9.4 9.5 9.6 10 11 12 13 14 15'.split())
|
||||
|
||||
disambiguate(errors)
|
||||
|
||||
|
|
@ -90,8 +90,8 @@ def parse_errors_txt(url):
|
|||
|
||||
|
||||
errors_txt_url = \
|
||||
"https://raw.githubusercontent.com/postgres/postgres/refs/heads/%s" \
|
||||
"/src/backend/utils/errcodes.txt"
|
||||
"http://git.postgresql.org/gitweb/?p=postgresql.git;a=blob_plain;" \
|
||||
"f=src/backend/utils/errcodes.txt;hb=%s"
|
||||
|
||||
|
||||
def fetch_errors(versions):
|
||||
|
|
|
|||
|
|
@ -29,7 +29,8 @@ def main():
|
|||
os.path.dirname(__file__), "../psycopg/sqlstate_errors.h")
|
||||
|
||||
# If you add a version to the list fix the docs (in errors.rst)
|
||||
classes, errors = fetch_errors("11 12 13 14 15 16 17".split())
|
||||
classes, errors = fetch_errors(
|
||||
'9.1 9.2 9.3 9.4 9.5 9.6 10 11 12 13 14 15'.split())
|
||||
|
||||
f = open(filename, "w")
|
||||
print("/*\n * Autogenerated by 'scripts/make_errors.py'.\n */\n", file=f)
|
||||
|
|
@ -73,8 +74,8 @@ def parse_errors_txt(url):
|
|||
|
||||
|
||||
errors_txt_url = \
|
||||
"https://raw.githubusercontent.com/postgres/postgres/refs/heads/%s" \
|
||||
"/src/backend/utils/errcodes.txt"
|
||||
"http://git.postgresql.org/gitweb/?p=postgresql.git;a=blob_plain;" \
|
||||
"f=src/backend/utils/errcodes.txt;hb=%s"
|
||||
|
||||
|
||||
def fetch_errors(versions):
|
||||
|
|
|
|||
|
|
@ -19,4 +19,4 @@ static_libpq=0
|
|||
libraries=
|
||||
|
||||
[metadata]
|
||||
license_files = LICENSE
|
||||
license_file = LICENSE
|
||||
|
|
|
|||
71
setup.py
71
setup.py
|
|
@ -29,18 +29,22 @@ for coroutine libraries.
|
|||
|
||||
import os
|
||||
import sys
|
||||
import re
|
||||
import subprocess
|
||||
from setuptools import setup, Extension
|
||||
from distutils.command.build_ext import build_ext
|
||||
from distutils.ccompiler import get_default_compiler
|
||||
from distutils.errors import CompileError
|
||||
|
||||
try:
|
||||
import configparser
|
||||
except ImportError:
|
||||
import ConfigParser as configparser
|
||||
|
||||
# Take a look at https://www.python.org/dev/peps/pep-0440/
|
||||
# for a consistent versioning pattern.
|
||||
|
||||
PSYCOPG_VERSION = '2.9.10'
|
||||
PSYCOPG_VERSION = '2.9.5'
|
||||
|
||||
|
||||
# note: if you are changing the list of supported Python version please fix
|
||||
|
|
@ -51,12 +55,12 @@ Intended Audience :: Developers
|
|||
License :: OSI Approved :: GNU Library or Lesser General Public License (LGPL)
|
||||
Programming Language :: Python
|
||||
Programming Language :: Python :: 3
|
||||
Programming Language :: Python :: 3.6
|
||||
Programming Language :: Python :: 3.7
|
||||
Programming Language :: Python :: 3.8
|
||||
Programming Language :: Python :: 3.9
|
||||
Programming Language :: Python :: 3.10
|
||||
Programming Language :: Python :: 3.11
|
||||
Programming Language :: Python :: 3.12
|
||||
Programming Language :: Python :: 3.13
|
||||
Programming Language :: Python :: 3 :: Only
|
||||
Programming Language :: Python :: Implementation :: CPython
|
||||
Programming Language :: C
|
||||
|
|
@ -101,23 +105,24 @@ For further information please check the 'doc/src/install.rst' file (also at
|
|||
""")
|
||||
sys.exit(1)
|
||||
|
||||
def query(self, attr_name, *, empty_ok=False):
|
||||
def query(self, attr_name):
|
||||
"""Spawn the pg_config executable, querying for the given config
|
||||
name, and return the printed value, sanitized. """
|
||||
try:
|
||||
pg_config_process = subprocess.run(
|
||||
pg_config_process = subprocess.Popen(
|
||||
[self.pg_config_exe, "--" + attr_name],
|
||||
stdin=subprocess.PIPE,
|
||||
stdout=subprocess.PIPE,
|
||||
stderr=subprocess.PIPE)
|
||||
except OSError:
|
||||
raise Warning(
|
||||
f"Unable to find 'pg_config' file in '{self.pg_config_exe}'")
|
||||
if pg_config_process.returncode:
|
||||
err = pg_config_process.stderr.decode(errors='backslashreplace')
|
||||
raise Warning(f"pg_config --{attr_name} failed: {err}")
|
||||
result = pg_config_process.stdout.decode().strip()
|
||||
if not result and not empty_ok:
|
||||
raise Warning(f"pg_config --{attr_name} is empty")
|
||||
pg_config_process.stdin.close()
|
||||
result = pg_config_process.stdout.readline().strip()
|
||||
if not result:
|
||||
raise Warning(pg_config_process.stderr.readline())
|
||||
if not isinstance(result, str):
|
||||
result = result.decode('ascii')
|
||||
return result
|
||||
|
||||
def find_on_path(self, exename, path_directories=None):
|
||||
|
|
@ -157,7 +162,10 @@ For further information please check the 'doc/src/install.rst' file (also at
|
|||
return None
|
||||
|
||||
def _get_pg_config_from_registry(self):
|
||||
try:
|
||||
import winreg
|
||||
except ImportError:
|
||||
import _winreg as winreg
|
||||
|
||||
reg = winreg.ConnectRegistry(None, winreg.HKEY_LOCAL_MACHINE)
|
||||
try:
|
||||
|
|
@ -370,19 +378,43 @@ For further information please check the 'doc/src/install.rst' file (also at
|
|||
self.include_dirs.append(pg_config_helper.query("includedir"))
|
||||
self.include_dirs.append(pg_config_helper.query("includedir-server"))
|
||||
|
||||
# if present, add includedirs from cppflags, libdirs from ldflags
|
||||
tokens = pg_config_helper.query("ldflags", empty_ok=True).split()
|
||||
for token in tokens:
|
||||
# add includedirs from cppflags, libdirs from ldflags
|
||||
for token in pg_config_helper.query("ldflags").split():
|
||||
if token.startswith("-L"):
|
||||
self.library_dirs.append(token[2:])
|
||||
|
||||
tokens = pg_config_helper.query("cppflags", empty_ok=True).split()
|
||||
for token in tokens:
|
||||
for token in pg_config_helper.query("cppflags").split():
|
||||
if token.startswith("-I"):
|
||||
self.include_dirs.append(token[2:])
|
||||
|
||||
# enable lo64 if Python 64 bits
|
||||
if is_py_64():
|
||||
pgversion = pg_config_helper.query("version").split()[1]
|
||||
|
||||
verre = re.compile(
|
||||
r"(\d+)(?:\.(\d+))?(?:(?:\.(\d+))|(devel|(?:alpha|beta|rc)\d+))?")
|
||||
m = verre.match(pgversion)
|
||||
if m:
|
||||
pgmajor, pgminor, pgpatch = m.group(1, 2, 3)
|
||||
# Postgres >= 10 doesn't have pgminor anymore.
|
||||
pgmajor = int(pgmajor)
|
||||
if pgmajor >= 10:
|
||||
pgminor, pgpatch = None, pgminor
|
||||
if pgminor is None or not pgminor.isdigit():
|
||||
pgminor = 0
|
||||
if pgpatch is None or not pgpatch.isdigit():
|
||||
pgpatch = 0
|
||||
pgminor = int(pgminor)
|
||||
pgpatch = int(pgpatch)
|
||||
else:
|
||||
sys.stderr.write(
|
||||
f"Error: could not determine PostgreSQL version from "
|
||||
f"'{pgversion}'")
|
||||
sys.exit(1)
|
||||
|
||||
define_macros.append(("PG_VERSION_NUM", "%d%02d%02d" %
|
||||
(pgmajor, pgminor, pgpatch)))
|
||||
|
||||
# enable lo64 if libpq >= 9.3 and Python 64 bits
|
||||
if (pgmajor, pgminor) >= (9, 3) and is_py_64():
|
||||
define_macros.append(("HAVE_LO64", "1"))
|
||||
|
||||
# Inject the flag in the version string already packed up
|
||||
|
|
@ -524,7 +556,7 @@ setup(name="psycopg2",
|
|||
url="https://psycopg.org/",
|
||||
license="LGPL with exceptions",
|
||||
platforms=["any"],
|
||||
python_requires='>=3.8',
|
||||
python_requires='>=3.6',
|
||||
description=readme.split("\n")[0],
|
||||
long_description="\n".join(readme.split("\n")[2:]).lstrip(),
|
||||
classifiers=[x for x in classifiers.split("\n") if x],
|
||||
|
|
@ -535,7 +567,6 @@ setup(name="psycopg2",
|
|||
ext_modules=ext,
|
||||
project_urls={
|
||||
'Homepage': 'https://psycopg.org/',
|
||||
'Changes': 'https://www.psycopg.org/docs/news.html',
|
||||
'Documentation': 'https://www.psycopg.org/docs/',
|
||||
'Code': 'https://github.com/psycopg/psycopg2',
|
||||
'Issue Tracker': 'https://github.com/psycopg/psycopg2/issues',
|
||||
|
|
|
|||
|
|
@ -504,7 +504,7 @@ class AsyncTests(ConnectingTestCase):
|
|||
raise Exception("Unexpected result from poll: %r", state)
|
||||
polls += 1
|
||||
|
||||
self.assert_(polls >= 5, polls)
|
||||
self.assert_(polls >= 8, polls)
|
||||
|
||||
def test_poll_noop(self):
|
||||
self.conn.poll()
|
||||
|
|
|
|||
|
|
@ -1920,12 +1920,7 @@ class TestConnectionInfo(ConnectingTestCase):
|
|||
self.conn.info.ssl_attribute('wat')
|
||||
|
||||
@skip_before_libpq(9, 5)
|
||||
@skip_after_libpq(16)
|
||||
def test_ssl_attribute(self):
|
||||
# Skip this test even if libpq built == 15, runtime == 16 (see #1619)
|
||||
if ext.libpq_version() >= 160000:
|
||||
return self.skipTest("libpq runtime version == %s" % ext.libpq_version())
|
||||
|
||||
attribs = self.conn.info.ssl_attribute_names
|
||||
self.assert_(attribs)
|
||||
if self.conn.info.ssl_in_use:
|
||||
|
|
|
|||
|
|
@ -152,7 +152,7 @@ class GreenTestCase(ConnectingTestCase):
|
|||
""")
|
||||
|
||||
polls = stub.polls.count(POLL_READ)
|
||||
self.assert_(polls > 6, polls)
|
||||
self.assert_(polls > 8, polls)
|
||||
|
||||
|
||||
class CallbackErrorTestCase(ConnectingTestCase):
|
||||
|
|
|
|||
|
|
@ -18,7 +18,6 @@
|
|||
|
||||
from . import testutils
|
||||
import unittest
|
||||
import sys
|
||||
|
||||
import psycopg2
|
||||
import psycopg2.extras
|
||||
|
|
@ -69,11 +68,6 @@ class NetworkingTestCase(testutils.ConnectingTestCase):
|
|||
self.assertEquals(cur.fetchone()[0], '127.0.0.1/24')
|
||||
|
||||
cur.execute("select %s", [ip.ip_interface('::ffff:102:300/128')])
|
||||
|
||||
# The texual representation of addresses has changed in Python 3.13
|
||||
if sys.version_info >= (3, 13):
|
||||
self.assertEquals(cur.fetchone()[0], '::ffff:1.2.3.0/128')
|
||||
else:
|
||||
self.assertEquals(cur.fetchone()[0], '::ffff:102:300/128')
|
||||
|
||||
@testutils.skip_if_crdb("cidr")
|
||||
|
|
@ -115,11 +109,6 @@ class NetworkingTestCase(testutils.ConnectingTestCase):
|
|||
self.assertEquals(cur.fetchone()[0], '127.0.0.0/24')
|
||||
|
||||
cur.execute("select %s", [ip.ip_network('::ffff:102:300/128')])
|
||||
|
||||
# The texual representation of addresses has changed in Python 3.13
|
||||
if sys.version_info >= (3, 13):
|
||||
self.assertEquals(cur.fetchone()[0], '::ffff:1.2.3.0/128')
|
||||
else:
|
||||
self.assertEquals(cur.fetchone()[0], '::ffff:102:300/128')
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@ from subprocess import Popen
|
|||
from weakref import ref
|
||||
|
||||
import unittest
|
||||
from .testutils import (skip_before_postgres, skip_if_windows,
|
||||
from .testutils import (skip_before_postgres,
|
||||
ConnectingTestCase, skip_copy_if_green, skip_if_crdb, slow, StringIO)
|
||||
|
||||
import psycopg2
|
||||
|
|
@ -330,7 +330,6 @@ class ExceptionsTestCase(ConnectingTestCase):
|
|||
|
||||
class TestExtensionModule(unittest.TestCase):
|
||||
@slow
|
||||
@skip_if_windows
|
||||
def test_import_internal(self):
|
||||
# check that the internal package can be imported "naked"
|
||||
# we may break this property if there is a compelling reason to do so,
|
||||
|
|
|
|||
|
|
@ -23,15 +23,13 @@
|
|||
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
|
||||
# License for more details.
|
||||
|
||||
import os
|
||||
import unittest
|
||||
from collections import deque
|
||||
from functools import partial
|
||||
|
||||
import psycopg2
|
||||
from psycopg2 import extensions
|
||||
from psycopg2.extensions import Notify
|
||||
from .testutils import ConnectingTestCase, skip_if_crdb, skip_if_windows, slow
|
||||
from .testutils import ConnectingTestCase, skip_if_crdb, slow
|
||||
from .testconfig import dsn
|
||||
|
||||
import sys
|
||||
|
|
@ -76,9 +74,7 @@ conn.close()
|
|||
module=psycopg2.__name__,
|
||||
dsn=dsn, sec=sec, name=name, payload=payload))
|
||||
|
||||
env = os.environ.copy()
|
||||
env.pop("PSYCOPG_DEBUG", None)
|
||||
return Popen([sys.executable, '-c', script], stdout=PIPE, env=env)
|
||||
return Popen([sys.executable, '-c', script], stdout=PIPE)
|
||||
|
||||
@slow
|
||||
def test_notifies_received_on_poll(self):
|
||||
|
|
@ -130,52 +126,6 @@ conn.close()
|
|||
self.assertEqual(pid, self.conn.notifies[0][0])
|
||||
self.assertEqual('foo', self.conn.notifies[0][1])
|
||||
|
||||
def _test_notifies_received_on_operation(self, operation, execute_query=True):
|
||||
self.listen('foo')
|
||||
self.conn.commit()
|
||||
if execute_query:
|
||||
self.conn.cursor().execute('select 1;')
|
||||
pid = int(self.notify('foo').communicate()[0])
|
||||
self.assertEqual(0, len(self.conn.notifies))
|
||||
operation()
|
||||
self.assertEqual(1, len(self.conn.notifies))
|
||||
self.assertEqual(pid, self.conn.notifies[0][0])
|
||||
self.assertEqual('foo', self.conn.notifies[0][1])
|
||||
|
||||
@slow
|
||||
@skip_if_windows
|
||||
def test_notifies_received_on_commit(self):
|
||||
self._test_notifies_received_on_operation(self.conn.commit)
|
||||
|
||||
@slow
|
||||
@skip_if_windows
|
||||
def test_notifies_received_on_rollback(self):
|
||||
self._test_notifies_received_on_operation(self.conn.rollback)
|
||||
|
||||
@slow
|
||||
@skip_if_windows
|
||||
def test_notifies_received_on_reset(self):
|
||||
self._test_notifies_received_on_operation(self.conn.reset, execute_query=False)
|
||||
|
||||
@slow
|
||||
@skip_if_windows
|
||||
def test_notifies_received_on_set_session(self):
|
||||
self._test_notifies_received_on_operation(
|
||||
partial(self.conn.set_session, autocommit=True, readonly=True),
|
||||
execute_query=False,
|
||||
)
|
||||
|
||||
@slow
|
||||
@skip_if_windows
|
||||
def test_notifies_received_on_set_client_encoding(self):
|
||||
self._test_notifies_received_on_operation(
|
||||
partial(
|
||||
self.conn.set_client_encoding,
|
||||
'LATIN1' if self.conn.encoding != 'LATIN1' else 'UTF8'
|
||||
),
|
||||
execute_query=False,
|
||||
)
|
||||
|
||||
@slow
|
||||
def test_notify_object(self):
|
||||
self.autocommit(self.conn)
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user