From 12a24c0d174f8823344477ceba027b98e8a2c4a1 Mon Sep 17 00:00:00 2001 From: Joost Cassee Date: Tue, 29 Apr 2014 01:21:40 +0200 Subject: [PATCH] Small fixes to tox and docs - Remove testing environments for Django 1.2 and 1.3 - Update Django Sphinx links to 1.6 - Fix docs warning in intercom.rst --- docs/conf.py | 3 +-- docs/services/intercom.rst | 4 ++-- tox.ini | 4 ++-- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/docs/conf.py b/docs/conf.py index 85f1b2f..f46129f 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -29,14 +29,13 @@ pygments_style = 'sphinx' intersphinx_mapping = { 'http://docs.python.org/2.7': None, - 'http://docs.djangoproject.com/en/1.3': 'http://docs.djangoproject.com/en/1.5/_objects/', + 'http://docs.djangoproject.com/en/1.6': 'http://docs.djangoproject.com/en/1.6/_objects/', } # -- Options for HTML output --------------------------------------------------- html_theme = 'default' -html_static_path = ['_static'] htmlhelp_basename = 'analyticaldoc' diff --git a/docs/services/intercom.rst b/docs/services/intercom.rst index 3f80ba0..99b0ac1 100644 --- a/docs/services/intercom.rst +++ b/docs/services/intercom.rst @@ -1,6 +1,6 @@ -============================= +================================= Intercom.io -- Real-time tracking -============================= +================================= Intercom.io_ is an easy way to implement real-chat and individual support for a website diff --git a/tox.ini b/tox.ini index c4afee3..6f705c5 100644 --- a/tox.ini +++ b/tox.ini @@ -1,7 +1,7 @@ [tox] envlist = - py2.6-django1.2,py2.6-django1.3,py2.6-django1.4,py2.6-django1.5,py2.6-django1.6, - py2.7-django1.2,py2.7-django1.3,py2.7-django1.4,py2.7-django1.5,py2.7-django1.6 + py2.6-django1.4,py2.6-django1.5,py2.6-django1.6, + py2.7-django1.4,py2.7-django1.5,py2.7-django1.6 [testenv] commands = python -Wall setup.py test