Update main instructions to use specific version of bootstrap
diff --git a/GettingStarted.wiki b/GettingStarted.wiki index 9bef6db..e41e4b4 100644 --- a/GettingStarted.wiki +++ b/GettingStarted.wiki
@@ -19,7 +19,9 @@ {{{ git clone http://code.google.com/p/soc/ cd soc -python bootstrap.py +# This specific version of setuptools works around an issue with setuptools and distribute +# http://stackoverflow.com/q/17586987/87279 +python bootstrap.py -d -v 2.1.1 bin/buildout bin/gen-app-yaml local-devel bin/paver build --skip-pylint @@ -364,23 +366,4 @@ ImportError: <module 'setuptools.dist' from ...> has no 'check_packages' attribute }}} -If your bin/buildout fails with this error and you run bootstrap.py with python 2.5, try running it again with python2.6 instead. - -== pkg_resources.VersionConflict: (setuptools 0.6c11 (/tmp/tmphryxjW/setuptools-0.6c11-py2.7.egg), Requirement.parse('setuptools>=0.7')) == - -{{{ -$ python bootstrap.py -Downloading http://pypi.python.org/packages/2.7/s/setuptools/setuptools-0.6c11-py2.7.egg -Traceback (most recent call last): - File "bootstrap.py", line 258, in <module> - ws.require(requirement) - File "/tmp/tmphryxjW/setuptools-0.6c11-py2.7.egg/pkg_resources.py", line 666, in require - File "/tmp/tmphryxjW/setuptools-0.6c11-py2.7.egg/pkg_resources.py", line 569, in resolve -pkg_resources.VersionConflict: (setuptools 0.6c11 (/tmp/tmphryxjW/setuptools-0.6c11-py2.7.egg), Requirement.parse('setuptools>=0.7')) -}}} - -http://stackoverflow.com/questions/17586987/how-to-solve-pkg-resources-versionconflict-error-during-bin-python-bootstrap-py - -{{{ -python bootstrap.py -d -v 2.1.1 -}}} \ No newline at end of file +If your bin/buildout fails with this error and you run bootstrap.py with python 2.5, try running it again with python2.6 instead. \ No newline at end of file