[Checkins] SVN: zope.event/trunk/setup. Simplify Py3k support.

Tres Seaver cvs-admin at zope.org
Fri Mar 30 17:56:39 UTC 2012


Log message for revision 124805:
  Simplify Py3k support.
  
  
  We don't need lib2to3.
  
  Add 'nose' and 'coverage' as testing extras.
  
  Add support for reporting coverage.
  
  Add 'docs' alias to install Sphinx.

Changed:
  A   zope.event/trunk/setup.cfg
  U   zope.event/trunk/setup.py

-=-
Added: zope.event/trunk/setup.cfg
===================================================================
--- zope.event/trunk/setup.cfg	                        (rev 0)
+++ zope.event/trunk/setup.cfg	2012-03-30 17:56:35 UTC (rev 124805)
@@ -0,0 +1,11 @@
+[nosetests]
+nocapture=1
+cover-package=zope.event
+cover-erase=1
+with-doctest=0
+where=src
+
+[aliases]
+dev = develop easy_install zope.event[testing]
+docs = easy_install zope.event[docs]
+

Modified: zope.event/trunk/setup.py
===================================================================
--- zope.event/trunk/setup.py	2012-03-30 17:56:31 UTC (rev 124804)
+++ zope.event/trunk/setup.py	2012-03-30 17:56:35 UTC (rev 124805)
@@ -20,16 +20,7 @@
 """
 
 import os
-import sys
 from setuptools import setup, find_packages
-if sys.version_info < (3,):
-    extra = {}
-else:
-    # Python 3 support:
-    extra = dict(
-      use_2to3=True,
-      convert_2to3_doctests=['docs/index.rst'],
-    )
 
 def read(*rnames):
     return open(os.path.join(os.path.dirname(__file__), *rnames)).read()
@@ -69,5 +60,7 @@
     install_requires=['setuptools'],
     zip_safe=False,
     test_suite='zope.event.tests.test_suite',
-    **extra
-    )
+    extras_require={'docs': ['Sphinx'],
+                    'testing': ['nose', 'coverage'],
+                   },
+)



More information about the checkins mailing list