Merge branch 'mr-566'

.appveyor.yml

@@ -73,7 +73,7 @@ matrix:
     fast_finish: false
 
 services:
-    - postgresql95
+    - postgresql96
 
 cache:
   # Rebuild cache if following file changes
@@ -115,7 +115,7 @@ init:
 
     # Change PostgreSQL config before service starts to allow > 1 prepared
     #   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
@@ -154,8 +154,8 @@ install:
         }
     # Download OpenSSL source
     - CD C:\Others
-    - IF NOT EXIST OpenSSL_1_0_2k.zip (
-        curl -fsSL -o OpenSSL_1_0_2k.zip https://github.com/openssl/openssl/archive/OpenSSL_1_0_2k.zip
+    - IF NOT EXIST OpenSSL_1_0_2l.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
@@ -167,15 +167,15 @@ install:
     #    - nmake build_libs install_dev
     - IF NOT EXIST %OPENSSLTOP%\lib\ssleay32.lib (
         CD %BUILD_DIR% &&
-        7z x C:\Others\OpenSSL_1_0_2k.zip &&
-        CD openssl-OpenSSL_1_0_2k &&
+        7z x C:\Others\OpenSSL_1_0_2l.zip &&
+        CD openssl-OpenSSL_1_0_2l &&
         perl Configure %TARGET% no-asm no-shared no-zlib --prefix=%OPENSSLTOP% --openssldir=%OPENSSLTOP% &&
         CALL ms\%DO% &&
         nmake -f ms\nt.mak init headers lib &&
         COPY inc32\openssl\*.h %OPENSSLTOP%\include\openssl &&
         COPY out32\*.lib %OPENSSLTOP%\lib &&
         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
@@ -187,19 +187,19 @@ install:
     - IF NOT EXIST %PGTOP%\lib MKDIR %PGTOP%\lib
     # Download PostgreSQL source
     - CD C:\Others
-    - IF NOT EXIST postgres-REL9_6_2.zip (
-        curl -fsSL -o postgres-REL9_6_2.zip https://github.com/postgres/postgres/archive/REL9_6_2.zip
+    - IF NOT EXIST postgres-REL9_6_3.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)
     # Build libpgport first
     # Build libpq
     # 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 (
         CD %BUILD_DIR% &&
-        7z x C:\Others\postgres-REL9_6_2.zip &&
-        CD postgres-REL9_6_2\src\tools\msvc &&
+        7z x C:\Others\postgres-REL9_6_3.zip &&
+        CD postgres-REL9_6_3\src\tools\msvc &&
         ECHO $config-^>{ldap} = 0; > config.pl &&
         ECHO $config-^>{openssl} = "%OPENSSLTOP:\=\\%"; >> config.pl &&
         ECHO.>> config.pl &&
@@ -221,7 +221,7 @@ build: off
 
 build_script:
     # 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
     - "%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"

NEWS

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

scripts/appveyor.cache_rebuild

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

setup.py

@@ -64,7 +64,7 @@ except ImportError:
 # Take a look at http://www.python.org/dev/peps/pep-0440/
 # 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
@@ -295,7 +295,7 @@ class psycopg_build_ext(build_ext):
 
         # For Python versions that use MSVC compiler 2008, re-insert the
         # 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()
             # Default to the x86 manifest
             manifest = '_psycopg.vc9.x86.manifest'