From 3dbdfef11d770a5b79df08c01258e070ee8b7f70 Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Wed, 13 Oct 2010 23:55:28 +0000 Subject: merge tutorialfix branch --- docs/tutorials/bfgwiki/background.rst | 2 +- docs/tutorials/bfgwiki/installation.rst | 26 +++++++++---------- docs/tutorials/bfgwiki/src/authorization/setup.cfg | 30 ++++++++++++++++++++-- docs/tutorials/bfgwiki/src/basiclayout/setup.cfg | 29 +++++++++++++++++++-- docs/tutorials/bfgwiki/src/models/setup.cfg | 29 +++++++++++++++++++-- .../tutorials/bfgwiki/src/viewdecorators/setup.cfg | 29 +++++++++++++++++++-- docs/tutorials/bfgwiki/src/views/setup.cfg | 29 +++++++++++++++++++-- 7 files changed, 150 insertions(+), 24 deletions(-) (limited to 'docs/tutorials/bfgwiki') diff --git a/docs/tutorials/bfgwiki/background.rst b/docs/tutorials/bfgwiki/background.rst index c1d8d7477..072e2cfa1 100644 --- a/docs/tutorials/bfgwiki/background.rst +++ b/docs/tutorials/bfgwiki/background.rst @@ -13,6 +13,6 @@ To code along with this tutorial, the developer will need a UNIX machine with development tools (Mac OS X with XCode, any Linux or BSD variant, etc) *or* he will need a Windows system of any kind. -This tutorial targets :mod:`repoze.bfg` version 1.2. +This tutorial targets :mod:`repoze.bfg` version 1.3. Have fun! diff --git a/docs/tutorials/bfgwiki/installation.rst b/docs/tutorials/bfgwiki/installation.rst index 4f1e5a34f..e58d73493 100644 --- a/docs/tutorials/bfgwiki/installation.rst +++ b/docs/tutorials/bfgwiki/installation.rst @@ -17,30 +17,30 @@ whether you're using UNIX or Windows. Preparation, UNIX ----------------- -#. If you don't already have a Python 2.5 interpreter installed on - your system, obtain, install, or find `Python 2.5 - `_ for your system. +#. If you don't already have a Python 2.6 interpreter installed on + your system, obtain, install, or find `Python 2.6 + `_ for your system. #. Install the latest `setuptools` into the Python you obtained/installed/found in the step above: download `ez_setup.py `_ and run it using - the ``python`` interpreter of your Python 2.5 installation: + the ``python`` interpreter of your Python 2.6 installation: .. code-block:: bash - $ /path/to/my/Python-2.5/bin/python ez_setup.py + $ /path/to/my/Python-2.6/bin/python ez_setup.py #. Use that Python's `bin/easy_install` to install `virtualenv`: .. code-block:: bash - $ /path/to/my/Python-2.5/bin/easy_install virtualenv + $ /path/to/my/Python-2.6/bin/easy_install virtualenv #. Use that Python's virtualenv to make a workspace: .. code-block:: bash - $ path/to/my/Python-25/bin/virtualenv --no-site-packages bigfntut + $ path/to/my/Python-2.6/bin/virtualenv --no-site-packages bigfntut #. Switch to the ``bigfntut`` directory: @@ -72,30 +72,30 @@ Preparation, UNIX Preparation, Windows -------------------- -#. Install, or find `Python 2.5 - `_ for your system. +#. Install, or find `Python 2.6 + `_ for your system. #. Install the latest `setuptools` into the Python you obtained/installed/found in the step above: download `ez_setup.py `_ and run it using - the ``python`` interpreter of your Python 2.5 installation using a + the ``python`` interpreter of your Python 2.6 installation using a command prompt: .. code-block:: bat - c:\> c:\Python25\python ez_setup.py + c:\> c:\Python26\python ez_setup.py #. Use that Python's `bin/easy_install` to install `virtualenv`: .. code-block:: bat - c:\> c:\Python25\Scripts\easy_install virtualenv + c:\> c:\Python26\Scripts\easy_install virtualenv #. Use that Python's virtualenv to make a workspace: .. code-block:: bat - c:\> c:\Python25\Scripts\virtualenv --no-site-packages bigfntut + c:\> c:\Python26\Scripts\virtualenv --no-site-packages bigfntut #. Switch to the ``bigfntut`` directory: diff --git a/docs/tutorials/bfgwiki/src/authorization/setup.cfg b/docs/tutorials/bfgwiki/src/authorization/setup.cfg index 05d3f2c44..3d7ea6e23 100644 --- a/docs/tutorials/bfgwiki/src/authorization/setup.cfg +++ b/docs/tutorials/bfgwiki/src/authorization/setup.cfg @@ -1,2 +1,28 @@ -[easy_install] -index_url = http://dist.repoze.org/bfgsite/simple +[nosetests] +match=^test +nocapture=1 +cover-package=tutorial +with-coverage=1 +cover-erase=1 + +[compile_catalog] +directory = tutorial/locale +domain = tutorial +statistics = true + +[extract_messages] +add_comments = TRANSLATORS: +output_file = tutorial/locale/tutorial.pot +width = 80 + +[init_catalog] +domain = tutorial +input_file = tutorial/locale/tutorial.pot +output_dir = tutorial/locale + +[update_catalog] +domain = tutorial +input_file = tutorial/locale/tutorial.pot +output_dir = tutorial/locale +previous = true + diff --git a/docs/tutorials/bfgwiki/src/basiclayout/setup.cfg b/docs/tutorials/bfgwiki/src/basiclayout/setup.cfg index 42614578b..3d7ea6e23 100644 --- a/docs/tutorials/bfgwiki/src/basiclayout/setup.cfg +++ b/docs/tutorials/bfgwiki/src/basiclayout/setup.cfg @@ -1,3 +1,28 @@ -[easy_install] -index_url = http://dist.repoze.org/bfgsite/simple +[nosetests] +match=^test +nocapture=1 +cover-package=tutorial +with-coverage=1 +cover-erase=1 + +[compile_catalog] +directory = tutorial/locale +domain = tutorial +statistics = true + +[extract_messages] +add_comments = TRANSLATORS: +output_file = tutorial/locale/tutorial.pot +width = 80 + +[init_catalog] +domain = tutorial +input_file = tutorial/locale/tutorial.pot +output_dir = tutorial/locale + +[update_catalog] +domain = tutorial +input_file = tutorial/locale/tutorial.pot +output_dir = tutorial/locale +previous = true diff --git a/docs/tutorials/bfgwiki/src/models/setup.cfg b/docs/tutorials/bfgwiki/src/models/setup.cfg index 42614578b..3d7ea6e23 100644 --- a/docs/tutorials/bfgwiki/src/models/setup.cfg +++ b/docs/tutorials/bfgwiki/src/models/setup.cfg @@ -1,3 +1,28 @@ -[easy_install] -index_url = http://dist.repoze.org/bfgsite/simple +[nosetests] +match=^test +nocapture=1 +cover-package=tutorial +with-coverage=1 +cover-erase=1 + +[compile_catalog] +directory = tutorial/locale +domain = tutorial +statistics = true + +[extract_messages] +add_comments = TRANSLATORS: +output_file = tutorial/locale/tutorial.pot +width = 80 + +[init_catalog] +domain = tutorial +input_file = tutorial/locale/tutorial.pot +output_dir = tutorial/locale + +[update_catalog] +domain = tutorial +input_file = tutorial/locale/tutorial.pot +output_dir = tutorial/locale +previous = true diff --git a/docs/tutorials/bfgwiki/src/viewdecorators/setup.cfg b/docs/tutorials/bfgwiki/src/viewdecorators/setup.cfg index 42614578b..3d7ea6e23 100644 --- a/docs/tutorials/bfgwiki/src/viewdecorators/setup.cfg +++ b/docs/tutorials/bfgwiki/src/viewdecorators/setup.cfg @@ -1,3 +1,28 @@ -[easy_install] -index_url = http://dist.repoze.org/bfgsite/simple +[nosetests] +match=^test +nocapture=1 +cover-package=tutorial +with-coverage=1 +cover-erase=1 + +[compile_catalog] +directory = tutorial/locale +domain = tutorial +statistics = true + +[extract_messages] +add_comments = TRANSLATORS: +output_file = tutorial/locale/tutorial.pot +width = 80 + +[init_catalog] +domain = tutorial +input_file = tutorial/locale/tutorial.pot +output_dir = tutorial/locale + +[update_catalog] +domain = tutorial +input_file = tutorial/locale/tutorial.pot +output_dir = tutorial/locale +previous = true diff --git a/docs/tutorials/bfgwiki/src/views/setup.cfg b/docs/tutorials/bfgwiki/src/views/setup.cfg index 42614578b..3d7ea6e23 100644 --- a/docs/tutorials/bfgwiki/src/views/setup.cfg +++ b/docs/tutorials/bfgwiki/src/views/setup.cfg @@ -1,3 +1,28 @@ -[easy_install] -index_url = http://dist.repoze.org/bfgsite/simple +[nosetests] +match=^test +nocapture=1 +cover-package=tutorial +with-coverage=1 +cover-erase=1 + +[compile_catalog] +directory = tutorial/locale +domain = tutorial +statistics = true + +[extract_messages] +add_comments = TRANSLATORS: +output_file = tutorial/locale/tutorial.pot +width = 80 + +[init_catalog] +domain = tutorial +input_file = tutorial/locale/tutorial.pot +output_dir = tutorial/locale + +[update_catalog] +domain = tutorial +input_file = tutorial/locale/tutorial.pot +output_dir = tutorial/locale +previous = true -- cgit v1.2.3