[Repoze-checkins] r718 - in repoze.project/trunk: . repoze/project

[Chris McDonough]

Author: Chris McDonough <chrism at agendaless.com>
Date: Thu Feb 21 03:16:54 2008
New Revision: 718

Log:
Undo mistaken checkin.


Modified:
   repoze.project/trunk/CHANGES.txt
   repoze.project/trunk/repoze/project/bootstrap.py
   repoze.project/trunk/setup.py

Modified: repoze.project/trunk/CHANGES.txt
==============================================================================
--- repoze.project/trunk/CHANGES.txt	(original)
+++ repoze.project/trunk/CHANGES.txt	Thu Feb 21 03:16:54 2008
@@ -1,10 +1,5 @@
 repoze.project Changelog
 
-  repoze-project 0.0.5 (2007-12-14)
-
-    - Allow users to specify --index-url on the commandline to specify
-      a different index rather than only being able to specify pypi:
-
   repoze-project 0.0.4 (2007-10-24)
 
     - Depend on virtualenv >= 0.9.1 (so people who use Mac framework

Modified: repoze.project/trunk/repoze/project/bootstrap.py
==============================================================================
--- repoze.project/trunk/repoze/project/bootstrap.py	(original)
+++ repoze.project/trunk/repoze/project/bootstrap.py	Thu Feb 21 03:16:54 2008
@@ -19,8 +19,6 @@
 
 EXTEND_PARSER = """\
 
-REPOZE_INDEX = 'http://dist.repoze.org/simple'
-
 def extend_parser(parser):
 
     parser.add_option(
@@ -38,14 +36,6 @@
         help="Do not initialize the environment from the "
              "'repoze.project.initialize' entry point(s) defined in "
              "the first egg.")
-
-    parser.add_option(
-        '-i', '--index-url',
-        action='store',
-        dest='index',
-        default=REPOZE_INDEX,
-        help='URL of package index')
-
 """
 
 AI_PROLOG = """\
@@ -69,17 +59,13 @@
     else:
         args.append('--no-initialize-environment')
 
-    args.extend(['--index-url=' + options.index])
-
     args.extend([%s])
 
-    command = join(home_dir, 'bin', 'repozeproject')
-    print 'command', command
-    print 'args', args
-    subprocess.call([command] + args)
+    subprocess.call([join(home_dir, 'bin', 'repozeproject')] + args)
 """
 
 def main():
+    
     parser = optparse.OptionParser(
         usage="%prog [OPTIONS] app_egg_name [other_egg_name]*")
 
@@ -88,16 +74,7 @@
         action='store',
         dest='path',
         default=None,
-        help=('Specify the path in which to build the application '
-              '(default: use sys.prefix)')
-        )
-
-    parser.add_option(
-        '-i', '--index-url',
-        action='store',
-        dest='index',
-        default=REPOZE_INDEX,
-        help='URL of package index')
+        help="Specify the path in which to build the application")
 
     parser.add_option(
         '--site-packages',
@@ -135,7 +112,7 @@
     if len(args) == 0:
         parser.print_help(sys.stderr)
         sys.exit(1)
-
+    
     if options.path is not None:  # don't do it in place
 
         # we want the virtualenv to have the same version of repoze.project
@@ -180,16 +157,19 @@
 
     else: # do local install
 
-        index = options.index
-
         for arg in args:
+            index = REPOZE_INDEX
+
+            if arg.startswith('pypi:'):
+                arg = arg[len('pypi:'):]
+                index = PYPI_INDEX
+
             sub_args = [EASY_INSTALL,
                         '--index-url',
                         index,
                         arg,
-                        ]
-
-        virtualenv.call_subprocess(sub_args)
+                       ]
+            virtualenv.call_subprocess(sub_args)
 
         if options.initialize_environment:
             dist = args[0]

Modified: repoze.project/trunk/setup.py
==============================================================================
--- repoze.project/trunk/setup.py	(original)
+++ repoze.project/trunk/setup.py	Thu Feb 21 03:16:54 2008
@@ -12,7 +12,7 @@
 #
 ##############################################################################
 
-__version__ = '0.0.5'
+__version__ = '0.0.4'
 
 from ez_setup import use_setuptools
 use_setuptools()