1 new changeset in pytest:
http://bitbucket.org/hpk42/pytest/changeset/4736be94b3eb/
changeset: 4736be94b3eb
user: hpk42
date: 2011-07-08 22:58:22
summary: only invoke distribute's use_setuptools when there is no
setuptools installed
affected #: 2 files (86 bytes)
--- a/setup.py Fri Jul 08 13:53:23 2011 -0500
+++ b/setup.py Fri Jul 08 22:58:22 2011 +0200
@@ -1,8 +1,12 @@
import os, sys
-if sys.version_info >= (3,0):
+try:
+ from setuptools import setup
+except ImportError:
+ if sys.version_info < (3,0):
+ raise
from distribute_setup import use_setuptools
use_setuptools()
-from setuptools import setup
+ from setuptools import setup
long_description = """
cross-project testing tool for Python.
@@ -68,4 +72,4 @@
return {'console_scripts': l}
if __name__ == '__main__':
- main()
\ No newline at end of file
+ main()
--- a/tox.ini Fri Jul 08 13:53:23 2011 -0500
+++ b/tox.ini Fri Jul 08 22:58:22 2011 +0200
@@ -4,7 +4,7 @@
indexserver=
pypi = http://pypi.python.org/simple
testrun = http://pypi.testrun.org
- default = http://pypi.testrun.org
+ default = http://pypi.python.org/simple
[testenv]
changedir=testing
Repository URL: https://bitbucket.org/hpk42/pytest/
--
This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.
_______________________________________________
py-svn mailing list
py-svn@codespeak.net
http://codespeak.net/mailman/listinfo/py-svn
