[cig-commits] r5208 - in cs/merlin/trunk: . merlin merlin/command
merlin/tests tests/shlib_test
leif at geodynamics.org
leif at geodynamics.org
Wed Nov 8 15:29:39 PST 2006
Author: leif
Date: 2006-11-08 15:29:39 -0800 (Wed, 08 Nov 2006)
New Revision: 5208
Modified:
cs/merlin/trunk/easy_install.py
cs/merlin/trunk/merlin/__init__.py
cs/merlin/trunk/merlin/command/alias.py
cs/merlin/trunk/merlin/command/bdist_egg.py
cs/merlin/trunk/merlin/command/build_ext.py
cs/merlin/trunk/merlin/command/build_py.py
cs/merlin/trunk/merlin/command/develop.py
cs/merlin/trunk/merlin/command/easy_install.py
cs/merlin/trunk/merlin/command/egg_info.py
cs/merlin/trunk/merlin/command/install.py
cs/merlin/trunk/merlin/command/install_egg_info.py
cs/merlin/trunk/merlin/command/install_lib.py
cs/merlin/trunk/merlin/command/rotate.py
cs/merlin/trunk/merlin/command/saveopts.py
cs/merlin/trunk/merlin/command/sdist.py
cs/merlin/trunk/merlin/command/setopt.py
cs/merlin/trunk/merlin/command/test.py
cs/merlin/trunk/merlin/dist.py
cs/merlin/trunk/merlin/package_index.py
cs/merlin/trunk/merlin/tests/__init__.py
cs/merlin/trunk/merlin/tests/test_resources.py
cs/merlin/trunk/pkg_resources.py
cs/merlin/trunk/setup.py
cs/merlin/trunk/tests/shlib_test/setup.py
Log:
Systematic setuptools -> merlin find & replace.
Modified: cs/merlin/trunk/easy_install.py
===================================================================
--- cs/merlin/trunk/easy_install.py 2006-11-08 23:07:32 UTC (rev 5207)
+++ cs/merlin/trunk/easy_install.py 2006-11-08 23:29:39 UTC (rev 5208)
@@ -1,5 +1,5 @@
"""Run the EasyInstall command"""
if __name__ == '__main__':
- from setuptools.command.easy_install import main
+ from merlin.command.easy_install import main
main()
Modified: cs/merlin/trunk/merlin/__init__.py
===================================================================
--- cs/merlin/trunk/merlin/__init__.py 2006-11-08 23:07:32 UTC (rev 5207)
+++ cs/merlin/trunk/merlin/__init__.py 2006-11-08 23:29:39 UTC (rev 5208)
@@ -1,8 +1,8 @@
"""Extensions to the 'distutils' for large or complex distributions"""
-from setuptools.extension import Extension, Library
-from setuptools.dist import Distribution, Feature, _get_unpatched
-import distutils.core, setuptools.command
-from setuptools.depends import Require
+from merlin.extension import Extension, Library
+from merlin.dist import Distribution, Feature, _get_unpatched
+import distutils.core, merlin.command
+from merlin.depends import Require
from distutils.core import Command as _Command
from distutils.util import convert_path
import os.path
Modified: cs/merlin/trunk/merlin/command/alias.py
===================================================================
--- cs/merlin/trunk/merlin/command/alias.py 2006-11-08 23:07:32 UTC (rev 5207)
+++ cs/merlin/trunk/merlin/command/alias.py 2006-11-08 23:29:39 UTC (rev 5208)
@@ -1,9 +1,9 @@
import distutils, os
-from setuptools import Command
+from merlin import Command
from distutils.util import convert_path
from distutils import log
from distutils.errors import *
-from setuptools.command.setopt import edit_config, option_base, config_file
+from merlin.command.setopt import edit_config, option_base, config_file
def shquote(arg):
"""Quote an argument for later parsing by shlex.split()"""
Modified: cs/merlin/trunk/merlin/command/bdist_egg.py
===================================================================
--- cs/merlin/trunk/merlin/command/bdist_egg.py 2006-11-08 23:07:32 UTC (rev 5207)
+++ cs/merlin/trunk/merlin/command/bdist_egg.py 2006-11-08 23:29:39 UTC (rev 5208)
@@ -1,16 +1,16 @@
-"""setuptools.command.bdist_egg
+"""merlin.command.bdist_egg
Build .egg distributions"""
# This module should be kept compatible with Python 2.3
import sys, os, marshal
-from setuptools import Command
+from merlin import Command
from distutils.dir_util import remove_tree, mkpath
from distutils.sysconfig import get_python_version, get_python_lib
from distutils import log
from pkg_resources import get_build_platform, Distribution, ensure_directory
from types import CodeType
-from setuptools.extension import Library
+from merlin.extension import Library
def strip_module(filename):
if '.' in filename:
Modified: cs/merlin/trunk/merlin/command/build_ext.py
===================================================================
--- cs/merlin/trunk/merlin/command/build_ext.py 2006-11-08 23:07:32 UTC (rev 5207)
+++ cs/merlin/trunk/merlin/command/build_ext.py 2006-11-08 23:29:39 UTC (rev 5208)
@@ -7,7 +7,7 @@
import os, sys
from distutils.file_util import copy_file
-from setuptools.extension import Library
+from merlin.extension import Library
from distutils.ccompiler import new_compiler
from distutils.sysconfig import customize_compiler, get_config_var
get_config_var("LDSHARED") # make sure _config_vars is initialized
Modified: cs/merlin/trunk/merlin/command/build_py.py
===================================================================
--- cs/merlin/trunk/merlin/command/build_py.py 2006-11-08 23:07:32 UTC (rev 5207)
+++ cs/merlin/trunk/merlin/command/build_py.py 2006-11-08 23:29:39 UTC (rev 5208)
@@ -7,7 +7,7 @@
"""Enhanced 'build_py' command that includes data files with packages
The data files are specified via a 'package_data' argument to 'setup()'.
- See 'setuptools.dist.Distribution' for more details.
+ See 'merlin.dist.Distribution' for more details.
Also, this version of the 'build_py' command allows you to specify both
'py_modules' and 'packages' in the same setup operation.
Modified: cs/merlin/trunk/merlin/command/develop.py
===================================================================
--- cs/merlin/trunk/merlin/command/develop.py 2006-11-08 23:07:32 UTC (rev 5207)
+++ cs/merlin/trunk/merlin/command/develop.py 2006-11-08 23:29:39 UTC (rev 5208)
@@ -1,9 +1,9 @@
-from setuptools.command.easy_install import easy_install
+from merlin.command.easy_install import easy_install
from distutils.util import convert_path
from pkg_resources import Distribution, PathMetadata, normalize_path
from distutils import log
from distutils.errors import *
-import sys, os, setuptools
+import sys, os, merlin
class develop(easy_install):
"""Set up package for development"""
@@ -65,9 +65,9 @@
self.reinitialize_command('build_ext', inplace=1)
self.run_command('build_ext')
self.install_site_py() # ensure that target dir is site-safe
- if setuptools.bootstrap_install_from:
- self.easy_install(setuptools.bootstrap_install_from)
- setuptools.bootstrap_install_from = None
+ if merlin.bootstrap_install_from:
+ self.easy_install(merlin.bootstrap_install_from)
+ merlin.bootstrap_install_from = None
# create an .egg-link in the installation dir, pointing to our egg
log.info("Creating %s (link to %s)", self.egg_link, self.egg_base)
Modified: cs/merlin/trunk/merlin/command/easy_install.py
===================================================================
--- cs/merlin/trunk/merlin/command/easy_install.py 2006-11-08 23:07:32 UTC (rev 5207)
+++ cs/merlin/trunk/merlin/command/easy_install.py 2006-11-08 23:29:39 UTC (rev 5208)
@@ -11,16 +11,16 @@
"""
import sys, os.path, zipimport, shutil, tempfile, zipfile, re, stat, random
from glob import glob
-from setuptools import Command
-from setuptools.sandbox import run_setup
+from merlin import Command
+from merlin.sandbox import run_setup
from distutils import log, dir_util
from distutils.sysconfig import get_python_lib
from distutils.errors import DistutilsArgError, DistutilsOptionError, \
DistutilsError
-from setuptools.archive_util import unpack_archive
-from setuptools.package_index import PackageIndex, parse_bdist_wininst
-from setuptools.package_index import URL_SCHEME
-from setuptools.command import bdist_egg, egg_info
+from merlin.archive_util import unpack_archive
+from merlin.package_index import PackageIndex, parse_bdist_wininst
+from merlin.package_index import URL_SCHEME
+from merlin.command import bdist_egg, egg_info
from pkg_resources import *
sys_executable = os.path.normpath(sys.executable)
@@ -968,10 +968,10 @@
self.pth_file.save()
- if dist.key=='setuptools':
+ if dist.key=='merlin':
# Ensure that setuptools itself never becomes unavailable!
# XXX should this check for latest version?
- filename = os.path.join(self.install_dir,'setuptools.pth')
+ filename = os.path.join(self.install_dir,'merlin.pth')
if os.path.islink(filename): os.unlink(filename)
f = open(filename, 'wt')
f.write(self.pth_file.make_relative(dist.location)+'\n')
@@ -1071,7 +1071,7 @@
return # already did it, or don't need to
sitepy = os.path.join(self.install_dir, "site.py")
- source = resource_string(Requirement.parse("setuptools"), "site.py")
+ source = resource_string(Requirement.parse("merlin"), "site.py")
current = ""
if os.path.exists(sitepy):
@@ -1079,7 +1079,7 @@
current = open(sitepy,'rb').read()
if not current.startswith('def __boot():'):
raise DistutilsError(
- "%s is not a setuptools-generated site.py; please"
+ "%s is not a merlin-generated site.py; please"
" remove it." % sitepy
)
@@ -1208,7 +1208,7 @@
if not name.endswith('.pth'):
# We only care about the .pth files
continue
- if name in ('easy-install.pth','setuptools.pth'):
+ if name in ('easy-install.pth','merlin.pth'):
# Ignore .pth files that we control
continue
@@ -1507,7 +1507,7 @@
hdr = header
yield (name+ext, hdr+script_text, 't', [name+x for x in old])
yield (
- name+'.exe', resource_string('setuptools', launcher),
+ name+'.exe', resource_string('merlin', launcher),
'b' # write in binary mode
)
else:
@@ -1557,8 +1557,8 @@
def main(argv=None, **kw):
- from setuptools import setup
- from setuptools.dist import Distribution
+ from merlin import setup
+ from merlin.dist import Distribution
import distutils.core
USAGE = """\
Modified: cs/merlin/trunk/merlin/command/egg_info.py
===================================================================
--- cs/merlin/trunk/merlin/command/egg_info.py 2006-11-08 23:07:32 UTC (rev 5207)
+++ cs/merlin/trunk/merlin/command/egg_info.py 2006-11-08 23:29:39 UTC (rev 5208)
@@ -1,13 +1,13 @@
-"""setuptools.command.egg_info
+"""merlin.command.egg_info
Create a distribution's .egg-info directory and contents"""
# This module should be kept compatible with Python 2.3
import os, re
-from setuptools import Command
+from merlin import Command
from distutils.errors import *
from distutils import log
-from setuptools.command.sdist import sdist
+from merlin.command.sdist import sdist
from distutils import file_util
from distutils.util import convert_path
from distutils.filelist import FileList
Modified: cs/merlin/trunk/merlin/command/install.py
===================================================================
--- cs/merlin/trunk/merlin/command/install.py 2006-11-08 23:07:32 UTC (rev 5207)
+++ cs/merlin/trunk/merlin/command/install.py 2006-11-08 23:29:39 UTC (rev 5208)
@@ -1,4 +1,4 @@
-import setuptools, sys
+import merlin, sys
from distutils.command.install import install as _install
from distutils.errors import DistutilsArgError
@@ -82,7 +82,7 @@
def do_egg_install(self):
- from setuptools.command.easy_install import easy_install
+ from merlin.command.easy_install import easy_install
cmd = easy_install(
self.distribution, args="x", root=self.root, record=self.record,
@@ -92,13 +92,13 @@
self.run_command('bdist_egg')
args = [self.distribution.get_command_obj('bdist_egg').egg_output]
- if setuptools.bootstrap_install_from:
- # Bootstrap self-installation of setuptools
- args.insert(0, setuptools.bootstrap_install_from)
+ if merlin.bootstrap_install_from:
+ # Bootstrap self-installation of merlin
+ args.insert(0, merlin.bootstrap_install_from)
cmd.args = args
cmd.run()
- setuptools.bootstrap_install_from = None
+ merlin.bootstrap_install_from = None
Modified: cs/merlin/trunk/merlin/command/install_egg_info.py
===================================================================
--- cs/merlin/trunk/merlin/command/install_egg_info.py 2006-11-08 23:07:32 UTC (rev 5207)
+++ cs/merlin/trunk/merlin/command/install_egg_info.py 2006-11-08 23:29:39 UTC (rev 5208)
@@ -1,5 +1,5 @@
-from setuptools import Command
-from setuptools.archive_util import unpack_archive
+from merlin import Command
+from merlin.archive_util import unpack_archive
from distutils import log, dir_util
import os, shutil, pkg_resources
Modified: cs/merlin/trunk/merlin/command/install_lib.py
===================================================================
--- cs/merlin/trunk/merlin/command/install_lib.py 2006-11-08 23:07:32 UTC (rev 5207)
+++ cs/merlin/trunk/merlin/command/install_lib.py 2006-11-08 23:29:39 UTC (rev 5208)
@@ -51,7 +51,7 @@
# Exclude namespace package __init__.py* files from the output
- from setuptools.archive_util import unpack_directory
+ from merlin.archive_util import unpack_directory
from distutils import log
outfiles = []
Modified: cs/merlin/trunk/merlin/command/rotate.py
===================================================================
--- cs/merlin/trunk/merlin/command/rotate.py 2006-11-08 23:07:32 UTC (rev 5207)
+++ cs/merlin/trunk/merlin/command/rotate.py 2006-11-08 23:29:39 UTC (rev 5208)
@@ -1,5 +1,5 @@
import distutils, os
-from setuptools import Command
+from merlin import Command
from distutils.util import convert_path
from distutils import log
from distutils.errors import *
Modified: cs/merlin/trunk/merlin/command/saveopts.py
===================================================================
--- cs/merlin/trunk/merlin/command/saveopts.py 2006-11-08 23:07:32 UTC (rev 5207)
+++ cs/merlin/trunk/merlin/command/saveopts.py 2006-11-08 23:29:39 UTC (rev 5208)
@@ -1,6 +1,6 @@
import distutils, os
-from setuptools import Command
-from setuptools.command.setopt import edit_config, option_base
+from merlin import Command
+from merlin.command.setopt import edit_config, option_base
class saveopts(option_base):
"""Save command-line options to a file"""
Modified: cs/merlin/trunk/merlin/command/sdist.py
===================================================================
--- cs/merlin/trunk/merlin/command/sdist.py 2006-11-08 23:07:32 UTC (rev 5207)
+++ cs/merlin/trunk/merlin/command/sdist.py 2006-11-08 23:29:39 UTC (rev 5208)
@@ -41,7 +41,7 @@
def walk_revctrl(dirname=''):
"""Find all files under revision control"""
- for ep in pkg_resources.iter_entry_points('setuptools.file_finders'):
+ for ep in pkg_resources.iter_entry_points('merlin.file_finders'):
for item in ep.load()(dirname):
yield item
Modified: cs/merlin/trunk/merlin/command/setopt.py
===================================================================
--- cs/merlin/trunk/merlin/command/setopt.py 2006-11-08 23:07:32 UTC (rev 5207)
+++ cs/merlin/trunk/merlin/command/setopt.py 2006-11-08 23:29:39 UTC (rev 5208)
@@ -1,5 +1,5 @@
import distutils, os
-from setuptools import Command
+from merlin import Command
from distutils.util import convert_path
from distutils import log
from distutils.errors import *
Modified: cs/merlin/trunk/merlin/command/test.py
===================================================================
--- cs/merlin/trunk/merlin/command/test.py 2006-11-08 23:07:32 UTC (rev 5207)
+++ cs/merlin/trunk/merlin/command/test.py 2006-11-08 23:29:39 UTC (rev 5208)
@@ -1,4 +1,4 @@
-from setuptools import Command
+from merlin import Command
from distutils.errors import DistutilsOptionError
import sys
from pkg_resources import *
@@ -14,7 +14,7 @@
the return value to the tests.
"""
tests = []
- if module.__name__!='setuptools.tests.doctest': # ugh
+ if module.__name__!='merlin.tests.doctest': # ugh
tests.append(TestLoader.loadTestsFromModule(self,module))
if hasattr(module, "additional_tests"):
@@ -76,7 +76,7 @@
if self.test_loader is None:
self.test_loader = getattr(self.distribution,'test_loader',None)
if self.test_loader is None:
- self.test_loader = "setuptools.command.test:ScanningLoader"
+ self.test_loader = "merlin.command.test:ScanningLoader"
Modified: cs/merlin/trunk/merlin/dist.py
===================================================================
--- cs/merlin/trunk/merlin/dist.py 2006-11-08 23:07:32 UTC (rev 5207)
+++ cs/merlin/trunk/merlin/dist.py 2006-11-08 23:29:39 UTC (rev 5208)
@@ -1,13 +1,13 @@
__all__ = ['Distribution']
from distutils.core import Distribution as _Distribution
-from setuptools.depends import Require
-from setuptools.command.install import install
-from setuptools.command.sdist import sdist
-from setuptools.command.install_lib import install_lib
+from merlin.depends import Require
+from merlin.command.install import install
+from merlin.command.sdist import sdist
+from merlin.command.install_lib import install_lib
from distutils.errors import DistutilsOptionError, DistutilsPlatformError
from distutils.errors import DistutilsSetupError
-import setuptools, pkg_resources, distutils.core, distutils.dist, distutils.cmd
+import merlin, pkg_resources, distutils.core, distutils.dist, distutils.cmd
import os
def _get_unpatched(cls):
@@ -16,7 +16,7 @@
Also ensures that no other distutils extension monkeypatched the distutils
first.
"""
- while cls.__module__.startswith('setuptools'):
+ while cls.__module__.startswith('merlin'):
cls, = cls.__bases__
if not cls.__module__.startswith('distutils'):
raise AssertionError(
@@ -134,7 +134,7 @@
packages that are not available in PyPI, or want to give your users an
alternate download location, you can add a 'find_links' option to the
'[easy_install]' section of your project's 'setup.cfg' file, and then
- setuptools will scan the listed web pages for links that satisfy the
+ merlin will scan the listed web pages for links that satisfy the
requirements.
'extras_require' -- a dictionary mapping names of optional "extras" to the
@@ -149,7 +149,7 @@
EasyInstall and requests one of your extras, the corresponding
additional requirements will be installed if needed.
- 'features' -- a dictionary mapping option names to 'setuptools.Feature'
+ 'features' -- a dictionary mapping option names to 'merlin.Feature'
objects. Features are a portion of the distribution that can be
included or excluded based on user options, inter-feature dependencies,
and availability on the current system. Excluded features are omitted
@@ -260,7 +260,7 @@
try:
cmd = self._egg_fetcher
except AttributeError:
- from setuptools.command.easy_install import easy_install
+ from merlin.command.easy_install import easy_install
dist = self.__class__({'script_args':['easy_install']})
dist.parse_config_files()
opts = dist.get_option_dict('easy_install')
Modified: cs/merlin/trunk/merlin/package_index.py
===================================================================
--- cs/merlin/trunk/merlin/package_index.py 2006-11-08 23:07:32 UTC (rev 5207)
+++ cs/merlin/trunk/merlin/package_index.py 2006-11-08 23:29:39 UTC (rev 5208)
@@ -141,8 +141,8 @@
if match:
yield urlparse.urljoin(url, match.group(1))
-user_agent = "Python-urllib/%s setuptools/%s" % (
- urllib2.__version__, require('setuptools')[0].version
+user_agent = "Python-urllib/%s merlin/%s" % (
+ urllib2.__version__, require('merlin')[0].version
)
@@ -502,14 +502,14 @@
# Make sure the file has been downloaded to the temp dir.
if os.path.dirname(filename) != tmpdir:
dst = os.path.join(tmpdir, basename)
- from setuptools.command.easy_install import samefile
+ from merlin.command.easy_install import samefile
if not samefile(filename, dst):
shutil.copy2(filename, dst)
filename=dst
file = open(os.path.join(tmpdir, 'setup.py'), 'w')
file.write(
- "from setuptools import setup\n"
+ "from merlin import setup\n"
"setup(name=%r, version=%r, py_modules=[%r])\n"
% (
dists[0].project_name, dists[0].version,
Modified: cs/merlin/trunk/merlin/tests/__init__.py
===================================================================
--- cs/merlin/trunk/merlin/tests/__init__.py 2006-11-08 23:07:32 UTC (rev 5207)
+++ cs/merlin/trunk/merlin/tests/__init__.py 2006-11-08 23:29:39 UTC (rev 5208)
@@ -1,14 +1,14 @@
-"""Tests for the 'setuptools' package"""
+"""Tests for the 'merlin' package"""
from unittest import TestSuite, TestCase, makeSuite, defaultTestLoader
import distutils.core, distutils.cmd
from distutils.errors import DistutilsOptionError, DistutilsPlatformError
from distutils.errors import DistutilsSetupError
-import setuptools, setuptools.dist
-from setuptools import Feature
+import merlin, merlin.dist
+from merlin import Feature
from distutils.core import Extension
-from setuptools.depends import extract_constant, get_module_constant
-from setuptools.depends import find_module, Require
+from merlin.depends import extract_constant, get_module_constant
+from merlin.depends import find_module, Require
from distutils.version import StrictVersion, LooseVersion
from distutils.util import convert_path
import sys, os.path
@@ -34,7 +34,7 @@
args.setdefault('script_args',['install'])
try:
- return setuptools.setup(**args)
+ return merlin.setup(**args)
finally:
distutils.core_setup_stop_after = None
@@ -48,7 +48,7 @@
def testExtractConst(self):
- from setuptools.depends import extract_constant
+ from merlin.depends import extract_constant
def f1():
global x,y,z
@@ -70,8 +70,8 @@
def testFindModule(self):
self.assertRaises(ImportError, find_module, 'no-such.-thing')
- self.assertRaises(ImportError, find_module, 'setuptools.non-existent')
- f,p,i = find_module('setuptools.tests'); f.close()
+ self.assertRaises(ImportError, find_module, 'merlin.non-existent')
+ f,p,i = find_module('merlin.tests'); f.close()
def testModuleExtract(self):
from distutils import __version__
@@ -82,7 +82,7 @@
get_module_constant('sys','version'), sys.version
)
self.assertEqual(
- get_module_constant('setuptools.tests','__doc__'),__doc__
+ get_module_constant('merlin.tests','__doc__'),__doc__
)
def testRequire(self):
@@ -141,7 +141,7 @@
def testDistroType(self):
- self.failUnless(isinstance(self.dist,setuptools.dist.Distribution))
+ self.failUnless(isinstance(self.dist,merlin.dist.Distribution))
def testExcludePackage(self):
Modified: cs/merlin/trunk/merlin/tests/test_resources.py
===================================================================
--- cs/merlin/trunk/merlin/tests/test_resources.py 2006-11-08 23:07:32 UTC (rev 5207)
+++ cs/merlin/trunk/merlin/tests/test_resources.py 2006-11-08 23:29:39 UTC (rev 5208)
@@ -207,13 +207,13 @@
def assertfields(self, ep):
self.assertEqual(ep.name,"foo")
- self.assertEqual(ep.module_name,"setuptools.tests.test_resources")
+ self.assertEqual(ep.module_name,"merlin.tests.test_resources")
self.assertEqual(ep.attrs, ("EntryPointTests",))
self.assertEqual(ep.extras, ("x",))
self.failUnless(ep.load() is EntryPointTests)
self.assertEqual(
str(ep),
- "foo = setuptools.tests.test_resources:EntryPointTests [x]"
+ "foo = merlin.tests.test_resources:EntryPointTests [x]"
)
def setUp(self):
@@ -222,13 +222,13 @@
def testBasics(self):
ep = EntryPoint(
- "foo", "setuptools.tests.test_resources", ["EntryPointTests"],
+ "foo", "merlin.tests.test_resources", ["EntryPointTests"],
["x"], self.dist
)
self.assertfields(ep)
def testParse(self):
- s = "foo = setuptools.tests.test_resources:EntryPointTests [x]"
+ s = "foo = merlin.tests.test_resources:EntryPointTests [x]"
ep = EntryPoint.parse(s, self.dist)
self.assertfields(ep)
Modified: cs/merlin/trunk/pkg_resources.py
===================================================================
--- cs/merlin/trunk/pkg_resources.py 2006-11-08 23:07:32 UTC (rev 5207)
+++ cs/merlin/trunk/pkg_resources.py 2006-11-08 23:29:39 UTC (rev 5208)
@@ -2172,7 +2172,7 @@
def check_version_conflict(self):
- if self.key=='setuptools':
+ if self.key=='merlin':
return # ignore the inevitable setuptools self-conflicts :(
nsp = dict.fromkeys(self._get_metadata('namespace_packages.txt'))
Modified: cs/merlin/trunk/setup.py
===================================================================
--- cs/merlin/trunk/setup.py 2006-11-08 23:07:32 UTC (rev 5207)
+++ cs/merlin/trunk/setup.py 2006-11-08 23:29:39 UTC (rev 5208)
@@ -82,7 +82,7 @@
"merlin = merlin.command.easy_install:main",
],
- "setuptools.file_finders":
+ "merlin.file_finders":
["svn_cvs = merlin.command.sdist:_default_revctrl"]
},
Modified: cs/merlin/trunk/tests/shlib_test/setup.py
===================================================================
--- cs/merlin/trunk/tests/shlib_test/setup.py 2006-11-08 23:07:32 UTC (rev 5207)
+++ cs/merlin/trunk/tests/shlib_test/setup.py 2006-11-08 23:29:39 UTC (rev 5208)
@@ -1,4 +1,4 @@
-from setuptools import setup, Extension, Library
+from merlin import setup, Extension, Library
setup(
name="shlib_test",
More information about the cig-commits
mailing list