summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorholger krekel <holger@merlinux.eu>2010-09-19 11:24:10 +0200
committerholger krekel <holger@merlinux.eu>2010-09-19 11:24:10 +0200
commit87f7da45092d4da30ece08a910a4753935da52f4 (patch)
tree864aba0022eb65e9796432d723e0457c5fea9fde
parenta9ba0fd0c9f4310a1cb5da5edc2226fd3e9d7ff4 (diff)
downloaddisutils2-87f7da45092d4da30ece08a910a4753935da52f4.tar.gz
(tarek, holger) make distutils2 use plain/setuptools distutils so it can be installed in "old" environments.
-rw-r--r--README.txt6
-rw-r--r--distutils2/__init__.py2
-rw-r--r--setup.py16
3 files changed, 12 insertions, 12 deletions
diff --git a/README.txt b/README.txt
index 32f8a7e..81698ec 100644
--- a/README.txt
+++ b/README.txt
@@ -13,3 +13,9 @@ See the documentation at http://packages.python.org/Distutils2 for more info.
**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
index 4d330b3..98b01e2 100644
--- a/distutils2/__init__.py
+++ b/distutils2/__init__.py
@@ -17,7 +17,7 @@ without causing the other modules to be imported:
__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
index fb6b59a..2ff8150 100644
--- a/setup.py
+++ b/setup.py
@@ -6,12 +6,12 @@ import os
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 @@ setup(name="Distutils2",
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)