From 1b529023687a9e01bf8d0e7a77c453f0ec2e78de Mon Sep 17 00:00:00 2001 From: Jacek Tomaszewski Date: Wed, 21 Sep 2016 22:14:14 +0200 Subject: [PATCH] Update version table and make it (hopefully) more readable. Add missing build to tox, by the way. --- docs/modeltranslation/installation.rst | 55 +++++++++++++------------- tox.ini | 7 ++++ 2 files changed, 35 insertions(+), 27 deletions(-) diff --git a/docs/modeltranslation/installation.rst b/docs/modeltranslation/installation.rst index 21ddae5..cec291f 100644 --- a/docs/modeltranslation/installation.rst +++ b/docs/modeltranslation/installation.rst @@ -6,33 +6,34 @@ Installation Requirements ------------ -+------------------+------------+-----------+ -| Modeltranslation | Python | Django | -+==================+============+===========+ -| >=0.9 | 3.2 - 3.4 | 1.5 - 1.8 | -| +------------+-----------+ -| | 2.7 | 1.8 | -| +------------+-----------+ -| | 2.6 - 2.7 | 1.4 - 1.6 | -+------------------+------------+-----------+ -| ==0.8 | 3.2 - 3.4 | 1.5 - 1.7 | -| +------------+-----------+ -| | 2.7 | 1.7 | -| +------------+-----------+ -| | 2.6 - 2.7 | 1.4 - 1.6 | -+------------------+------------+-----------+ -| ==0.7 | 3.2 - 3.3 | 1.5 - 1.6 | -| +------------+-----------+ -| | 2.6 - 2.7 | 1.4 - 1.6 | -+------------------+------------+-----------+ -| ==0.5, ==0.6 | 2.6 - 2.7 | 1.5 | -| +------------+-----------+ -| | 2.5 - 2.7 | 1.3 - 1.4 | -+------------------+------------+-----------+ -| ==0.4 | 2.5 - 2.7 | 1.3 - 1.4 | -+------------------+------------+-----------+ -| <=0.3 | 2.4 - 2.7 | 1.0 - 1.4 | -+------------------+------------+-----------+ +Which Modeltranslation version is required for given Django-Python combination to work? + +======= ==== ==== ==== ==== ==== ==== ==== ==== ==== ==== ==== +Python Django +------- ------------------------------------------------------ +version 1.0 1.1 1.2 1.3 1.4 1.5 1.6 1.7 1.8 1.9 1.10 +======= ==== ==== ==== ==== ==== ==== ==== ==== ==== ==== ==== +2.4 |u3| |u3| |u3| |u3| +2.5 |u3| |u3| |u3| |36| |36| +2.6 |u3| |u3| |u3| |36| |3| |5| |7| +2.7 |u3| |u3| |u3| |36| |3| |5| |7| |8| |9| |11| |12| +3.2 |7| |7| |8| |9| +3.3 |7| |7| |8| |9| +3.4 |8| |9| |11| |12| +3.5 |9| |11| |12| +======= ==== ==== ==== ==== ==== ==== ==== ==== ==== ==== ==== + +(``-X`` denotes "up to version X", whereas ``X+`` means "from version X upwards") + +.. |u3| replace:: -0.3 +.. |3| replace:: 0.3+ +.. |36| replace:: 0.3-0.6 +.. |5| replace:: 0.5+ +.. |7| replace:: 0.7+ +.. |8| replace:: 0.8+ +.. |9| replace:: 0.9+ +.. |11| replace:: 0.11+ +.. |12| replace:: 0.12+ Using Pip diff --git a/tox.ini b/tox.ini index a6bef8d..9cbb295 100644 --- a/tox.ini +++ b/tox.ini @@ -16,6 +16,7 @@ envlist = py33-1.8.X, py32-1.8.X, py27-1.8.X, + py34-1.7.X, py33-1.7.X, py32-1.7.X, py27-1.7.X, @@ -103,6 +104,12 @@ deps = Django>=1.8,<1.9 Pillow +[testenv:py34-1.7.X] +basepython = python3.4 +deps = + Django>=1.7,<1.8 + Pillow + [testenv:py33-1.7.X] basepython = python3.3 deps =