summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorholger krekel <holger@merlinux.eu>2013-02-02 20:26:27 +0100
committerholger krekel <holger@merlinux.eu>2013-02-02 20:26:27 +0100
commitcd365b8c674aed8e908195c7b1e6271521ca69b0 (patch)
treef36e6b923f080825782e0d0197f5ef9a9e52806d
parent3479e83714667a72144938c3b2ae6473b46cd295 (diff)
downloadtox-cd365b8c674aed8e908195c7b1e6271521ca69b0.tar.gz
mention course in Leipzig, refine/update index and support pages
-rw-r--r--doc/index.txt16
-rw-r--r--doc/support.txt14
2 files changed, 16 insertions, 14 deletions
diff --git a/doc/index.txt b/doc/index.txt
index e3e13eb..2f75f7f 100644
--- a/doc/index.txt
+++ b/doc/index.txt
@@ -1,12 +1,14 @@
Welcome to the tox automation project
===============================================
-vision: merge packaging, testing and release
+.. note:: Upcoming: `professional testing with pytest and tox <`http://www.python-academy.com/courses/specialtopics/python_course_testing.html>`_ , 24th-26th June 2013, Leipzig.
+
+vision: standardize testing in Python
---------------------------------------------
-``tox`` aims to automate state-of-the-art packaging, testing and
-releasing of Python software right from your console *or* CI
-server, invoking your tools of choice.
+``tox`` aims to automate and standardize testing in Python. It is part
+of a larger vision of easing the packaging, testing and release process
+of Python software.
What is Tox?
--------------------
@@ -64,10 +66,10 @@ Current features
* supports :ref:`using different / multiple PyPI index servers <multiindex>`
-* uses pip_ (for Python2 environments) and distribute_ (for all environments) by default
+* uses pip_ and distribute_ by default.
-* **cross-Python compatible**: Python-2.5 up to Python-3.2, Jython and
- Python3 support as well as for pypy_
+* **cross-Python compatible**: Python-2.5 up to Python-3.3, Jython and pypy_
+ support.
* **cross-platform**: Windows and Unix style environments
diff --git a/doc/support.txt b/doc/support.txt
index 30b7b36..fc18629 100644
--- a/doc/support.txt
+++ b/doc/support.txt
@@ -4,24 +4,24 @@
support and contact channels
=====================================
-You are welcome to:
+Getting in contact:
* join the `Testing In Python (TIP) mailing list`_ for general and tox/test-tool
interaction questions.
* file a `report on the issue tracker`_
-* join `tox-commit`_ to be notified of source changes
* hang out on the irc.freenode.net #pylib channel
* `clone the mercurial repository`_ and submit patches
-* follow the `tetamap blog`_ or `holger's twitter presence`_ or
- if all else fails contact holger krekel at gmail.
+* the `tetamap blog`_, `holger's twitter presence`_ or
+ for private inquiries holger krekel at gmail.
professional support
----------------------------
-If you are looking for on-site teaching and consulting report to setup
-and use state-of-the-start testing infrastructure with Python,
+.. note:: Upcoming: `professional testing with pytest and tox <`http://www.python-academy.com/courses/specialtopics/python_course_testing.html>`_ , 24th-26th June 2013, Leipzig.
+
+If you are looking for on-site teaching or consulting support,
contact holger at `merlinux.eu`_, an association of
-experienced and `well-known Python developers`_.
+`experienced well-known Python developers`_.
.. _`well-known Python developers`: http://merlinux.eu/people.txt
.. _`Maciej Fijalkowski`: http://www.ohloh.net/accounts/fijal