Merge branch 'setuptools' into maint_2_6

This commit is contained in:
Daniele Varrazzo 2016-03-07 10:39:03 +00:00
commit cbeea0f98f
2 changed files with 5 additions and 1 deletions

1
NEWS
View File

@ -11,6 +11,7 @@ What's new in psycopg 2.6.2
- Raise `!NotSupportedError` on unhandled server response status
(:ticket:`#352`).
- Fixed `!PersistentConnectionPool` on Python 3 (:ticket:`#348`).
- Added support for setuptools/wheel (:ticket:`#370`).
- Fixed `!errorcodes.lookup` initialization thread-safety (:ticket:`#382`).

View File

@ -57,6 +57,9 @@ import os
import sys
import re
import subprocess
try:
from setuptools import setup, Extension
except ImportError:
from distutils.core import setup, Extension
from distutils.command.build_ext import build_ext
from distutils.sysconfig import get_python_inc