From ddcac647ff031565fba693b3d13155a03b5cf822 Mon Sep 17 00:00:00 2001 From: Pedro Romano Date: Fri, 16 Aug 2013 10:51:14 +0100 Subject: [PATCH] Changes examples from using Flask to some other package (Bottle was chosen) as per @mpdehaan's suggestion. --- packaging/easy_install | 4 ++-- packaging/pip | 20 ++++++++++---------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/packaging/easy_install b/packaging/easy_install index b61acc8e723..02207041f51 100644 --- a/packaging/easy_install +++ b/packaging/easy_install @@ -72,8 +72,8 @@ EXAMPLES = ''' # Examples from Ansible Playbooks - easy_install: name=pip -# Install foo into the specified virtualenv. -- easy_install: name=foo virtualenv=/webapps/myapp/venv +# Install Bottle into the specified virtualenv. +- easy_install: name=bottle virtualenv=/webapps/myapp/venv ''' def _is_package_installed(module, name, easy_install): diff --git a/packaging/pip b/packaging/pip index 33d31249712..8546b0911d6 100644 --- a/packaging/pip +++ b/packaging/pip @@ -104,23 +104,23 @@ author: Matt Wright ''' EXAMPLES = ''' -# Install (flask) python package. -- pip: name=flask +# Install (Bottle) python package. +- pip: name=bottle -# Install (flask) python package on version 0.8. -- pip: name=flask version=0.8 +# Install (Bottle) python package on version 0.11. +- pip: name=bottle version=0.11 # Install (MyApp) using one of the remote protocols (bzr+,hg+,git+,svn+) or tarballs (zip, gz, bz2) (pip) supports. You do not have to supply '-e' option in extra_args. For these source names, (use_mirrors) is ignored and not applicable. - pip: name='svn+http://myrepo/svn/MyApp#egg=MyApp' -# Install (Flask) into the specified (virtualenv), inheriting none of the globally installed modules -- pip: name=flask virtualenv=/my_app/venv +# Install (Bottle) into the specified (virtualenv), inheriting none of the globally installed modules +- pip: name=bottle virtualenv=/my_app/venv -# Install (Flask) into the specified (virtualenv), inheriting globally installed modules -- pip: name=flask virtualenv=/my_app/venv virtualenv_site_packages=yes +# Install (Bottle) into the specified (virtualenv), inheriting globally installed modules +- pip: name=bottle virtualenv=/my_app/venv virtualenv_site_packages=yes -# Install (Flask) into the specified (virtualenv), using Python 2.7 -- pip: name=flask virtualenv=/my_app/venv virtualenv_command=virtualenv-2.7 +# Install (Bottle) into the specified (virtualenv), using Python 2.7 +- pip: name=bottle virtualenv=/my_app/venv virtualenv_command=virtualenv-2.7 # Install specified python requirements. - pip: requirements=/my_app/requirements.txt