diff options
| author | holger krekel <holger@merlinux.eu> | 2015-04-22 21:33:46 +0200 |
|---|---|---|
| committer | holger krekel <holger@merlinux.eu> | 2015-04-22 21:33:46 +0200 |
| commit | 9e2bf506e8e800fb203844d7173c36ca3900f4a9 (patch) | |
| tree | 4c22f4e078928f5c6bb95038b030d6a66f44b370 | |
| parent | 8f1958c015b2f414e9812803b05a020f48559337 (diff) | |
| parent | 0d360ebdc2c072665e7e22c19f9b23e119ee6ad2 (diff) | |
| download | tox-9e2bf506e8e800fb203844d7173c36ca3900f4a9.tar.gz | |
Merged in wmyll6/tox/fix-doc-env (pull request #145)
fix `docs` env
| -rw-r--r-- | doc/config-v2.txt | 4 | ||||
| -rw-r--r-- | doc/support.txt | 3 | ||||
| -rw-r--r-- | tox.ini | 2 |
3 files changed, 4 insertions, 5 deletions
diff --git a/doc/config-v2.txt b/doc/config-v2.txt index 42973c4..b621bc1 100644 --- a/doc/config-v2.txt +++ b/doc/config-v2.txt @@ -27,7 +27,7 @@ coming up with its configuration language: section for each combination. Examples of real life situations arising from this: - * http://code.larlet.fr/django-rest-framework/src/eed0f39a7e45/tox.ini + * https://github.com/tomchristie/django-rest-framework/blob/b001a146d73348af18cfc4c943d87f2f389349c9/tox.ini * https://bitbucket.org/tabo/django-treebeard/src/93b579395a9c/tox.ini @@ -216,7 +216,7 @@ Transforming the examples: django-rest ------------------------------------------------ The original `django-rest-framework tox.ini -<http://code.larlet.fr/django-rest-framework/src/eed0f39a7e45/tox.ini>`_ +<https://github.com/tomchristie/django-rest-framework/blob/b001a146d73348af18cfc4c943d87f2f389349c9/tox.ini>`_ file has 159 lines and a lot of repetition, the new one would +have 20 lines and almost no repetition:: diff --git a/doc/support.txt b/doc/support.txt index 1ece16a..29962e7 100644 --- a/doc/support.txt +++ b/doc/support.txt @@ -21,9 +21,8 @@ professional support If you are looking for on-site teaching or consulting support, contact holger at `merlinux.eu`_, an association of -experienced `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 .. _`Benjamin Peterson`: http://www.ohloh.net/accounts/gutworth .. _`Testing In Python (TIP) mailing list`: http://lists.idyll.org/listinfo/testing-in-python @@ -14,7 +14,7 @@ changedir=doc deps=sphinx {[testenv]deps} commands= - py.test -v + py.test -v \ --junitxml={envlogdir}/junit-{envname}.xml \ check_sphinx.py {posargs} |