mirror of
https://github.com/psycopg/psycopg2.git
synced 2024-11-22 17:06:33 +03:00
Merge branch 'msvc-2015-fix'
This commit is contained in:
commit
82ef9cfadd
1
NEWS
1
NEWS
|
@ -31,6 +31,7 @@ What's new in psycopg 2.6.2
|
||||||
(:ticket:`#352`).
|
(:ticket:`#352`).
|
||||||
- Fixed `!PersistentConnectionPool` on Python 3 (:ticket:`#348`).
|
- Fixed `!PersistentConnectionPool` on Python 3 (:ticket:`#348`).
|
||||||
- Added support for setuptools/wheel (:ticket:`#370`).
|
- Added support for setuptools/wheel (:ticket:`#370`).
|
||||||
|
- Fix build on Windows with Python 3.5, VS 2015 (:ticket:`#380`).
|
||||||
- Fixed `!errorcodes.lookup` initialization thread-safety (:ticket:`#382`).
|
- Fixed `!errorcodes.lookup` initialization thread-safety (:ticket:`#382`).
|
||||||
|
|
||||||
|
|
||||||
|
|
4
setup.py
4
setup.py
|
@ -304,6 +304,10 @@ class psycopg_build_ext(build_ext):
|
||||||
except AttributeError:
|
except AttributeError:
|
||||||
ext_path = os.path.join(self.build_lib,
|
ext_path = os.path.join(self.build_lib,
|
||||||
'psycopg2', '_psycopg.pyd')
|
'psycopg2', '_psycopg.pyd')
|
||||||
|
# Make sure spawn() will work if compile() was never
|
||||||
|
# called. https://github.com/psycopg/psycopg2/issues/380
|
||||||
|
if not self.compiler.initialized:
|
||||||
|
self.compiler.initialize()
|
||||||
self.compiler.spawn(
|
self.compiler.spawn(
|
||||||
['mt.exe', '-nologo', '-manifest',
|
['mt.exe', '-nologo', '-manifest',
|
||||||
os.path.join('psycopg', manifest),
|
os.path.join('psycopg', manifest),
|
||||||
|
|
Loading…
Reference in New Issue
Block a user