psycopg/psycopg2
1
1
Fork 0
mirror of https://github.com/psycopg/psycopg2.git synced 2024-11-28 11:53:43 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'setuptools' into maint_2_6

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
NEWS
View File

@ -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`).

5
setup.py
View File

@ -57,7 +57,10 @@ import os
import sys import sys
import re import re
import subprocess import subprocess
from distutils.core import setup, Extension try:
from setuptools import setup, Extension
except ImportError:
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
from distutils.ccompiler import get_default_compiler from distutils.ccompiler import get_default_compiler