[Checkins] SVN: zc.buildout/branches/gary-8-hack-fix/ svn merge -r105073:108341 svn+ssh://svn.zope.org/repos/main/zc.buildout/branches/gary-X-wrap-up
Gary Poster
gary.poster at canonical.com
Wed Jan 20 17:07:55 EST 2010
Log message for revision 108342:
svn merge -r105073:108341 svn+ssh://svn.zope.org/repos/main/zc.buildout/branches/gary-X-wrap-up
Changed:
U zc.buildout/branches/gary-8-hack-fix/buildout.cfg
U zc.buildout/branches/gary-8-hack-fix/setup.py
U zc.buildout/branches/gary-8-hack-fix/src/zc/buildout/bootstrap.txt
U zc.buildout/branches/gary-8-hack-fix/src/zc/buildout/easy_install.txt
U zc.buildout/branches/gary-8-hack-fix/zc.recipe.egg_/setup.py
-=-
Modified: zc.buildout/branches/gary-8-hack-fix/buildout.cfg
===================================================================
--- zc.buildout/branches/gary-8-hack-fix/buildout.cfg 2010-01-20 21:09:31 UTC (rev 108341)
+++ zc.buildout/branches/gary-8-hack-fix/buildout.cfg 2010-01-20 22:07:55 UTC (rev 108342)
@@ -10,14 +10,14 @@
[test]
recipe = zc.recipe.testrunner
-eggs =
+eggs =
zc.buildout
zc.recipe.egg
# Tests that can be run wo a network
[oltest]
recipe = zc.recipe.testrunner
-eggs =
+eggs =
zc.buildout
zc.recipe.egg
defaults =
Modified: zc.buildout/branches/gary-8-hack-fix/setup.py
===================================================================
--- zc.buildout/branches/gary-8-hack-fix/setup.py 2010-01-20 21:09:31 UTC (rev 108341)
+++ zc.buildout/branches/gary-8-hack-fix/setup.py 2010-01-20 22:07:55 UTC (rev 108342)
@@ -12,7 +12,7 @@
#
##############################################################################
name = "zc.buildout"
-version = "1.4.0dev"
+version = "1.5.0dev"
import os
from setuptools import setup
Modified: zc.buildout/branches/gary-8-hack-fix/src/zc/buildout/bootstrap.txt
===================================================================
--- zc.buildout/branches/gary-8-hack-fix/src/zc/buildout/bootstrap.txt 2010-01-20 21:09:31 UTC (rev 108341)
+++ zc.buildout/branches/gary-8-hack-fix/src/zc/buildout/bootstrap.txt 2010-01-20 22:07:55 UTC (rev 108342)
@@ -58,7 +58,6 @@
...
X
No local packages or download links found for zc.buildout==UNKNOWN...
- error: Could not find suitable distribution for Requirement.parse('zc.buildout==UNKNOWN')
...
Now let's try with `1.1.2`, which happens to exist::
Modified: zc.buildout/branches/gary-8-hack-fix/src/zc/buildout/easy_install.txt
===================================================================
--- zc.buildout/branches/gary-8-hack-fix/src/zc/buildout/easy_install.txt 2010-01-20 21:09:31 UTC (rev 108341)
+++ zc.buildout/branches/gary-8-hack-fix/src/zc/buildout/easy_install.txt 2010-01-20 22:07:55 UTC (rev 108342)
@@ -1076,7 +1076,7 @@
>>> pprint.pprint(dir_paths) # doctest: +ELLIPSIS
['/executable/eggs/other-1.0-py...egg',
'/executable/eggs/demoneeded-1.1-py...egg',
- '/executable/eggs/setuptools-0.6c9-py...egg',
+ '/executable/eggs/setuptools-...-py...egg',
...]
>>> zc.buildout.easy_install.clear_index_cache() # clean up
Modified: zc.buildout/branches/gary-8-hack-fix/zc.recipe.egg_/setup.py
===================================================================
--- zc.buildout/branches/gary-8-hack-fix/zc.recipe.egg_/setup.py 2010-01-20 21:09:31 UTC (rev 108341)
+++ zc.buildout/branches/gary-8-hack-fix/zc.recipe.egg_/setup.py 2010-01-20 22:07:55 UTC (rev 108342)
@@ -16,7 +16,7 @@
$Id$
"""
-version = '0'
+version = '1.3.0dev'
import os
from setuptools import setup, find_packages
More information about the checkins
mailing list