Mercurial > kallithea
changeset 5502:ae9ab4c92d46 stable
setup: explicitly use python2 in examples in the documentation
author | Mads Kiilerich <madski@unity3d.com> |
---|---|
date | Wed, 16 Sep 2015 02:53:28 +0200 |
parents | c79e4f89bfd3 |
children | 0fa831892e32 |
files | README.rst docs/contributing.rst docs/installation.rst docs/installation_iis.rst docs/installation_win.rst docs/installation_win_old.rst kallithea/i18n/how_to |
diffstat | 7 files changed, 15 insertions(+), 15 deletions(-) [+] |
line wrap: on
line diff
--- a/README.rst Mon Sep 14 23:06:28 2015 +0200 +++ b/README.rst Wed Sep 16 02:53:28 2015 +0200 @@ -185,7 +185,7 @@ 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 @@ 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::
--- a/docs/contributing.rst Mon Sep 14 23:06:28 2015 +0200 +++ b/docs/contributing.rst Wed Sep 16 02:53:28 2015 +0200 @@ -34,7 +34,7 @@ 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 &
--- a/docs/installation.rst Mon Sep 14 23:06:28 2015 +0200 +++ b/docs/installation.rst Wed Sep 16 02:53:28 2015 +0200 @@ -39,8 +39,8 @@ 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 @@ 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.
--- a/docs/installation_iis.rst Mon Sep 14 23:06:28 2015 +0200 +++ b/docs/installation_iis.rst Wed Sep 16 02:53:28 2015 +0200 @@ -55,7 +55,7 @@ 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 @@ 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
--- a/docs/installation_win.rst Mon Sep 14 23:06:28 2015 +0200 +++ b/docs/installation_win.rst Wed Sep 16 02:53:28 2015 +0200 @@ -71,7 +71,7 @@ - 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::
--- a/docs/installation_win_old.rst Mon Sep 14 23:06:28 2015 +0200 +++ b/docs/installation_win_old.rst Wed Sep 16 02:53:28 2015 +0200 @@ -151,7 +151,7 @@ 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)
--- a/kallithea/i18n/how_to Mon Sep 14 23:06:28 2015 +0200 +++ b/kallithea/i18n/how_to Wed Sep 16 02:53:28 2015 +0200 @@ -50,11 +50,11 @@ 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 <new_language_code> + python2 setup.py init_catalog -l <new_language_code> This creates a new translation under directory `kallithea/i18n/<new_language_code>` based on the translation template file, `kallithea/i18n/kallithea.pot`. @@ -67,7 +67,7 @@ Finally, compile the translations:: - python setup.py compile_catalog -l <new_language_code> + python2 setup.py compile_catalog -l <new_language_code> Updating translations @@ -75,11 +75,11 @@ 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 <new_language_code> + python2 setup.py update_catalog -l <new_language_code> Edit the new updated translation file. Repeat all steps after `init_catalog` step from new translation instructions