summaryrefslogtreecommitdiff
path: root/doc/example/basic.txt
diff options
context:
space:
mode:
authorholger krekel <holger@merlinux.eu>2010-10-17 12:03:43 +0200
committerholger krekel <holger@merlinux.eu>2010-10-17 12:03:43 +0200
commit4d3cdec55f873e89942dbe59b9fb0618aa3bc474 (patch)
treeff2fc6a1e76e1f669b8935c5c3b35fcdfffbb631 /doc/example/basic.txt
parent4d876e495c5408ecaeab88b720fc3a28a7efdd21 (diff)
downloadtox-4d3cdec55f873e89942dbe59b9fb0618aa3bc474.tar.gz
changed/refined indexserver handling, now dependencies can be scoped, see added docs.
Diffstat (limited to 'doc/example/basic.txt')
-rw-r--r--doc/example/basic.txt24
1 files changed, 23 insertions, 1 deletions
diff --git a/doc/example/basic.txt b/doc/example/basic.txt
index f46b401..c3b4de6 100644
--- a/doc/example/basic.txt
+++ b/doc/example/basic.txt
@@ -51,13 +51,35 @@ using a different PyPI server
.. versionadded: 0.9
To install dependencies and packages from a different
-PyPI servertype::
+PyPI server type::
tox --indexserver http://pypi.testrun.org
This causes both the internal pip and easy-install steps
to use the specified server for upgrading.
+installing dependencies from multiple PyPI server
+---------------------------------------------------
+
+.. versionadded: 0.9
+
+You can instrument tox to install dependencies from
+different PyPI servers, example::
+
+ [tox]
+ indexserver =
+ DEV http://mypypiserver.org
+
+ [testenv]
+ deps =
+ docutils # comes from standard PyPI
+ DEV mypackage # will come from custom PYPI above
+
+Note that the ``--indexserver`` command line overrides
+the default index server, not the ``DEV`` one here.
+This will cause both the internal pip and easy-install steps
+to use the specified servers accordingly.
+
upgrading packages
-----------------------------------------------