psycopg/psycopg2
1
1
Fork 0
mirror of https://github.com/psycopg/psycopg2.git synced 2025-01-31 17:34:08 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'setuptools'

Browse Source
This commit is contained in:
Daniele Varrazzo 2016-03-10 12:11:29 +00:00
commit 1b7cebc41e
4 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
MANIFEST.in
View File

@ -8,4 +8,4 @@ recursive-include doc/src *.rst *.py *.css Makefile
recursive-include scripts *.py *.sh recursive-include scripts *.py *.sh
include scripts/maketypes.sh scripts/buildtypes.py include scripts/maketypes.sh scripts/buildtypes.py
include AUTHORS README.rst INSTALL LICENSE NEWS include AUTHORS README.rst INSTALL LICENSE NEWS
include PKG-INFO MANIFEST.in MANIFEST setup.py setup.cfg Makefile include MANIFEST.in setup.py setup.cfg Makefile

9
Makefile
View File

@ -92,14 +92,9 @@ $(PACKAGE)/tests/%.py: tests/%.py
$(PYTHON) setup.py build_py $(BUILD_OPT) $(PYTHON) setup.py build_py $(BUILD_OPT)
touch $@ touch $@
$(SDIST): MANIFEST $(SOURCE) $(SDIST): $(SOURCE)
$(PYTHON) setup.py sdist $(SDIST_OPT) $(PYTHON) setup.py sdist $(SDIST_OPT)
MANIFEST: MANIFEST.in $(SOURCE)
# Run twice as MANIFEST.in includes MANIFEST
$(PYTHON) setup.py sdist --manifest-only
$(PYTHON) setup.py sdist --manifest-only
# docs depend on the build as it partly use introspection. # docs depend on the build as it partly use introspection.
doc/html/genindex.html: $(PLATLIB) $(PURELIB) $(SOURCE_DOC) doc/html/genindex.html: $(PLATLIB) $(PURELIB) $(SOURCE_DOC)
$(MAKE) -C doc html $(MAKE) -C doc html
@ -111,5 +106,5 @@ doc/docs.zip: doc/html/genindex.html
(cd doc/html && zip -r ../docs.zip *) (cd doc/html && zip -r ../docs.zip *)
clean: clean:
rm -rf build MANIFEST rm -rf build
$(MAKE) -C doc clean $(MAKE) -C doc clean

1
NEWS
View File

@ -30,6 +30,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