diff --git a/README.rst b/README.rst --- a/README.rst +++ b/README.rst @@ -185,7 +185,7 @@ To run Kallithea on a RhodeCode database This location will depend on where you installed Kallithea. If you installed via:: - python setup.py install + python2 setup.py install then you will find this location at ``$VIRTUAL_ENV/lib/python2.7/site-packages/Kallithea-0.1-py2.7.egg/kallithea``. @@ -201,7 +201,7 @@ database, using the database string you cd /path/to/kallithea cp /path/to/rhodecode/rhodecode.db kallithea.db pip install sqlalchemy-migrate - python kallithea/bin/rebranddb.py sqlite:///kallithea.db + python2 kallithea/bin/rebranddb.py sqlite:///kallithea.db .. Note:: 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 - python setup.py develop + 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 paster serve my.ini --reload & diff --git a/docs/installation.rst b/docs/installation.rst --- a/docs/installation.rst +++ b/docs/installation.rst @@ -39,8 +39,8 @@ repository, follow the instructions belo cd kallithea virtualenv ../kallithea-venv source ../kallithea-venv/bin/activate - python setup.py develop - python setup.py compile_catalog # for translation of the UI + python2 setup.py develop + python2 setup.py compile_catalog # for translation of the UI You can now proceed to :ref:`setup`. @@ -84,7 +84,7 @@ An additional benefit of virtualenv_ is Alternatively, download a .tar.gz from http://pypi.python.org/pypi/Kallithea, extract it and run:: - python setup.py install + python2 setup.py install - This will install Kallithea together with pylons_ and all other required python libraries into the activated virtualenv. diff --git a/docs/installation_iis.rst b/docs/installation_iis.rst --- a/docs/installation_iis.rst +++ b/docs/installation_iis.rst @@ -55,7 +55,7 @@ the necessary components to finalize an has been generated, it is necessary to run the following command due to the way that ISAPI-WSGI is made:: - python dispatch.py install + python2 dispatch.py install This accomplishes two things: generating an ISAPI compliant DLL file, ``_dispatch.dll``, and installing a script map handler into IIS for the @@ -103,7 +103,7 @@ ISAPI-WSGI wrapper above uses ``win32tra In order to dump output from WSGI using ``win32traceutil`` it is sufficient to type the following in a console window:: - python -m win32traceutil + python2 -m win32traceutil and any exceptions occurring in the WSGI layer and below (i.e. in the Kallithea application itself) that are uncaught, will be printed here complete with stack diff --git a/docs/installation_win.rst b/docs/installation_win.rst --- a/docs/installation_win.rst +++ b/docs/installation_win.rst @@ -71,7 +71,7 @@ If it was not installed or if you are us - Go to https://bootstrap.pypa.io - Right-click on get-pip.py and choose Saves as... -- Run "python get-pip.py" in the folder where you downloaded get-pip.py (may require admin access). +- Run "python2 get-pip.py" in the folder where you downloaded get-pip.py (may require admin access). .. note:: 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 @@ -151,7 +151,7 @@ Create a virtual Python environment in C do so, open a CMD (Python Path should be included in Step3), navigate where you downloaded "virtualenv.py", and write:: - python virtualenv.py C:\Kallithea\Env + python2 virtualenv.py C:\Kallithea\Env (--no-site-packages is now the default behaviour of virtualenv, no need to include it) diff --git a/kallithea/i18n/how_to b/kallithea/i18n/how_to --- a/kallithea/i18n/how_to +++ b/kallithea/i18n/how_to @@ -50,11 +50,11 @@ Manual creation of a new language transl In the prepared development environment, run the following to ensure all translation strings are extracted and up-to-date:: - python setup.py extract_messages + python2 setup.py extract_messages Create new language by executing following command:: - python setup.py init_catalog -l + python2 setup.py init_catalog -l This creates a new translation under directory `kallithea/i18n/` based on the translation template file, `kallithea/i18n/kallithea.pot`. @@ -67,7 +67,7 @@ translation file for errors by executing Finally, compile the translations:: - python setup.py compile_catalog -l + python2 setup.py compile_catalog -l Updating translations @@ -75,11 +75,11 @@ Updating translations Extract the latest versions of strings for translation by running:: - python setup.py extract_messages + python2 setup.py extract_messages Update the PO file by doing:: - python setup.py update_catalog -l + python2 setup.py update_catalog -l Edit the new updated translation file. Repeat all steps after `init_catalog` step from new translation instructions