Setuptools support (without losing distutils support). Fixes #194 (issue 5451072)

2 views
Skip to first unread message

jar...@jaraco.com

unread,
Dec 1, 2011, 7:07:29 PM12/1/11
to joe.gr...@gmail.com, httpli...@googlegroups.com, re...@codereview-hr.appspotmail.com
Reviewers: jcgregorio,

Please review this at http://codereview.appspot.com/5451072/

Affected files:
M .hgignore
R MANIFEST
A MANIFEST.in
M setup.py


Index: .hgignore
===================================================================
--- a/.hgignore
+++ b/.hgignore
@@ -4,3 +4,4 @@
upload.py
**.pyc
.cache
+MANIFEST
Index: MANIFEST
===================================================================
deleted file mode 100644
--- a/MANIFEST
+++ /dev/null
@@ -1,13 +0,0 @@
-README
-setup.py
-python2/httplib2/__init__.py
-python2/httplib2/iri2uri.py
-python2/httplib2/socks.py
-python2/httplib2/test/__init__.py
-python2/httplib2/test/functional/test_proxies.py
-python2/httplib2/test/miniserver.py
-python2/httplib2/test/smoke_test.py
-python2/httplib2test.py
-python3/httplib2/__init__.py
-python3/httplib2/iri2uri.py
-python3/httplib2test.py
Index: MANIFEST.in
===================================================================
new file mode 100644
--- /dev/null
+++ b/MANIFEST.in
@@ -0,0 +1,3 @@
+recursive-include python2 *.py
+recursive-include python3 *.py
+include python2/httplib2/test/*.txt
\ No newline at end of file
Index: setup.py
===================================================================
--- a/setup.py
+++ b/setup.py
@@ -1,4 +1,7 @@
-from distutils.core import setup
+try:
+ from setuptools import setup
+except ImportError:
+ from distutils.core import setup
import sys

pkgdir = {'': 'python%s' % sys.version_info[0]}


Reply all
Reply to author
Forward
0 new messages