[Pytest-commit] commit/tox: 2 new changesets

[commits-noreply at bitbucket.org]

2 new commits in tox:

https://bitbucket.org/hpk42/tox/commits/588ddd566df5/
Changeset:   588ddd566df5
Branch:      generative-example
User:        suor
Date:        2015-02-23 13:15:37+00:00
Summary:     Add generative config example
Affected #:  2 files

diff -r 0a85dfb460906c3434651b594b591d0426530744 -r 588ddd566df53f96d65afb9c20c75fb2dcf96dc6 doc/config.txt
--- a/doc/config.txt
+++ b/doc/config.txt
@@ -261,7 +261,7 @@
     Do not install the current package. This can be used when you need the
     virtualenv management but do not want to install the current package
     into that environment.
-    
+
     **default**: ``False``
 
 
@@ -449,6 +449,8 @@
 Let's go through this step by step.
 
 
+.. _generative-envlist:
+
 Generative envlist
 +++++++++++++++++++++++
 
@@ -482,6 +484,8 @@
         flake
 
 
+.. _factors:
+
 Factors and factor-conditional settings
 ++++++++++++++++++++++++++++++++++++++++
 

diff -r 0a85dfb460906c3434651b594b591d0426530744 -r 588ddd566df53f96d65afb9c20c75fb2dcf96dc6 doc/example/basic.txt
--- a/doc/example/basic.txt
+++ b/doc/example/basic.txt
@@ -74,7 +74,7 @@
 (experimental) If you have a ``requirements.txt`` file
 you can add it to your ``deps`` variable like this::
 
-    deps = -rrequirements.txt 
+    deps = -rrequirements.txt
 
 All installation commands are executed using ``{toxinidir}``
 (the directory where ``tox.ini`` resides) as the current
@@ -260,3 +260,20 @@
 
 By using the ``-`` prefix, similar to a ``make`` recipe line, you can ignore
 the exit code for that command.
+
+Compressing dependency matrix
+-----------------------------
+
+If you have a large matrix of dependencies, python versions and/or environments you can
+use :ref:`generative-envlist` and :ref:`conditional settings <factors>` to express that in a concise form::
+
+    [tox]
+    envlist = py{26,27,33}-django{15,16}-{sqlite,mysql}
+
+    [testenv]
+    deps =
+        django15: Django>=1.5,<1.6
+        django16: Django>=1.6,<1.7
+        py33-mysql: PyMySQL     ; use if both py33 and mysql are in an env name
+        py26,py27: urllib3      ; use if any of py26 or py27 are in an env name
+        py{26,27}-sqlite: mock  ; mocking sqlite in python 2.x


https://bitbucket.org/hpk42/tox/commits/a2278870aa11/
Changeset:   a2278870aa11
User:        hpk42
Date:        2015-02-23 14:06:50+00:00
Summary:     Merged in suor/tox/generative-example (pull request #135)

Add generative config example
Affected #:  2 files

diff -r 0a85dfb460906c3434651b594b591d0426530744 -r a2278870aa11f63112ec06f3adc9e0bea36b9a90 doc/config.txt
--- a/doc/config.txt
+++ b/doc/config.txt
@@ -261,7 +261,7 @@
     Do not install the current package. This can be used when you need the
     virtualenv management but do not want to install the current package
     into that environment.
-    
+
     **default**: ``False``
 
 
@@ -449,6 +449,8 @@
 Let's go through this step by step.
 
 
+.. _generative-envlist:
+
 Generative envlist
 +++++++++++++++++++++++
 
@@ -482,6 +484,8 @@
         flake
 
 
+.. _factors:
+
 Factors and factor-conditional settings
 ++++++++++++++++++++++++++++++++++++++++
 

diff -r 0a85dfb460906c3434651b594b591d0426530744 -r a2278870aa11f63112ec06f3adc9e0bea36b9a90 doc/example/basic.txt
--- a/doc/example/basic.txt
+++ b/doc/example/basic.txt
@@ -74,7 +74,7 @@
 (experimental) If you have a ``requirements.txt`` file
 you can add it to your ``deps`` variable like this::
 
-    deps = -rrequirements.txt 
+    deps = -rrequirements.txt
 
 All installation commands are executed using ``{toxinidir}``
 (the directory where ``tox.ini`` resides) as the current
@@ -260,3 +260,20 @@
 
 By using the ``-`` prefix, similar to a ``make`` recipe line, you can ignore
 the exit code for that command.
+
+Compressing dependency matrix
+-----------------------------
+
+If you have a large matrix of dependencies, python versions and/or environments you can
+use :ref:`generative-envlist` and :ref:`conditional settings <factors>` to express that in a concise form::
+
+    [tox]
+    envlist = py{26,27,33}-django{15,16}-{sqlite,mysql}
+
+    [testenv]
+    deps =
+        django15: Django>=1.5,<1.6
+        django16: Django>=1.6,<1.7
+        py33-mysql: PyMySQL     ; use if both py33 and mysql are in an env name
+        py26,py27: urllib3      ; use if any of py26 or py27 are in an env name
+        py{26,27}-sqlite: mock  ; mocking sqlite in python 2.x

Repository URL: https://bitbucket.org/hpk42/tox/

--

This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.