[cig-commits] r5209 - in cs/merlin/trunk: merlin/command
merlin.egg-info
leif at geodynamics.org
leif at geodynamics.org
Wed Nov 8 15:45:19 PST 2006
Author: leif
Date: 2006-11-08 15:45:19 -0800 (Wed, 08 Nov 2006)
New Revision: 5209
Modified:
cs/merlin/trunk/merlin.egg-info/PKG-INFO
cs/merlin/trunk/merlin.egg-info/SOURCES.txt
cs/merlin/trunk/merlin.egg-info/entry_points.txt
cs/merlin/trunk/merlin.egg-info/top_level.txt
cs/merlin/trunk/merlin/command/easy_install.py
Log:
More systematic setuptools -> merlin find & replace.
Modified: cs/merlin/trunk/merlin/command/easy_install.py
===================================================================
--- cs/merlin/trunk/merlin/command/easy_install.py 2006-11-08 23:29:39 UTC (rev 5208)
+++ cs/merlin/trunk/merlin/command/easy_install.py 2006-11-08 23:45:19 UTC (rev 5209)
@@ -234,7 +234,7 @@
pid = os.getpid()
except:
pid = random.randint(0,sys.maxint)
- return os.path.join(self.install_dir, "test-easy-install-%s" % pid)
+ return os.path.join(self.install_dir, "test-merlin-install-%s" % pid)
def warn_deprecated_options(self):
if self.delete_conflicting or self.ignore_conflicts_at_my_risk:
@@ -247,7 +247,7 @@
def check_site_dir(self):
"""Verify that self.install_dir is .pth-capable dir, if needed"""
instdir = normalize_path(self.install_dir)
- pth_file = os.path.join(instdir,'easy-install.pth')
+ pth_file = os.path.join(instdir,'merlin-install.pth')
# Is it a configured, PYTHONPATH, implicit, or explicit site dir?
is_site_dir = instdir in self.all_site_dirs
@@ -947,7 +947,7 @@
for d in self.pth_file[dist.key]: # drop old entries
if self.multi_version or d.location != dist.location:
- log.info("Removing %s from easy-install.pth file", d)
+ log.info("Removing %s from merlin-install.pth file", d)
self.pth_file.remove(d)
if d.location in self.shadow_path:
self.shadow_path.remove(d.location)
@@ -955,11 +955,11 @@
if not self.multi_version:
if dist.location in self.pth_file.paths:
log.info(
- "%s is already the active version in easy-install.pth",
+ "%s is already the active version in merlin-install.pth",
dist
)
else:
- log.info("Adding %s to easy-install.pth file", dist)
+ log.info("Adding %s to merlin-install.pth file", dist)
self.pth_file.add(dist) # add new entry
if dist.location not in self.shadow_path:
self.shadow_path.append(dist.location)
@@ -1208,7 +1208,7 @@
if not name.endswith('.pth'):
# We only care about the .pth files
continue
- if name in ('easy-install.pth','merlin.pth'):
+ if name in ('merlin-install.pth','merlin.pth'):
# Ignore .pth files that we control
continue
Modified: cs/merlin/trunk/merlin.egg-info/PKG-INFO
===================================================================
--- cs/merlin/trunk/merlin.egg-info/PKG-INFO 2006-11-08 23:29:39 UTC (rev 5208)
+++ cs/merlin/trunk/merlin.egg-info/PKG-INFO 2006-11-08 23:45:19 UTC (rev 5209)
@@ -1,89 +1,10 @@
Metadata-Version: 1.0
-Name: setuptools
-Version: 0.6c3
-Summary: Download, build, install, upgrade, and uninstall Python packages -- easily!
-Home-page: http://peak.telecommunity.com/DevCenter/setuptools
-Author: Phillip J. Eby
-Author-email: peak at eby-sarna.com
+Name: merlin
+Version: 1.0b1
+Summary: A custom version of Phillip J. Eby's setuptools.
+Home-page: http://www.geodynamics.org/cig/software/packages/pythia/
+Author: Leif Strand
+Author-email: leif at geodynamics.org
License: PSF or ZPL
-Description: ``setuptools`` is a collection of enhancements to the Python ``distutils``
- (for Python 2.3.5 and up on most platforms; 64-bit platforms require a minimum
- of Python 2.4) that allow you to more easily build and distribute Python
- packages, especially ones that have dependencies on other packages.
-
- Packages built and distributed using ``setuptools`` look to the user like
- ordinary Python packages based on the ``distutils``. Your users don't need to
- install or even know about setuptools in order to use them, and you don't
- have to include the entire setuptools package in your distributions. By
- including just a single `bootstrap module`_ (an 8K .py file), your package will
- automatically download and install ``setuptools`` if the user is building your
- package from source and doesn't have a suitable version already installed.
-
- .. _bootstrap module: http://peak.telecommunity.com/dist/ez_setup.py
-
- Feature Highlights:
-
- * Automatically find/download/install/upgrade dependencies at build time using
- the `EasyInstall tool <http://peak.telecommunity.com/DevCenter/EasyInstall>`_,
- which supports downloading via HTTP, FTP, Subversion, and SourceForge, and
- automatically scans web pages linked from PyPI to find download links. (It's
- the closest thing to CPAN currently available for Python.)
-
- * Create `Python Eggs <http://peak.telecommunity.com/DevCenter/PythonEggs>`_ -
- a single-file importable distribution format
-
- * Include data files inside your package directories, where your code can
- actually use them. (Python 2.4 distutils also supports this feature, but
- setuptools provides the feature for Python 2.3 packages also, and supports
- accessing data files in zipped packages too.)
-
- * Automatically include all packages in your source tree, without listing them
- individually in setup.py
-
- * Automatically include all relevant files in your source distributions,
- without needing to create a ``MANIFEST.in`` file, and without having to force
- regeneration of the ``MANIFEST`` file when your source tree changes.
-
- * Automatically generate wrapper scripts or Windows (console and GUI) .exe
- files for any number of "main" functions in your project. (Note: this is not
- a py2exe replacement; the .exe files rely on the local Python installation.)
-
- * Transparent Pyrex support, so that your setup.py can list ``.pyx`` files and
- still work even when the end-user doesn't have Pyrex installed (as long as
- you include the Pyrex-generated C in your source distribution)
-
- * Command aliases - create project-specific, per-user, or site-wide shortcut
- names for commonly used commands and options
-
- * PyPI upload support - upload your source distributions and eggs to PyPI
-
- * Deploy your project in "development mode", such that it's available on
- ``sys.path``, yet can still be edited directly from its source checkout.
-
- * Easily extend the distutils with new commands or ``setup()`` arguments, and
- distribute/reuse your extensions for multiple projects, without copying code.
-
- * Create extensible applications and frameworks that automatically discover
- extensions, using simple "entry points" declared in a project's setup script.
-
- In addition to the PyPI downloads, the development version of ``setuptools``
- is available from the `Python SVN sandbox`_, and in-development versions of the
- `0.6 branch`_ are available as well.
-
- .. _0.6 branch: http://svn.python.org/projects/sandbox/branches/setuptools-0.6/#egg=setuptools-dev06
-
- .. _Python SVN sandbox: http://svn.python.org/projects/sandbox/trunk/setuptools/#egg=setuptools-dev
-
-
-Keywords: CPAN PyPI distutils eggs package management
+Description: UNKNOWN
Platform: UNKNOWN
-Classifier: Development Status :: 3 - Alpha
-Classifier: Intended Audience :: Developers
-Classifier: License :: OSI Approved :: Python Software Foundation License
-Classifier: License :: OSI Approved :: Zope Public License
-Classifier: Operating System :: OS Independent
-Classifier: Programming Language :: Python
-Classifier: Topic :: Software Development :: Libraries :: Python Modules
-Classifier: Topic :: System :: Archiving :: Packaging
-Classifier: Topic :: System :: Systems Administration
-Classifier: Topic :: Utilities
Modified: cs/merlin/trunk/merlin.egg-info/SOURCES.txt
===================================================================
--- cs/merlin/trunk/merlin.egg-info/SOURCES.txt 2006-11-08 23:29:39 UTC (rev 5208)
+++ cs/merlin/trunk/merlin.egg-info/SOURCES.txt 2006-11-08 23:45:19 UTC (rev 5209)
@@ -1,4 +1,5 @@
EasyInstall.txt
+PKG-INFO
api_tests.txt
easy_install.py
ez_setup.py
@@ -13,45 +14,49 @@
version
version.dat
virtual-python.py
-setuptools/__init__.py
-setuptools/archive_util.py
-setuptools/cli.exe
-setuptools/depends.py
-setuptools/dist.py
-setuptools/extension.py
-setuptools/gui.exe
-setuptools/package_index.py
-setuptools/sandbox.py
-setuptools.egg-info/PKG-INFO
-setuptools.egg-info/SOURCES.txt
-setuptools.egg-info/dependency_links.txt
-setuptools.egg-info/entry_points.txt
-setuptools.egg-info/not-zip-safe
-setuptools.egg-info/top_level.txt
-setuptools/command/__init__.py
-setuptools/command/alias.py
-setuptools/command/bdist_egg.py
-setuptools/command/bdist_rpm.py
-setuptools/command/build_ext.py
-setuptools/command/build_py.py
-setuptools/command/develop.py
-setuptools/command/easy_install.py
-setuptools/command/egg_info.py
-setuptools/command/install.py
-setuptools/command/install_egg_info.py
-setuptools/command/install_lib.py
-setuptools/command/install_scripts.py
-setuptools/command/register.py
-setuptools/command/rotate.py
-setuptools/command/saveopts.py
-setuptools/command/sdist.py
-setuptools/command/setopt.py
-setuptools/command/test.py
-setuptools/command/upload.py
-setuptools/tests/__init__.py
-setuptools/tests/doctest.py
-setuptools/tests/test_resources.py
-setuptools/tests/win_script_wrapper.txt
+merlin/__init__.py
+merlin/archive_util.py
+merlin/cli.exe
+merlin/depends.py
+merlin/dist.py
+merlin/extension.py
+merlin/gui.exe
+merlin/package_index.py
+merlin/sandbox.py
+merlin.egg-info/PKG-INFO
+merlin.egg-info/PKG-INFO~
+merlin.egg-info/SOURCES.txt
+merlin.egg-info/SOURCES.txt~
+merlin.egg-info/dependency_links.txt
+merlin.egg-info/entry_points.txt
+merlin.egg-info/entry_points.txt~
+merlin.egg-info/not-zip-safe
+merlin.egg-info/top_level.txt
+merlin.egg-info/top_level.txt~
+merlin/command/__init__.py
+merlin/command/alias.py
+merlin/command/bdist_egg.py
+merlin/command/bdist_rpm.py
+merlin/command/build_ext.py
+merlin/command/build_py.py
+merlin/command/develop.py
+merlin/command/easy_install.py
+merlin/command/egg_info.py
+merlin/command/install.py
+merlin/command/install_egg_info.py
+merlin/command/install_lib.py
+merlin/command/install_scripts.py
+merlin/command/register.py
+merlin/command/rotate.py
+merlin/command/saveopts.py
+merlin/command/sdist.py
+merlin/command/setopt.py
+merlin/command/test.py
+merlin/command/upload.py
+merlin/tests/__init__.py
+merlin/tests/doctest.py
+merlin/tests/test_resources.py
+merlin/tests/win_script_wrapper.txt
tests/shlib_test/hello.c
tests/shlib_test/hello.pyx
tests/shlib_test/hellolib.c
Modified: cs/merlin/trunk/merlin.egg-info/entry_points.txt
===================================================================
--- cs/merlin/trunk/merlin.egg-info/entry_points.txt 2006-11-08 23:29:39 UTC (rev 5208)
+++ cs/merlin/trunk/merlin.egg-info/entry_points.txt 2006-11-08 23:45:19 UTC (rev 5209)
@@ -1,53 +1,52 @@
[distutils.setup_keywords]
-dependency_links = setuptools.dist:assert_string_list
-entry_points = setuptools.dist:check_entry_points
-extras_require = setuptools.dist:check_extras
-package_data = setuptools.dist:check_package_data
-install_requires = setuptools.dist:check_requirements
-include_package_data = setuptools.dist:assert_bool
-exclude_package_data = setuptools.dist:check_package_data
-namespace_packages = setuptools.dist:check_nsp
-test_suite = setuptools.dist:check_test_suite
-eager_resources = setuptools.dist:assert_string_list
-zip_safe = setuptools.dist:assert_bool
-test_loader = setuptools.dist:check_importable
-tests_require = setuptools.dist:check_requirements
+dependency_links = merlin.dist:assert_string_list
+entry_points = merlin.dist:check_entry_points
+extras_require = merlin.dist:check_extras
+package_data = merlin.dist:check_package_data
+install_requires = merlin.dist:check_requirements
+include_package_data = merlin.dist:assert_bool
+exclude_package_data = merlin.dist:check_package_data
+namespace_packages = merlin.dist:check_nsp
+test_suite = merlin.dist:check_test_suite
+eager_resources = merlin.dist:assert_string_list
+zip_safe = merlin.dist:assert_bool
+test_loader = merlin.dist:check_importable
+tests_require = merlin.dist:check_requirements
-[setuptools.file_finders]
-svn_cvs = setuptools.command.sdist:_default_revctrl
+[merlin.file_finders]
+svn_cvs = merlin.command.sdist:_default_revctrl
[egg_info.writers]
-dependency_links.txt = setuptools.command.egg_info:overwrite_arg
-requires.txt = setuptools.command.egg_info:write_requirements
-PKG-INFO = setuptools.command.egg_info:write_pkg_info
-eager_resources.txt = setuptools.command.egg_info:overwrite_arg
-top_level.txt = setuptools.command.egg_info:write_toplevel_names
-namespace_packages.txt = setuptools.command.egg_info:overwrite_arg
-entry_points.txt = setuptools.command.egg_info:write_entries
-depends.txt = setuptools.command.egg_info:warn_depends_obsolete
+dependency_links.txt = merlin.command.egg_info:overwrite_arg
+requires.txt = merlin.command.egg_info:write_requirements
+PKG-INFO = merlin.command.egg_info:write_pkg_info
+eager_resources.txt = merlin.command.egg_info:overwrite_arg
+top_level.txt = merlin.command.egg_info:write_toplevel_names
+namespace_packages.txt = merlin.command.egg_info:overwrite_arg
+entry_points.txt = merlin.command.egg_info:write_entries
+depends.txt = merlin.command.egg_info:warn_depends_obsolete
[console_scripts]
-easy_install = setuptools.command.easy_install:main
-easy_install-2.3 = setuptools.command.easy_install:main
+merlin = merlin.command.easy_install:main
[distutils.commands]
-bdist_rpm = setuptools.command.bdist_rpm:bdist_rpm
-rotate = setuptools.command.rotate:rotate
-develop = setuptools.command.develop:develop
-setopt = setuptools.command.setopt:setopt
-build_py = setuptools.command.build_py:build_py
-saveopts = setuptools.command.saveopts:saveopts
-egg_info = setuptools.command.egg_info:egg_info
-register = setuptools.command.register:register
-upload = setuptools.command.upload:upload
-install_egg_info = setuptools.command.install_egg_info:install_egg_info
-alias = setuptools.command.alias:alias
-easy_install = setuptools.command.easy_install:easy_install
-install_scripts = setuptools.command.install_scripts:install_scripts
-bdist_egg = setuptools.command.bdist_egg:bdist_egg
-install = setuptools.command.install:install
-test = setuptools.command.test:test
-install_lib = setuptools.command.install_lib:install_lib
-build_ext = setuptools.command.build_ext:build_ext
-sdist = setuptools.command.sdist:sdist
+bdist_rpm = merlin.command.bdist_rpm:bdist_rpm
+rotate = merlin.command.rotate:rotate
+develop = merlin.command.develop:develop
+setopt = merlin.command.setopt:setopt
+build_py = merlin.command.build_py:build_py
+saveopts = merlin.command.saveopts:saveopts
+egg_info = merlin.command.egg_info:egg_info
+register = merlin.command.register:register
+upload = merlin.command.upload:upload
+install_egg_info = merlin.command.install_egg_info:install_egg_info
+alias = merlin.command.alias:alias
+easy_install = merlin.command.easy_install:easy_install
+install_scripts = merlin.command.install_scripts:install_scripts
+bdist_egg = merlin.command.bdist_egg:bdist_egg
+install = merlin.command.install:install
+test = merlin.command.test:test
+install_lib = merlin.command.install_lib:install_lib
+build_ext = merlin.command.build_ext:build_ext
+sdist = merlin.command.sdist:sdist
Modified: cs/merlin/trunk/merlin.egg-info/top_level.txt
===================================================================
--- cs/merlin/trunk/merlin.egg-info/top_level.txt 2006-11-08 23:29:39 UTC (rev 5208)
+++ cs/merlin/trunk/merlin.egg-info/top_level.txt 2006-11-08 23:45:19 UTC (rev 5209)
@@ -1,4 +1,4 @@
easy_install
+merlin
pkg_resources
-setuptools
site
More information about the cig-commits
mailing list