[Pytest-commit] commit/tox: hpk42: Merged in wmyll6/tox/fix-doc-env (pull request #145)

[commits-noreply at bitbucket.org]

1 new commit in tox:

https://bitbucket.org/hpk42/tox/commits/f438d9422372/
Changeset:   f438d9422372
User:        hpk42
Date:        2015-04-22 19:33:46+00:00
Summary:     Merged in wmyll6/tox/fix-doc-env (pull request #145)

fix `docs` env
Affected #:  3 files

diff -r 71ea3fac1a1dc6779e34b828cda204a8875ad000 -r f438d94223729f723debb722aa082650b44f394a doc/config-v2.txt
--- a/doc/config-v2.txt
+++ b/doc/config-v2.txt
@@ -27,7 +27,7 @@
   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 @@
 ------------------------------------------------
 
 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 -r 71ea3fac1a1dc6779e34b828cda204a8875ad000 -r f438d94223729f723debb722aa082650b44f394a doc/support.txt
--- a/doc/support.txt
+++ b/doc/support.txt
@@ -21,9 +21,8 @@
 
 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

diff -r 71ea3fac1a1dc6779e34b828cda204a8875ad000 -r f438d94223729f723debb722aa082650b44f394a tox.ini
--- a/tox.ini
+++ b/tox.ini
@@ -14,7 +14,7 @@
 deps=sphinx
      {[testenv]deps}
 commands=
-    py.test -v 
+    py.test -v \
         --junitxml={envlogdir}/junit-{envname}.xml \
         check_sphinx.py {posargs}

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.