diff --git a/docs/contributing.rst b/docs/contributing.rst --- a/docs/contributing.rst +++ b/docs/contributing.rst @@ -34,7 +34,7 @@ To get started with development:: cd kallithea virtualenv ../kallithea-venv source ../kallithea-venv/bin/activate - pip install --upgrade pip setuptools + pip install --upgrade pip "setuptools<34" pip install -e . paster make-config Kallithea my.ini paster setup-db my.ini --user=user --email=user@example.com --password=password --repos=/tmp diff --git a/docs/installation.rst b/docs/installation.rst --- a/docs/installation.rst +++ b/docs/installation.rst @@ -39,7 +39,7 @@ repository, follow the instructions belo cd kallithea virtualenv ../kallithea-venv source ../kallithea-venv/bin/activate - pip install --upgrade pip setuptools + pip install --upgrade pip "setuptools<34" pip install -e . python2 setup.py compile_catalog # for translation of the UI @@ -69,7 +69,7 @@ An additional benefit of virtualenv_ is basic requirements are up-to-date by running:: source /srv/kallithea/venv/bin/activate - pip install --upgrade pip setuptools + pip install --upgrade pip "setuptools<34" .. note:: You can't use UNIX ``sudo`` to source the ``virtualenv`` script; it will "activate" a shell that terminates immediately. It is also perfectly diff --git a/docs/installation_win.rst b/docs/installation_win.rst --- a/docs/installation_win.rst +++ b/docs/installation_win.rst @@ -134,7 +134,7 @@ In a command prompt type (adapting paths cd C:\Kallithea\Env\Scripts activate - pip install --upgrade pip setuptools + pip install --upgrade pip "setuptools<34" The prompt will change into "(Env) C:\\Kallithea\\Env\\Scripts" or similar (depending of your folder structure). Then type:: diff --git a/docs/installation_win_old.rst b/docs/installation_win_old.rst --- a/docs/installation_win_old.rst +++ b/docs/installation_win_old.rst @@ -183,7 +183,7 @@ In that CMD (loaded with VS2008 PATHs) t cd C:\Kallithea\Env\Scripts (or similar) activate - pip install --upgrade pip setuptools + pip install --upgrade pip "setuptools<34" The prompt will change into "(Env) C:\\Kallithea\\Env\\Scripts" or similar (depending of your folder structure). Then type:: diff --git a/setup.py b/setup.py --- a/setup.py +++ b/setup.py @@ -35,6 +35,7 @@ callback = lambda V: ('.'.join(map(str, is_windows = __platform__ in ['Windows'] requirements = [ + "setuptools<34", # setuptools==34 has an undeclared requirement of pyparsing >=2.1, but celery<2.3 requires pyparsing<2 "waitress==0.8.8", "webob>=1.0.8,<=1.1.1", "webtest==1.4.3",