psycopg/psycopg2
1
1
Fork 0
mirror of https://github.com/psycopg/psycopg2.git synced 2025-02-12 07:10:33 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'mr-566'

Browse Source
This commit is contained in:
Daniele Varrazzo 2017-06-16 01:04:27 +01:00
commit 21ee8b62ef
4 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
.appveyor.yml
View File

@ -73,7 +73,7 @@ matrix:
fast_finish: false fast_finish: false
services: services:
- postgresql95 - postgresql96
cache: cache:
# Rebuild cache if following file changes # Rebuild cache if following file changes
@ -115,7 +115,7 @@ init:
# Change PostgreSQL config before service starts to allow > 1 prepared # Change PostgreSQL config before service starts to allow > 1 prepared
# transactions for test cases # transactions for test cases
- ECHO max_prepared_transactions = 10 >> "C:\\Program Files\\PostgreSQL\\9.5\\data\\postgresql.conf" - ECHO max_prepared_transactions = 10 >> "C:\\Program Files\\PostgreSQL\\9.6\\data\\postgresql.conf"
# Repository gets cloned, Cache is restored # Repository gets cloned, Cache is restored
@ -154,8 +154,8 @@ install:
} }
# Download OpenSSL source # Download OpenSSL source
- CD C:\Others - CD C:\Others
- IF NOT EXIST OpenSSL_1_0_2k.zip ( - IF NOT EXIST OpenSSL_1_0_2l.zip (
curl -fsSL -o OpenSSL_1_0_2k.zip https://github.com/openssl/openssl/archive/OpenSSL_1_0_2k.zip curl -fsSL -o OpenSSL_1_0_2l.zip https://github.com/openssl/openssl/archive/OpenSSL_1_0_2l.zip
) )
# To use OpenSSL >= 1.1.0, both libpq and psycopg build environments have # To use OpenSSL >= 1.1.0, both libpq and psycopg build environments have
@ -167,15 +167,15 @@ install:
# - nmake build_libs install_dev # - nmake build_libs install_dev
- IF NOT EXIST %OPENSSLTOP%\lib\ssleay32.lib ( - IF NOT EXIST %OPENSSLTOP%\lib\ssleay32.lib (
CD %BUILD_DIR% && CD %BUILD_DIR% &&
7z x C:\Others\OpenSSL_1_0_2k.zip && 7z x C:\Others\OpenSSL_1_0_2l.zip &&
CD openssl-OpenSSL_1_0_2k && CD openssl-OpenSSL_1_0_2l &&
perl Configure %TARGET% no-asm no-shared no-zlib --prefix=%OPENSSLTOP% --openssldir=%OPENSSLTOP% && perl Configure %TARGET% no-asm no-shared no-zlib --prefix=%OPENSSLTOP% --openssldir=%OPENSSLTOP% &&
CALL ms\%DO% && CALL ms\%DO% &&
nmake -f ms\nt.mak init headers lib && nmake -f ms\nt.mak init headers lib &&
COPY inc32\openssl\*.h %OPENSSLTOP%\include\openssl && COPY inc32\openssl\*.h %OPENSSLTOP%\include\openssl &&
COPY out32\*.lib %OPENSSLTOP%\lib && COPY out32\*.lib %OPENSSLTOP%\lib &&
CD %BASE_DIR% && CD %BASE_DIR% &&
RMDIR /S /Q %BUILD_DIR%\openssl-OpenSSL_1_0_2k RMDIR /S /Q %BUILD_DIR%\openssl-OpenSSL_1_0_2l
) )
# Setup directories for building PostgreSQL librarires # Setup directories for building PostgreSQL librarires
@ -187,19 +187,19 @@ install:
- IF NOT EXIST %PGTOP%\lib MKDIR %PGTOP%\lib - IF NOT EXIST %PGTOP%\lib MKDIR %PGTOP%\lib
# Download PostgreSQL source # Download PostgreSQL source
- CD C:\Others - CD C:\Others
- IF NOT EXIST postgres-REL9_6_2.zip ( - IF NOT EXIST postgres-REL9_6_3.zip (
curl -fsSL -o postgres-REL9_6_2.zip https://github.com/postgres/postgres/archive/REL9_6_2.zip curl -fsSL -o postgres-REL9_6_3.zip https://github.com/postgres/postgres/archive/REL9_6_3.zip
) )
# Setup build config file (config.pl) # Setup build config file (config.pl)
# Build libpgport first # Build libpgport first
# Build libpq # Build libpq
# NOTE: Cannot set and use the same variable inside an IF # NOTE: Cannot set and use the same variable inside an IF
- SET PGBUILD=%BUILD_DIR%\postgres-REL9_6_2 - SET PGBUILD=%BUILD_DIR%\postgres-REL9_6_3
- IF NOT EXIST %PGTOP%\lib\libpq.lib ( - IF NOT EXIST %PGTOP%\lib\libpq.lib (
CD %BUILD_DIR% && CD %BUILD_DIR% &&
7z x C:\Others\postgres-REL9_6_2.zip && 7z x C:\Others\postgres-REL9_6_3.zip &&
CD postgres-REL9_6_2\src\tools\msvc && CD postgres-REL9_6_3\src\tools\msvc &&
ECHO $config-^>{ldap} = 0; > config.pl && ECHO $config-^>{ldap} = 0; > config.pl &&
ECHO $config-^>{openssl} = "%OPENSSLTOP:\=\\%"; >> config.pl && ECHO $config-^>{openssl} = "%OPENSSLTOP:\=\\%"; >> config.pl &&
ECHO.>> config.pl && ECHO.>> config.pl &&
@ -221,7 +221,7 @@ build: off
build_script: build_script:
# Add PostgreSQL binaries to the path # Add PostgreSQL binaries to the path
- PATH=C:\Program Files\PostgreSQL\9.5\bin\;%PATH% - PATH=C:\Program Files\PostgreSQL\9.6\bin\;%PATH%
- CD C:\Project - CD C:\Project
- "%PYTHON%\\python.exe setup.py build_ext --have-ssl -l libpgcommon -L %OPENSSLTOP%\\lib;%PGTOP%\\lib -I %OPENSSLTOP%\\include;%PGTOP%\\include" - "%PYTHON%\\python.exe setup.py build_ext --have-ssl -l libpgcommon -L %OPENSSLTOP%\\lib;%PGTOP%\\lib -I %OPENSSLTOP%\\include;%PGTOP%\\include"
- "%PYTHON%\\python.exe setup.py build" - "%PYTHON%\\python.exe setup.py build"

2
NEWS
View File

@ -12,6 +12,8 @@ What's new in psycopg 2.7.2
string is specified as an URI (:ticket:`#528`). string is specified as an URI (:ticket:`#528`).
- Return objects with timezone parsing "infinity" :sql:`timestamptz` - Return objects with timezone parsing "infinity" :sql:`timestamptz`
(:ticket:`#536`). (:ticket:`#536`).
- Dropped dependency on VC9 runtime on Windows binary packages
(:ticket:`#541`).
- Fixed segfault in `~connection.lobject()` when *mode*\=\ `!None` - Fixed segfault in `~connection.lobject()` when *mode*\=\ `!None`
(:ticket:`#544`). (:ticket:`#544`).
- Fixed `~connection.lobject()` keyword argument *lobject_factory* - Fixed `~connection.lobject()` keyword argument *lobject_factory*

4
scripts/appveyor.cache_rebuild
View File

@ -9,7 +9,7 @@ To invalidate the cache, update this file and check it into git.
Currently used modules built in the cache: Currently used modules built in the cache:
OpenSSL OpenSSL
Version: 1.0.2k Version: 1.0.2l
PostgreSQL PostgreSQL
Version: 9.6.2 Version: 9.6.3

4
setup.py
View File

@ -64,7 +64,7 @@ except ImportError:
# Take a look at http://www.python.org/dev/peps/pep-0440/ # Take a look at http://www.python.org/dev/peps/pep-0440/
# for a consistent versioning pattern. # for a consistent versioning pattern.
PSYCOPG_VERSION = '2.7.2.dev0' PSYCOPG_VERSION = '2.7.2.dev1'
# note: if you are changing the list of supported Python version please fix # note: if you are changing the list of supported Python version please fix
@ -295,7 +295,7 @@ class psycopg_build_ext(build_ext):
# For Python versions that use MSVC compiler 2008, re-insert the # For Python versions that use MSVC compiler 2008, re-insert the
# manifest into the resulting .pyd file. # manifest into the resulting .pyd file.
if self.compiler_is_msvc() and sysVer not in ((2, 4), (2, 5)): if self.compiler_is_msvc() and sysVer in ((2, 6), (2, 7), (3, 0), (3, 1), (3, 2)):
platform = get_platform() platform = get_platform()
# Default to the x86 manifest # Default to the x86 manifest
manifest = '_psycopg.vc9.x86.manifest' manifest = '_psycopg.vc9.x86.manifest'