[cig-commits] r5207 - cs/merlin/trunk
leif at geodynamics.org
leif at geodynamics.org
Wed Nov 8 15:07:32 PST 2006
Author: leif
Date: 2006-11-08 15:07:32 -0800 (Wed, 08 Nov 2006)
New Revision: 5207
Added:
cs/merlin/trunk/merlin.egg-info/
cs/merlin/trunk/merlin/
Removed:
cs/merlin/trunk/setuptools.egg-info/
cs/merlin/trunk/setuptools/
Modified:
cs/merlin/trunk/setup.py
Log:
Top-level renames: setuptools -> merlin.
Copied: cs/merlin/trunk/merlin (from rev 5206, cs/merlin/trunk/setuptools)
Copied: cs/merlin/trunk/merlin.egg-info (from rev 5206, cs/merlin/trunk/setuptools.egg-info)
Modified: cs/merlin/trunk/setup.py
===================================================================
--- cs/merlin/trunk/setup.py 2006-11-08 22:50:59 UTC (rev 5206)
+++ cs/merlin/trunk/setup.py 2006-11-08 23:07:32 UTC (rev 5207)
@@ -1,9 +1,9 @@
#!/usr/bin/env python
-"""Distutils setup file, used to install or test 'setuptools'"""
+"""Distutils setup file, used to install or test 'merlin'"""
def get_description():
# Get our long description from the documentation
- f = file('setuptools.txt')
+ f = file('merlin.txt')
lines = []
for line in f:
if not line.strip():
@@ -16,28 +16,26 @@
return ''.join(lines)
from distutils.util import convert_path
-d = {}; execfile(convert_path('setuptools/command/__init__.py'), d)
+d = {}; execfile(convert_path('merlin/command/__init__.py'), d)
SETUP_COMMANDS = d['__all__']
-VERSION = "0.6c3"
-from setuptools import setup, find_packages
+VERSION = "1.0b1"
+from merlin import setup, find_packages
import sys
scripts = []
setup(
- name="setuptools",
+ name = 'merlin',
version=VERSION,
- description="Download, build, install, upgrade, and uninstall Python "
- "packages -- easily!",
- author="Phillip J. Eby",
- author_email="peak at eby-sarna.com",
+ description="A custom version of Phillip J. Eby's setuptools.",
+ author = 'Leif Strand',
+ author_email = 'leif at geodynamics.org',
license="PSF or ZPL",
- long_description = get_description(),
- keywords = "CPAN PyPI distutils eggs package management",
- url = "http://peak.telecommunity.com/DevCenter/setuptools",
- test_suite = 'setuptools.tests',
+ #long_description = get_description(),
+ url = 'http://www.geodynamics.org/cig/software/packages/pythia/',
+ test_suite = 'merlin.tests',
packages = find_packages(),
- package_data = {'setuptools':['*.exe']},
+ package_data = {'merlin':['*.exe']},
py_modules = ['pkg_resources', 'easy_install', 'site'],
@@ -46,65 +44,63 @@
entry_points = {
"distutils.commands" : [
- "%(cmd)s = setuptools.command.%(cmd)s:%(cmd)s" % locals()
+ "%(cmd)s = merlin.command.%(cmd)s:%(cmd)s" % locals()
for cmd in SETUP_COMMANDS
],
"distutils.setup_keywords": [
- "eager_resources = setuptools.dist:assert_string_list",
- "namespace_packages = setuptools.dist:check_nsp",
- "extras_require = setuptools.dist:check_extras",
- "install_requires = setuptools.dist:check_requirements",
- "tests_require = setuptools.dist:check_requirements",
- "entry_points = setuptools.dist:check_entry_points",
- "test_suite = setuptools.dist:check_test_suite",
- "zip_safe = setuptools.dist:assert_bool",
- "package_data = setuptools.dist:check_package_data",
- "exclude_package_data = setuptools.dist:check_package_data",
- "include_package_data = setuptools.dist:assert_bool",
- "dependency_links = setuptools.dist:assert_string_list",
- "test_loader = setuptools.dist:check_importable",
+ "eager_resources = merlin.dist:assert_string_list",
+ "namespace_packages = merlin.dist:check_nsp",
+ "extras_require = merlin.dist:check_extras",
+ "install_requires = merlin.dist:check_requirements",
+ "tests_require = merlin.dist:check_requirements",
+ "entry_points = merlin.dist:check_entry_points",
+ "test_suite = merlin.dist:check_test_suite",
+ "zip_safe = merlin.dist:assert_bool",
+ "package_data = merlin.dist:check_package_data",
+ "exclude_package_data = merlin.dist:check_package_data",
+ "include_package_data = merlin.dist:assert_bool",
+ "dependency_links = merlin.dist:assert_string_list",
+ "test_loader = merlin.dist:check_importable",
],
"egg_info.writers": [
- "PKG-INFO = setuptools.command.egg_info:write_pkg_info",
- "requires.txt = setuptools.command.egg_info:write_requirements",
- "entry_points.txt = setuptools.command.egg_info:write_entries",
- "eager_resources.txt = setuptools.command.egg_info:overwrite_arg",
- "namespace_packages.txt = setuptools.command.egg_info:overwrite_arg",
- "top_level.txt = setuptools.command.egg_info:write_toplevel_names",
- "depends.txt = setuptools.command.egg_info:warn_depends_obsolete",
- "dependency_links.txt = setuptools.command.egg_info:overwrite_arg",
+ "PKG-INFO = merlin.command.egg_info:write_pkg_info",
+ "requires.txt = merlin.command.egg_info:write_requirements",
+ "entry_points.txt = merlin.command.egg_info:write_entries",
+ "eager_resources.txt = merlin.command.egg_info:overwrite_arg",
+ "namespace_packages.txt = merlin.command.egg_info:overwrite_arg",
+ "top_level.txt = merlin.command.egg_info:write_toplevel_names",
+ "depends.txt = merlin.command.egg_info:warn_depends_obsolete",
+ "dependency_links.txt = merlin.command.egg_info:overwrite_arg",
],
"console_scripts": [
- "easy_install = setuptools.command.easy_install:main",
- "easy_install-%s = setuptools.command.easy_install:main"
- % sys.version[:3]
+ "merlin = merlin.command.easy_install:main",
],
"setuptools.file_finders":
- ["svn_cvs = setuptools.command.sdist:_default_revctrl"]
+ ["svn_cvs = merlin.command.sdist:_default_revctrl"]
},
- classifiers = [f.strip() for f in """
- Development Status :: 3 - Alpha
- Intended Audience :: Developers
- License :: OSI Approved :: Python Software Foundation License
- License :: OSI Approved :: Zope Public License
- Operating System :: OS Independent
- Programming Language :: Python
- Topic :: Software Development :: Libraries :: Python Modules
- Topic :: System :: Archiving :: Packaging
- Topic :: System :: Systems Administration
- Topic :: Utilities""".splitlines() if f.strip()],
- scripts = scripts,
+# classifiers = [f.strip() for f in """
+# Development Status :: 3 - Alpha
+# Intended Audience :: Developers
+# License :: OSI Approved :: Python Software Foundation License
+# License :: OSI Approved :: Zope Public License
+# Operating System :: OS Independent
+# Programming Language :: Python
+# Topic :: Software Development :: Libraries :: Python Modules
+# Topic :: System :: Archiving :: Packaging
+# Topic :: System :: Systems Administration
+# Topic :: Utilities""".splitlines() if f.strip()],
+ scripts = scripts,
# uncomment for testing
- # setup_requires = ['setuptools>=0.6a0'],
+ # setup_requires = ['merlin>=0.6a0'],
)
More information about the cig-commits
mailing list