[Python-checkins] distutils2: Removing the converter. This is not going to work out. We have better ideas

tarek.ziade python-checkins at python.org
Sat Oct 23 22:36:31 CEST 2010


tarek.ziade pushed 05f890cbd877 to distutils2:

http://hg.python.org/distutils2/rev/05f890cbd877
changeset:   777:05f890cbd877
user:        Tarek Ziade <tarek at ziade.org>
date:        Sat Oct 23 22:22:56 2010 +0200
summary:     Removing the converter. This is not going to work out. We have better ideas about d1 -> d2 migration paths
files:       distutils2/converter/__init__.py, distutils2/converter/fixers/__init__.py, distutils2/converter/fixers/fix_imports.py, distutils2/converter/fixers/fix_setup_options.py, distutils2/converter/refactor.py, distutils2/tests/conversions/01_after.py, distutils2/tests/conversions/01_before.py, distutils2/tests/conversions/02_after.py, distutils2/tests/conversions/02_before.py, distutils2/tests/conversions/03_after.py, distutils2/tests/conversions/03_before.py, distutils2/tests/conversions/04_after.py, distutils2/tests/conversions/04_before.py, distutils2/tests/conversions/05_after.py, distutils2/tests/conversions/05_before.py

diff --git a/distutils2/converter/__init__.py b/distutils2/converter/__init__.py
deleted file mode 100644
diff --git a/distutils2/converter/fixers/__init__.py b/distutils2/converter/fixers/__init__.py
deleted file mode 100644
--- a/distutils2/converter/fixers/__init__.py
+++ /dev/null
@@ -1,4 +0,0 @@
-"""distutils2.converter.fixers
-
-Contains all fixers for the converter.
-"""
diff --git a/distutils2/converter/fixers/fix_imports.py b/distutils2/converter/fixers/fix_imports.py
deleted file mode 100644
--- a/distutils2/converter/fixers/fix_imports.py
+++ /dev/null
@@ -1,52 +0,0 @@
-"""distutils2.converter.fixers.fix_imports
-
-Fixer for import statements in setup.py
-"""
-from lib2to3.fixer_base import BaseFix
-from lib2to3.fixer_util import syms
-
-
-class FixImports(BaseFix):
-    """Makes sure all import in setup.py are translated"""
-
-    PATTERN = """
-    import_from< 'from' imp=any 'import' ['('] any [')'] >
-    |
-    import_name< 'import' imp=any >
-    """
-
-    def transform(self, node, results):
-        imp = results['imp']
-        if node.type != syms.import_from:
-            return
-
-        if not hasattr(imp, "next_sibling"):
-            imp.next_sibling = imp.get_next_sibling()
-
-        while not hasattr(imp, 'value'):
-            imp = imp.children[0]
-
-        if imp.value == 'distutils':
-            imp.value = 'distutils2'
-            imp.changed()
-            return node
-
-        if imp.value == 'setuptools':
-            # catching "from setuptools import setup"
-            pattern = []
-            next = imp.next_sibling
-            while next is not None:
-                # Get the first child if we have a Node
-                if not hasattr(next, "value"):
-                    next = next.children[0]
-                pattern.append(next.value)
-                if not hasattr(next, "next_sibling"):
-                    next.next_sibling = next.get_next_sibling()
-                next = next.next_sibling
-            
-            if set(pattern).issubset(set(
-                    ['import', ',', 'setup', 'find_packages'])):
-                imp.value = 'distutils2.core'
-                imp.changed()
-
-            return node
diff --git a/distutils2/converter/fixers/fix_setup_options.py b/distutils2/converter/fixers/fix_setup_options.py
deleted file mode 100644
--- a/distutils2/converter/fixers/fix_setup_options.py
+++ /dev/null
@@ -1,85 +0,0 @@
-"""Fixer for setup() options.
-
-All distutils or setuptools options are translated
-into PEP 345-style options.
-"""
-from lib2to3.pytree import Leaf, Node
-from lib2to3.pgen2 import token
-from lib2to3.fixer_base import BaseFix
-
-# XXX where is that defined ?
-_ARG = 260
-
-# name mapping : we want to convert
-# all old-style options to distutils2 style
-_OLD_NAMES = {'url': 'home_page',
-              'long_description': 'description',
-              'description': 'summary',
-              'install_requires': 'requires_dist'}
-
-_SEQUENCE_NAMES = ['requires_dist']
-
-
-class FixSetupOptions(BaseFix):
-
-    # XXX need to find something better here :
-    # identify a setup call, whatever alias is used
-    PATTERN = """
-            power< name='setup' trailer< '(' [any] ')' > any* >
-              """
-
-    def _get_list(self, *nodes):
-        """A List node, filled"""
-        lbrace = Leaf(token.LBRACE, u"[")
-        lbrace.prefix = u" "
-        if len(nodes) > 0:
-            nodes[0].prefix = u""
-        return Node(self.syms.trailer,
-                    [lbrace] +
-                    [node.clone() for node in nodes] +
-                    [Leaf(token.RBRACE, u"]")])
-
-    def _fix_name(self, argument, remove_list):
-        name = argument.children[0]
-
-        if not hasattr(name, "next_sibling"):
-            name.next_sibling = name.get_next_sibling()
-
-        sibling = name.next_sibling
-        if sibling is None or sibling.type != token.EQUAL:
-            return False
-
-        if name.value in _OLD_NAMES:
-            name.value = _OLD_NAMES[name.value]
-            if name.value in _SEQUENCE_NAMES:
-                if not hasattr(sibling, "next_sibling"):
-                    sibling.next_sibling = sibling.get_next_sibling()
-                right_operand = sibling.next_sibling
-                # replacing string -> list[string]
-                if right_operand.type == token.STRING:
-                    # we want this to be a list now
-                    new_node = self._get_list(right_operand)
-                    right_operand.replace(new_node)
-
-
-            return True
-
-        return False
-
-    def transform(self, node, results):
-        arglist = node.children[1].children[1]
-        remove_list = []
-        changed = False
-
-        for subnode in arglist.children:
-            if subnode.type != _ARG:
-                continue
-            if self._fix_name(subnode, remove_list) and not changed:
-                changed = True
-
-        for subnode in remove_list:
-            subnode.remove()
-
-        if changed:
-            node.changed()
-        return node
diff --git a/distutils2/converter/refactor.py b/distutils2/converter/refactor.py
deleted file mode 100644
--- a/distutils2/converter/refactor.py
+++ /dev/null
@@ -1,12 +0,0 @@
-"""distutils2.converter.refactor
-
-"""
-try:
-    from lib2to3.refactor import RefactoringTool
-    _LIB2TO3 = True
-except ImportError:
-    # we need 2.6 at least to run this
-    _LIB2TO3 = False
-
-_DISTUTILS_FIXERS = ['distutils2.converter.fixers.fix_imports',
-                     'distutils2.converter.fixers.fix_setup_options']
\ No newline at end of file
diff --git a/distutils2/tests/conversions/01_after.py b/distutils2/tests/conversions/01_after.py
deleted file mode 100644
--- a/distutils2/tests/conversions/01_after.py
+++ /dev/null
@@ -1,4 +0,0 @@
-from distutils2.core import setup
-
-setup(name='Foo')
-
diff --git a/distutils2/tests/conversions/01_before.py b/distutils2/tests/conversions/01_before.py
deleted file mode 100644
--- a/distutils2/tests/conversions/01_before.py
+++ /dev/null
@@ -1,4 +0,0 @@
-from distutils.core import setup
-
-setup(name='Foo')
-
diff --git a/distutils2/tests/conversions/02_after.py b/distutils2/tests/conversions/02_after.py
deleted file mode 100644
--- a/distutils2/tests/conversions/02_after.py
+++ /dev/null
@@ -1,46 +0,0 @@
-# -*- encoding: utf-8 -*-
-import sys
-import os
-from distutils2.core import setup, Extension
-from distutils2.errors import CCompilerError, DistutilsError, CompileError
-from distutils2.command.build_ext import build_ext as distutils_build_ext
-
-VERSION = "0.1"
-
-class build_ext(distutils_build_ext):
-
-    def build_extension(self, ext):
-        try:
-            return distutils_build_ext.build_extension(self, ext)
-        except (CCompilerError, DistutilsError, CompileError), e:
-            pass
-
-def _get_ext_modules():
-    levenshtein = Extension('_levenshtein',
-                            sources=[os.path.join('texttools',
-                                                  '_levenshtein.c')])
-    return [levenshtein]
-
-with open('README.txt') as f:
-    LONG_DESCRIPTION = f.read()
-
-setup(name="TextTools", version=VERSION, author="Tarek Ziade",
-      author_email="tarek at ziade.org",
-      home_page="http://bitbucket.org/tarek/texttools",
-      summary="Text manipulation utilities",
-      description=LONG_DESCRIPTION,
-      keywords="text,guess,levenshtein",
-      classifiers=[
-         'Development Status :: 4 - Beta',
-         'Intended Audience :: Developers',
-         'License :: OSI Approved :: Python Software Foundation License'
-      ],
-      cmdclass={'build_ext': build_ext},
-      packages=['texttools'],
-      package_dir={'texttools': 'texttools'},
-      package_data={'texttools': [os.path.join('samples', '*.txt')]},
-      scripts=[os.path.join('scripts', 'levenshtein.py'),
-               os.path.join('scripts', 'guesslang.py')],
-      ext_modules=_get_ext_modules()
-      )
-
diff --git a/distutils2/tests/conversions/02_before.py b/distutils2/tests/conversions/02_before.py
deleted file mode 100644
--- a/distutils2/tests/conversions/02_before.py
+++ /dev/null
@@ -1,46 +0,0 @@
-# -*- encoding: utf-8 -*-
-import sys
-import os
-from distutils.core import setup, Extension
-from distutils.errors import CCompilerError, DistutilsError, CompileError
-from distutils.command.build_ext import build_ext as distutils_build_ext
-
-VERSION = "0.1"
-
-class build_ext(distutils_build_ext):
-
-    def build_extension(self, ext):
-        try:
-            return distutils_build_ext.build_extension(self, ext)
-        except (CCompilerError, DistutilsError, CompileError), e:
-            pass
-
-def _get_ext_modules():
-    levenshtein = Extension('_levenshtein',
-                            sources=[os.path.join('texttools',
-                                                  '_levenshtein.c')])
-    return [levenshtein]
-
-with open('README.txt') as f:
-    LONG_DESCRIPTION = f.read()
-
-setup(name="TextTools", version=VERSION, author="Tarek Ziade",
-      author_email="tarek at ziade.org",
-      url="http://bitbucket.org/tarek/texttools",
-      description="Text manipulation utilities",
-      long_description=LONG_DESCRIPTION,
-      keywords="text,guess,levenshtein",
-      classifiers=[
-         'Development Status :: 4 - Beta',
-         'Intended Audience :: Developers',
-         'License :: OSI Approved :: Python Software Foundation License'
-      ],
-      cmdclass={'build_ext': build_ext},
-      packages=['texttools'],
-      package_dir={'texttools': 'texttools'},
-      package_data={'texttools': [os.path.join('samples', '*.txt')]},
-      scripts=[os.path.join('scripts', 'levenshtein.py'),
-               os.path.join('scripts', 'guesslang.py')],
-      ext_modules=_get_ext_modules()
-      )
-
diff --git a/distutils2/tests/conversions/03_after.py b/distutils2/tests/conversions/03_after.py
deleted file mode 100644
--- a/distutils2/tests/conversions/03_after.py
+++ /dev/null
@@ -1,93 +0,0 @@
-##############################################################################
-#
-# Copyright (c) 2006-2009 Zope Corporation and Contributors.
-# All Rights Reserved.
-#
-# This software is subject to the provisions of the Zope Public License,
-# Version 2.1 (ZPL).  A copy of the ZPL should accompany this distribution.
-# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
-# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
-# FOR A PARTICULAR PURPOSE.
-#
-##############################################################################
-name = "zc.buildout"
-version = "1.5.0dev"
-
-import os
-from distutils2.core import setup
-
-def read(*rnames):
-    return open(os.path.join(os.path.dirname(__file__), *rnames)).read()
-
-long_description=(
-        read('README.txt')
-        + '\n' +
-        'Detailed Documentation\n'
-        '**********************\n'
-        + '\n' +
-        read('src', 'zc', 'buildout', 'buildout.txt')
-        + '\n' +
-        read('src', 'zc', 'buildout', 'unzip.txt')
-        + '\n' +
-        read('src', 'zc', 'buildout', 'repeatable.txt')
-        + '\n' +
-        read('src', 'zc', 'buildout', 'download.txt')
-        + '\n' +
-        read('src', 'zc', 'buildout', 'downloadcache.txt')
-        + '\n' +
-        read('src', 'zc', 'buildout', 'extends-cache.txt')
-        + '\n' +
-        read('src', 'zc', 'buildout', 'setup.txt')
-        + '\n' +
-        read('src', 'zc', 'buildout', 'update.txt')
-        + '\n' +
-        read('src', 'zc', 'buildout', 'debugging.txt')
-        + '\n' +
-        read('src', 'zc', 'buildout', 'testing.txt')
-        + '\n' +
-        read('src', 'zc', 'buildout', 'easy_install.txt')
-        + '\n' +
-        read('src', 'zc', 'buildout', 'distribute.txt')
-        + '\n' +
-        read('CHANGES.txt')
-        + '\n' +
-        'Download\n'
-        '**********************\n'
-        )
-
-entry_points = """
-[console_scripts]
-buildout = %(name)s.buildout:main
-
-[zc.buildout]
-debug = %(name)s.testrecipes:Debug
-
-""" % dict(name=name)
-
-setup(
-    name = name,
-    version = version,
-    author = "Jim Fulton",
-    author_email = "jim at zope.com",
-    summary = "System for managing development buildouts",
-    description=long_description,
-    license = "ZPL 2.1",
-    keywords = "development build",
-    home_page='http://buildout.org',
-
-    data_files = [('.', ['README.txt'])],
-    packages = ['zc', 'zc.buildout'],
-    package_dir = {'': 'src'},
-    namespace_packages = ['zc'],
-    requires_dist = ['setuptools'],
-    include_package_data = True,
-    entry_points = entry_points,
-    zip_safe=False,
-    classifiers = [
-       'Intended Audience :: Developers',
-       'License :: OSI Approved :: Zope Public License',
-       'Topic :: Software Development :: Build Tools',
-       'Topic :: Software Development :: Libraries :: Python Modules',
-       ],
-    )
diff --git a/distutils2/tests/conversions/03_before.py b/distutils2/tests/conversions/03_before.py
deleted file mode 100644
--- a/distutils2/tests/conversions/03_before.py
+++ /dev/null
@@ -1,93 +0,0 @@
-##############################################################################
-#
-# Copyright (c) 2006-2009 Zope Corporation and Contributors.
-# All Rights Reserved.
-#
-# This software is subject to the provisions of the Zope Public License,
-# Version 2.1 (ZPL).  A copy of the ZPL should accompany this distribution.
-# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
-# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
-# FOR A PARTICULAR PURPOSE.
-#
-##############################################################################
-name = "zc.buildout"
-version = "1.5.0dev"
-
-import os
-from setuptools import setup
-
-def read(*rnames):
-    return open(os.path.join(os.path.dirname(__file__), *rnames)).read()
-
-long_description=(
-        read('README.txt')
-        + '\n' +
-        'Detailed Documentation\n'
-        '**********************\n'
-        + '\n' +
-        read('src', 'zc', 'buildout', 'buildout.txt')
-        + '\n' +
-        read('src', 'zc', 'buildout', 'unzip.txt')
-        + '\n' +
-        read('src', 'zc', 'buildout', 'repeatable.txt')
-        + '\n' +
-        read('src', 'zc', 'buildout', 'download.txt')
-        + '\n' +
-        read('src', 'zc', 'buildout', 'downloadcache.txt')
-        + '\n' +
-        read('src', 'zc', 'buildout', 'extends-cache.txt')
-        + '\n' +
-        read('src', 'zc', 'buildout', 'setup.txt')
-        + '\n' +
-        read('src', 'zc', 'buildout', 'update.txt')
-        + '\n' +
-        read('src', 'zc', 'buildout', 'debugging.txt')
-        + '\n' +
-        read('src', 'zc', 'buildout', 'testing.txt')
-        + '\n' +
-        read('src', 'zc', 'buildout', 'easy_install.txt')
-        + '\n' +
-        read('src', 'zc', 'buildout', 'distribute.txt')
-        + '\n' +
-        read('CHANGES.txt')
-        + '\n' +
-        'Download\n'
-        '**********************\n'
-        )
-
-entry_points = """
-[console_scripts]
-buildout = %(name)s.buildout:main
-
-[zc.buildout]
-debug = %(name)s.testrecipes:Debug
-
-""" % dict(name=name)
-
-setup(
-    name = name,
-    version = version,
-    author = "Jim Fulton",
-    author_email = "jim at zope.com",
-    description = "System for managing development buildouts",
-    long_description=long_description,
-    license = "ZPL 2.1",
-    keywords = "development build",
-    url='http://buildout.org',
-
-    data_files = [('.', ['README.txt'])],
-    packages = ['zc', 'zc.buildout'],
-    package_dir = {'': 'src'},
-    namespace_packages = ['zc'],
-    install_requires = 'setuptools',
-    include_package_data = True,
-    entry_points = entry_points,
-    zip_safe=False,
-    classifiers = [
-       'Intended Audience :: Developers',
-       'License :: OSI Approved :: Zope Public License',
-       'Topic :: Software Development :: Build Tools',
-       'Topic :: Software Development :: Libraries :: Python Modules',
-       ],
-    )
diff --git a/distutils2/tests/conversions/04_after.py b/distutils2/tests/conversions/04_after.py
deleted file mode 100644
--- a/distutils2/tests/conversions/04_after.py
+++ /dev/null
@@ -1,69 +0,0 @@
-import sys, os
-try:
-    from distutils2.core import setup
-    kw = {'entry_points':
-          """[console_scripts]\nvirtualenv = virtualenv:main\n""",
-          'zip_safe': False}
-except ImportError:
-    from distutils2.core import setup
-    if sys.platform == 'win32':
-        print('Note: without Setuptools installed you will have to use "python -m virtualenv ENV"')
-    else:
-        kw = {'scripts': ['scripts/virtualenv']}
-import re
-
-here = os.path.dirname(os.path.abspath(__file__))
-
-## Figure out the version from virtualenv.py:
-version_re = re.compile(
-    r'virtualenv_version = "(.*?)"')
-fp = open(os.path.join(here, 'virtualenv.py'))
-version = None
-for line in fp:
-    match = version_re.search(line)
-    if match:
-        version = match.group(1)
-        break
-else:
-    raise Exception("Cannot find version in virtualenv.py")
-fp.close()
-
-## Get long_description from index.txt:
-f = open(os.path.join(here, 'docs', 'index.txt'))
-long_description = f.read().strip()
-long_description = long_description.split('split here', 1)[1]
-f.close()
-
-## A warning just for Ian (related to distribution):
-try:
-    import getpass
-except ImportError:
-    is_ianb = False
-else:
-    is_ianb = getpass.getuser() == 'ianb'
-
-if is_ianb and 'register' in sys.argv:
-    if 'hg tip\n~~~~~~' in long_description:
-        print >> sys.stderr, (
-            "WARNING: hg tip is in index.txt")
-
-setup(name='virtualenv',
-      version=version,
-      summary="Virtual Python Environment builder",
-      description=long_description,
-      classifiers=[
-        'Development Status :: 4 - Beta',
-        'Intended Audience :: Developers',
-        'License :: OSI Approved :: MIT License',
-      ],
-      keywords='setuptools deployment installation distutils',
-      author='Ian Bicking',
-      author_email='ianb at colorstudy.com',
-      home_page='http://virtualenv.openplans.org',
-      license='MIT',
-      use_2to3=True,
-      py_modules=['virtualenv'],
-      packages=['virtualenv_support'],
-      package_data={'virtualenv_support': ['*-py%s.egg' % sys.version[:3], '*.tar.gz']},
-      **kw
-      )
diff --git a/distutils2/tests/conversions/04_before.py b/distutils2/tests/conversions/04_before.py
deleted file mode 100644
--- a/distutils2/tests/conversions/04_before.py
+++ /dev/null
@@ -1,69 +0,0 @@
-import sys, os
-try:
-    from setuptools import setup
-    kw = {'entry_points':
-          """[console_scripts]\nvirtualenv = virtualenv:main\n""",
-          'zip_safe': False}
-except ImportError:
-    from distutils.core import setup
-    if sys.platform == 'win32':
-        print('Note: without Setuptools installed you will have to use "python -m virtualenv ENV"')
-    else:
-        kw = {'scripts': ['scripts/virtualenv']}
-import re
-
-here = os.path.dirname(os.path.abspath(__file__))
-
-## Figure out the version from virtualenv.py:
-version_re = re.compile(
-    r'virtualenv_version = "(.*?)"')
-fp = open(os.path.join(here, 'virtualenv.py'))
-version = None
-for line in fp:
-    match = version_re.search(line)
-    if match:
-        version = match.group(1)
-        break
-else:
-    raise Exception("Cannot find version in virtualenv.py")
-fp.close()
-
-## Get long_description from index.txt:
-f = open(os.path.join(here, 'docs', 'index.txt'))
-long_description = f.read().strip()
-long_description = long_description.split('split here', 1)[1]
-f.close()
-
-## A warning just for Ian (related to distribution):
-try:
-    import getpass
-except ImportError:
-    is_ianb = False
-else:
-    is_ianb = getpass.getuser() == 'ianb'
-
-if is_ianb and 'register' in sys.argv:
-    if 'hg tip\n~~~~~~' in long_description:
-        print >> sys.stderr, (
-            "WARNING: hg tip is in index.txt")
-
-setup(name='virtualenv',
-      version=version,
-      description="Virtual Python Environment builder",
-      long_description=long_description,
-      classifiers=[
-        'Development Status :: 4 - Beta',
-        'Intended Audience :: Developers',
-        'License :: OSI Approved :: MIT License',
-      ],
-      keywords='setuptools deployment installation distutils',
-      author='Ian Bicking',
-      author_email='ianb at colorstudy.com',
-      url='http://virtualenv.openplans.org',
-      license='MIT',
-      use_2to3=True,
-      py_modules=['virtualenv'],
-      packages=['virtualenv_support'],
-      package_data={'virtualenv_support': ['*-py%s.egg' % sys.version[:3], '*.tar.gz']},
-      **kw
-      )
diff --git a/distutils2/tests/conversions/05_after.py b/distutils2/tests/conversions/05_after.py
deleted file mode 100644
--- a/distutils2/tests/conversions/05_after.py
+++ /dev/null
@@ -1,137 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
-# Copyright (C) 2003-2009 Edgewall Software
-# All rights reserved.
-#
-# This software is licensed as described in the file COPYING, which
-# you should have received as part of this distribution. The terms
-# are also available at http://trac.edgewall.org/wiki/TracLicense.
-#
-# This software consists of voluntary contributions made by many
-# individuals. For the exact contribution history, see the revision
-# history and logs, available at http://trac.edgewall.org/log/.
-
-from distutils2.core import setup, find_packages
-
-extra = {}
-
-try:
-    import babel
-    
-    extractors = [
-        ('**.py',                'python', None),
-        ('**/templates/**.html', 'genshi', None),
-        ('**/templates/**.txt',  'genshi',
-         {'template_class': 'genshi.template:NewTextTemplate'}),
-    ]
-    extra['message_extractors'] = {
-        'trac': extractors,
-        'tracopt': extractors,
-    }
-
-    from trac.util.dist import get_l10n_js_cmdclass
-    extra['cmdclass'] = get_l10n_js_cmdclass()
-
-except ImportError, e:
-    pass
-
-setup(
-    name = 'Trac',
-    version = '0.12.1',
-    summary = 'Integrated SCM, wiki, issue tracker and project environment',
-    description = """
-Trac is a minimalistic web-based software project management and bug/issue
-tracking system. It provides an interface to the Subversion revision control
-systems, an integrated wiki, flexible issue tracking and convenient report
-facilities.
-""",
-    author = 'Edgewall Software',
-    author_email = 'info at edgewall.com',
-    license = 'BSD',
-    home_page = 'http://trac.edgewall.org/',
-    download_url = 'http://trac.edgewall.org/wiki/TracDownload',
-    classifiers = [
-        'Environment :: Web Environment',
-        'Framework :: Trac',
-        'Intended Audience :: Developers',
-        'License :: OSI Approved :: BSD License',
-        'Operating System :: OS Independent',
-        'Programming Language :: Python',
-        'Topic :: Software Development :: Bug Tracking',
-        'Topic :: Software Development :: Version Control',
-    ],
-
-    packages = find_packages(exclude=['*.tests']),
-    package_data = {
-        '': ['templates/*'],
-        'trac': ['htdocs/*.*', 'htdocs/README', 'htdocs/js/*.*',
-                 'htdocs/js/messages/*.*', 'htdocs/css/*.*',
-                 'htdocs/guide/*', 'locale/*/LC_MESSAGES/messages.mo'],
-        'trac.wiki': ['default-pages/*'],
-        'trac.ticket': ['workflows/*.ini'],
-    },
-
-    test_suite = 'trac.test.suite',
-    zip_safe = True,
-
-    requires_dist = [
-        'setuptools>=0.6b1',
-        'Genshi>=0.6',
-    ],
-    extras_require = {
-        'Babel': ['Babel>=0.9.5'],
-        'Pygments': ['Pygments>=0.6'],
-        'reST': ['docutils>=0.3'],
-        'SilverCity': ['SilverCity>=0.9.4'],
-        'Textile': ['textile>=2.0'],
-    },
-
-    entry_points = """
-        [console_scripts]
-        trac-admin = trac.admin.console:run
-        tracd = trac.web.standalone:main
-
-        [trac.plugins]
-        trac.about = trac.about
-        trac.admin.console = trac.admin.console
-        trac.admin.web_ui = trac.admin.web_ui
-        trac.attachment = trac.attachment
-        trac.db.mysql = trac.db.mysql_backend
-        trac.db.postgres = trac.db.postgres_backend
-        trac.db.sqlite = trac.db.sqlite_backend
-        trac.mimeview.patch = trac.mimeview.patch
-        trac.mimeview.pygments = trac.mimeview.pygments[Pygments]
-        trac.mimeview.rst = trac.mimeview.rst[reST]
-        trac.mimeview.silvercity = trac.mimeview.silvercity[SilverCity]
-        trac.mimeview.txtl = trac.mimeview.txtl[Textile]
-        trac.prefs = trac.prefs.web_ui
-        trac.search = trac.search.web_ui
-        trac.ticket.admin = trac.ticket.admin
-        trac.ticket.query = trac.ticket.query
-        trac.ticket.report = trac.ticket.report
-        trac.ticket.roadmap = trac.ticket.roadmap
-        trac.ticket.web_ui = trac.ticket.web_ui
-        trac.timeline = trac.timeline.web_ui
-        trac.versioncontrol.admin = trac.versioncontrol.admin
-        trac.versioncontrol.svn_authz = trac.versioncontrol.svn_authz
-        trac.versioncontrol.svn_fs = trac.versioncontrol.svn_fs
-        trac.versioncontrol.svn_prop = trac.versioncontrol.svn_prop
-        trac.versioncontrol.web_ui = trac.versioncontrol.web_ui
-        trac.web.auth = trac.web.auth
-        trac.web.session = trac.web.session
-        trac.wiki.admin = trac.wiki.admin
-        trac.wiki.interwiki = trac.wiki.interwiki
-        trac.wiki.macros = trac.wiki.macros
-        trac.wiki.web_ui = trac.wiki.web_ui
-        trac.wiki.web_api = trac.wiki.web_api
-        tracopt.mimeview.enscript = tracopt.mimeview.enscript
-        tracopt.mimeview.php = tracopt.mimeview.php
-        tracopt.perm.authz_policy = tracopt.perm.authz_policy
-        tracopt.perm.config_perm_provider = tracopt.perm.config_perm_provider
-        tracopt.ticket.commit_updater = tracopt.ticket.commit_updater
-        tracopt.ticket.deleter = tracopt.ticket.deleter
-    """,
-
-    **extra
-)
diff --git a/distutils2/tests/conversions/05_before.py b/distutils2/tests/conversions/05_before.py
deleted file mode 100644
--- a/distutils2/tests/conversions/05_before.py
+++ /dev/null
@@ -1,137 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
-# Copyright (C) 2003-2009 Edgewall Software
-# All rights reserved.
-#
-# This software is licensed as described in the file COPYING, which
-# you should have received as part of this distribution. The terms
-# are also available at http://trac.edgewall.org/wiki/TracLicense.
-#
-# This software consists of voluntary contributions made by many
-# individuals. For the exact contribution history, see the revision
-# history and logs, available at http://trac.edgewall.org/log/.
-
-from setuptools import setup, find_packages
-
-extra = {}
-
-try:
-    import babel
-    
-    extractors = [
-        ('**.py',                'python', None),
-        ('**/templates/**.html', 'genshi', None),
-        ('**/templates/**.txt',  'genshi',
-         {'template_class': 'genshi.template:NewTextTemplate'}),
-    ]
-    extra['message_extractors'] = {
-        'trac': extractors,
-        'tracopt': extractors,
-    }
-
-    from trac.util.dist import get_l10n_js_cmdclass
-    extra['cmdclass'] = get_l10n_js_cmdclass()
-
-except ImportError, e:
-    pass
-
-setup(
-    name = 'Trac',
-    version = '0.12.1',
-    description = 'Integrated SCM, wiki, issue tracker and project environment',
-    long_description = """
-Trac is a minimalistic web-based software project management and bug/issue
-tracking system. It provides an interface to the Subversion revision control
-systems, an integrated wiki, flexible issue tracking and convenient report
-facilities.
-""",
-    author = 'Edgewall Software',
-    author_email = 'info at edgewall.com',
-    license = 'BSD',
-    url = 'http://trac.edgewall.org/',
-    download_url = 'http://trac.edgewall.org/wiki/TracDownload',
-    classifiers = [
-        'Environment :: Web Environment',
-        'Framework :: Trac',
-        'Intended Audience :: Developers',
-        'License :: OSI Approved :: BSD License',
-        'Operating System :: OS Independent',
-        'Programming Language :: Python',
-        'Topic :: Software Development :: Bug Tracking',
-        'Topic :: Software Development :: Version Control',
-    ],
-
-    packages = find_packages(exclude=['*.tests']),
-    package_data = {
-        '': ['templates/*'],
-        'trac': ['htdocs/*.*', 'htdocs/README', 'htdocs/js/*.*',
-                 'htdocs/js/messages/*.*', 'htdocs/css/*.*',
-                 'htdocs/guide/*', 'locale/*/LC_MESSAGES/messages.mo'],
-        'trac.wiki': ['default-pages/*'],
-        'trac.ticket': ['workflows/*.ini'],
-    },
-
-    test_suite = 'trac.test.suite',
-    zip_safe = True,
-
-    install_requires = [
-        'setuptools>=0.6b1',
-        'Genshi>=0.6',
-    ],
-    extras_require = {
-        'Babel': ['Babel>=0.9.5'],
-        'Pygments': ['Pygments>=0.6'],
-        'reST': ['docutils>=0.3'],
-        'SilverCity': ['SilverCity>=0.9.4'],
-        'Textile': ['textile>=2.0'],
-    },
-
-    entry_points = """
-        [console_scripts]
-        trac-admin = trac.admin.console:run
-        tracd = trac.web.standalone:main
-
-        [trac.plugins]
-        trac.about = trac.about
-        trac.admin.console = trac.admin.console
-        trac.admin.web_ui = trac.admin.web_ui
-        trac.attachment = trac.attachment
-        trac.db.mysql = trac.db.mysql_backend
-        trac.db.postgres = trac.db.postgres_backend
-        trac.db.sqlite = trac.db.sqlite_backend
-        trac.mimeview.patch = trac.mimeview.patch
-        trac.mimeview.pygments = trac.mimeview.pygments[Pygments]
-        trac.mimeview.rst = trac.mimeview.rst[reST]
-        trac.mimeview.silvercity = trac.mimeview.silvercity[SilverCity]
-        trac.mimeview.txtl = trac.mimeview.txtl[Textile]
-        trac.prefs = trac.prefs.web_ui
-        trac.search = trac.search.web_ui
-        trac.ticket.admin = trac.ticket.admin
-        trac.ticket.query = trac.ticket.query
-        trac.ticket.report = trac.ticket.report
-        trac.ticket.roadmap = trac.ticket.roadmap
-        trac.ticket.web_ui = trac.ticket.web_ui
-        trac.timeline = trac.timeline.web_ui
-        trac.versioncontrol.admin = trac.versioncontrol.admin
-        trac.versioncontrol.svn_authz = trac.versioncontrol.svn_authz
-        trac.versioncontrol.svn_fs = trac.versioncontrol.svn_fs
-        trac.versioncontrol.svn_prop = trac.versioncontrol.svn_prop
-        trac.versioncontrol.web_ui = trac.versioncontrol.web_ui
-        trac.web.auth = trac.web.auth
-        trac.web.session = trac.web.session
-        trac.wiki.admin = trac.wiki.admin
-        trac.wiki.interwiki = trac.wiki.interwiki
-        trac.wiki.macros = trac.wiki.macros
-        trac.wiki.web_ui = trac.wiki.web_ui
-        trac.wiki.web_api = trac.wiki.web_api
-        tracopt.mimeview.enscript = tracopt.mimeview.enscript
-        tracopt.mimeview.php = tracopt.mimeview.php
-        tracopt.perm.authz_policy = tracopt.perm.authz_policy
-        tracopt.perm.config_perm_provider = tracopt.perm.config_perm_provider
-        tracopt.ticket.commit_updater = tracopt.ticket.commit_updater
-        tracopt.ticket.deleter = tracopt.ticket.deleter
-    """,
-
-    **extra
-)

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


More information about the Python-checkins mailing list