[Checkins] SVN: zc.buildout/branches/2/z3c.recipe.scripts_/s removed support for setuptools in favour of distribute from z3c.recipe.scripts
Thomas Lotze
tl at gocept.com
Wed Jun 15 01:39:48 EDT 2011
Log message for revision 121938:
removed support for setuptools in favour of distribute from z3c.recipe.scripts
Changed:
U zc.buildout/branches/2/z3c.recipe.scripts_/setup.py
U zc.buildout/branches/2/z3c.recipe.scripts_/src/z3c/recipe/scripts/README.txt
U zc.buildout/branches/2/z3c.recipe.scripts_/src/z3c/recipe/scripts/tests.py
-=-
Modified: zc.buildout/branches/2/z3c.recipe.scripts_/setup.py
===================================================================
--- zc.buildout/branches/2/z3c.recipe.scripts_/setup.py 2011-06-15 05:35:11 UTC (rev 121937)
+++ zc.buildout/branches/2/z3c.recipe.scripts_/setup.py 2011-06-15 05:39:48 UTC (rev 121938)
@@ -60,7 +60,7 @@
install_requires = [
'zc.buildout >=1.5.0',
'zc.recipe.egg >=1.3.0',
- 'setuptools'],
+ 'distribute'],
tests_require = ['zope.testing'],
test_suite = name+'.tests.test_suite',
entry_points = {'zc.buildout': ['default = %s:Scripts' % name,
Modified: zc.buildout/branches/2/z3c.recipe.scripts_/src/z3c/recipe/scripts/README.txt
===================================================================
--- zc.buildout/branches/2/z3c.recipe.scripts_/src/z3c/recipe/scripts/README.txt 2011-06-15 05:35:11 UTC (rev 121937)
+++ zc.buildout/branches/2/z3c.recipe.scripts_/src/z3c/recipe/scripts/README.txt 2011-06-15 05:39:48 UTC (rev 121938)
@@ -277,7 +277,7 @@
...,
'/sample-buildout/eggs/demo-0.2-pyN.N.egg',
'/sample-buildout/eggs/demoneeded-1.2c1-pyN.N.egg',
- '/executable_buildout/eggs/setuptools-X-pyN.N.egg',
+ '/executable_buildout/eggs/distribute-X-pyN.N.egg',
'/executable_buildout/site-packages']
If you set it to false, they are excluded.
Modified: zc.buildout/branches/2/z3c.recipe.scripts_/src/z3c/recipe/scripts/tests.py
===================================================================
--- zc.buildout/branches/2/z3c.recipe.scripts_/src/z3c/recipe/scripts/tests.py 2011-06-15 05:35:11 UTC (rev 121937)
+++ zc.buildout/branches/2/z3c.recipe.scripts_/src/z3c/recipe/scripts/tests.py 2011-06-15 05:39:48 UTC (rev 121938)
@@ -384,10 +384,10 @@
zc.buildout.tests.hide_first_index_page_message,
(re.compile(r'zc.buildout(-\S+)?[.]egg(-link)?'),
'zc.buildout.egg'),
- (re.compile('[-d] (setuptools|distribute)-[^-]+-'),
- 'setuptools-X-'),
- (re.compile(r'(setuptools|distribute)-[\w.]+-py'),
- 'setuptools-X-py'),
+ (re.compile('[-d] distribute-[^-]+-'),
+ 'distribute-X-'),
+ (re.compile(r'distribute-[\w.]+-py'),
+ 'distribute-X-py'),
(re.compile(r'eggs\\\\demo'), 'eggs/demo'),
(re.compile(r'[a-zA-Z]:\\\\foo\\\\bar'), '/foo/bar'),
(re.compile(r'\#!\S+\bpython\S*'), '#!/usr/bin/python'),
@@ -395,7 +395,6 @@
(re.compile(r'\nimport subprocess\n'), '\n'),
(re.compile('subprocess\\.call\\(argv, env=environ\\)'),
'os.execve(sys.executable, argv, environ)'),
- (re.compile('distribute'), 'setuptools'),
])
))
More information about the checkins
mailing list