summaryrefslogtreecommitdiff
path: root/doc/example
diff options
context:
space:
mode:
authorholger krekel <holger@merlinux.eu>2013-09-04 15:37:24 +0200
committerholger krekel <holger@merlinux.eu>2013-09-04 15:37:24 +0200
commit62f51be1a1b15ea71ac4359242b612e665289ca0 (patch)
tree742deec0b6818a033af72cd811bf38b21199124a /doc/example
parent44a372f509bcc2ce0a251ee2185094bebdf93360 (diff)
downloadtox-62f51be1a1b15ea71ac4359242b612e665289ca0.tar.gz
fix issue102: change to {toxinidir} when installing packages and dependencies.
this allows to use relative path like in "-rrequirements.txt".
Diffstat (limited to 'doc/example')
-rw-r--r--doc/example/basic.txt17
-rw-r--r--doc/example/devenv.txt4
2 files changed, 17 insertions, 4 deletions
diff --git a/doc/example/basic.txt b/doc/example/basic.txt
index 612146d..55b0848 100644
--- a/doc/example/basic.txt
+++ b/doc/example/basic.txt
@@ -44,7 +44,7 @@ Available "default" test environments names are::
However, you can also create your own test environment names,
see some of the examples in :doc:`examples <../examples>`.
-whitelisting a non-virtualenv commands
+whitelisting non-virtualenv commands
-----------------------------------------------
.. versionadded:: 1.5
@@ -64,6 +64,21 @@ configuration::
.. _multiindex:
+depending on requirements.txt
+-----------------------------------------------
+
+.. versionadded:: 1.6.1
+
+(experimental) If you have a ``requirements.txt`` file
+you can add it to your ``deps`` variable like this::
+
+ deps = -rrequirements.txt
+
+All installation commands are executed using ``{toxinidir}}``
+(the directory where ``tox.ini`` resides) as the current
+working directory. Therefore, the underlying ``pip`` installation
+will assume ``requirements.txt`` to exist at ``{toxinidir}/requirements.txt``.
+
using a different default PyPI url
-----------------------------------------------
diff --git a/doc/example/devenv.txt b/doc/example/devenv.txt
index 8e3f854..571f89c 100644
--- a/doc/example/devenv.txt
+++ b/doc/example/devenv.txt
@@ -57,7 +57,5 @@ Here is example configuration for that::
envdir = devenv
basepython = python2.7
usedevelop = True
- deps =
- commands =
- pip install -r requirements.txt
+ deps = -rrequirements.txt