# HG changeset patch # User Mads Kiilerich # Date 2015-09-25 14:18:44 # Node ID 8c234ae2c2587530048aef6c30ad25e0de3a87f8 # Parent 8a1166a465fe05cc80efb04c706c68ae47957fad docs: add advice of upgrading pip and setuptools in new virtualenvs Withtout this, the new virtualenv might have setuptools version 12 while the URLObject dependency mock fails because it requires setuptools>=17.1 . diff --git a/docs/contributing.rst b/docs/contributing.rst --- a/docs/contributing.rst +++ b/docs/contributing.rst @@ -34,6 +34,7 @@ To get started with development:: cd kallithea virtualenv ../kallithea-venv source ../kallithea-venv/bin/activate + pip install --upgrade pip setuptools python2 setup.py develop 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,6 +39,7 @@ repository, follow the instructions belo cd kallithea virtualenv ../kallithea-venv source ../kallithea-venv/bin/activate + pip install --upgrade pip setuptools python2 setup.py develop python2 setup.py compile_catalog # for translation of the UI @@ -64,9 +65,11 @@ An additional benefit of virtualenv_ is virtualenv /srv/kallithea/venv -- Activate the virtualenv_ in your current shell session by running:: +- Activate the virtualenv_ in your current shell session and make sure the + basic requirements are up-to-date by running:: source /srv/kallithea/venv/bin/activate + pip install --upgrade pip setuptools .. 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,6 +134,7 @@ In a command prompt type (adapting paths cd C:\Kallithea\Env\Scripts activate + pip install --upgrade pip setuptools 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,6 +183,7 @@ In that CMD (loaded with VS2008 PATHs) t cd C:\Kallithea\Env\Scripts (or similar) activate + pip install --upgrade pip setuptools The prompt will change into "(Env) C:\\Kallithea\\Env\\Scripts" or similar (depending of your folder structure). Then type::