[Python-checkins] distutils2: merged with Holger

[tarek.ziade]

tarek.ziade pushed 450d77dc3801 to distutils2:

http://hg.python.org/distutils2/rev/450d77dc3801
changeset:   677:450d77dc3801
tag:         tip
parent:      674:4303383f55f4
parent:      676:161753c326db
user:        Tarek Ziade <tarek at ziade.org>
date:        Sun Sep 19 12:36:37 2010 +0200
summary:     merged with Holger
files:       

diff --git a/.hgignore b/.hgignore
--- a/.hgignore
+++ b/.hgignore
@@ -9,3 +9,4 @@
 _static/
 *.swp
 .coverage
+.tox
diff --git a/README.txt b/README.txt
--- a/README.txt
+++ b/README.txt
@@ -13,3 +13,9 @@
 **Beware that Distutils2 is in its early stage and should not be used in
 production. Its API is subject to changes**
 
+Useful further links:
+
+Mailing list: http://mail.python.org/mailman/listinfo/distutils-sig/
+Documentation: http://packages.python.org/Distutils2
+Repository: http://hg.python.org/distutils2
+Bug tracker: http://bugs.python.org
diff --git a/distutils2/__init__.py b/distutils2/__init__.py
--- a/distutils2/__init__.py
+++ b/distutils2/__init__.py
@@ -17,7 +17,7 @@
 __all__ = ['__version__']
 
 __revision__ = "$Id: __init__.py 78020 2010-02-06 16:37:32Z benjamin.peterson $"
-__version__ = "1.0a2"
+__version__ = "1.0a3"
 
 
 # when set to True, converts doctests by default too
diff --git a/setup.py b/setup.py
--- a/setup.py
+++ b/setup.py
@@ -6,12 +6,12 @@
 import re
 
 from distutils2 import __version__ as VERSION
-from distutils2 import log
-from distutils2.core import setup, Extension
-from distutils2.compiler.ccompiler import new_compiler
-from distutils2.command.sdist import sdist
-from distutils2.command.install import install
 from distutils2.util import find_packages
+from distutils import log
+from distutils.core import setup, Extension
+from distutils.ccompiler import new_compiler
+from distutils.command.sdist import sdist
+from distutils.command.install import install
 
 f = open('README.txt')
 try:
@@ -221,10 +221,4 @@
       packages=find_packages(),
       cmdclass={'sdist_hg': sdist_hg, 'install_hg': install_hg},
       package_data={'distutils2._backport': ['sysconfig.cfg']},
-      project_url=[('Mailing list',
-                    'http://mail.python.org/mailman/listinfo/distutils-sig/'),
-                   ('Documentation',
-                    'http://packages.python.org/Distutils2'),
-                   ('Repository', 'http://hg.python.org/distutils2'),
-                   ('Bug tracker', 'http://bugs.python.org')],
       **setup_kwargs)
diff --git a/tox.ini b/tox.ini
new file mode 100644
--- /dev/null
+++ b/tox.ini
@@ -0,0 +1,18 @@
+[tox]
+#distshare={homedir}/.tox/distshare
+envlist=py25,py26,py27
+
+#[tox:hudson]
+#distshare={toxworkdir}/distshare
+#sdistsrc={distshare}/py-*
+
+[testenv]
+commands=
+    python -Wd runtests.py 
+deps=
+    unittest2
+
+[testenv:py27]
+basepython=python2.7
+commands=
+    python -Wd -bb -3 runtests.py

--
Repository URL: http://hg.python.org/distutils2