mirror of
https://github.com/psycopg/psycopg2.git
synced 2024-11-24 18:03:43 +03:00
Merge branch 'setuptools' into maint_2_6
This commit is contained in:
commit
cbeea0f98f
1
NEWS
1
NEWS
|
@ -11,6 +11,7 @@ What's new in psycopg 2.6.2
|
||||||
- Raise `!NotSupportedError` on unhandled server response status
|
- Raise `!NotSupportedError` on unhandled server response status
|
||||||
(: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`).
|
||||||
- Fixed `!errorcodes.lookup` initialization thread-safety (:ticket:`#382`).
|
- Fixed `!errorcodes.lookup` initialization thread-safety (:ticket:`#382`).
|
||||||
|
|
||||||
|
|
||||||
|
|
3
setup.py
3
setup.py
|
@ -57,6 +57,9 @@ import os
|
||||||
import sys
|
import sys
|
||||||
import re
|
import re
|
||||||
import subprocess
|
import subprocess
|
||||||
|
try:
|
||||||
|
from setuptools import setup, Extension
|
||||||
|
except ImportError:
|
||||||
from distutils.core import setup, Extension
|
from distutils.core import setup, Extension
|
||||||
from distutils.command.build_ext import build_ext
|
from distutils.command.build_ext import build_ext
|
||||||
from distutils.sysconfig import get_python_inc
|
from distutils.sysconfig import get_python_inc
|
||||||
|
|
Loading…
Reference in New Issue
Block a user