Improve testing matrices

Drop 2.6 support

.travis.yml

@@ -1,6 +1,5 @@
 language: python
 python:
-  - 2.6
   - 2.7
 env:
   global:
@@ -15,12 +14,9 @@ matrix:
       env: DJANGO=1.5 DJANGO_SETTINGS_MODULE=twitter_tag.test_settings
     - python: 3.3
       env: DJANGO=1.6 DJANGO_SETTINGS_MODULE=twitter_tag.test_settings
-  exclude:
-    - python: 2.6
-      env: DJANGO=1.6 DJANGO_SETTINGS_MODULE=twitter_tag.test_settings
 install:
   - pip install -q https://github.com/django/django/archive/${DJANGO}.zip#egg=django
-  - pip install nose==1.2.1 coveralls==dev
+  - pip install nose==1.2.1 coveralls
 script:
   - coverage run --source=twitter_tag setup.py nosetests
 branches:

README.rst

@@ -38,15 +38,11 @@ Usage
     {% endfor %}
     </ul>
 
-See how it looks like `on our site`_.
-
-.. _on our site: http://futurecolors.ru/
-
 
 Installation
 ------------
 
-This app works with python 2.6, 2.7 and 3.3, Django 1.3-1.5.
+This app works with python 2.7 and 3.3, Django 1.4-1.6.
 
 Recommended way to install is pip::
 

setup.py

@@ -5,12 +5,10 @@
 read = lambda filepath: codecs.open(filepath, 'r', 'utf-8').read()
 
 tests_require = [
-    'Django>=1.2',
     'nose==1.2.1',
     'mock==1.0.1',
     'httpretty==0.5.9',
     'sure==1.1.7',
-    'coveralls',
 ]
 
 setup(
@@ -30,17 +28,16 @@
         'six==1.2.0',
     ],
     tests_require=tests_require,
-    test_suite = "nose.collector",
+    test_suite="nose.collector",
     extras_require={'test': tests_require},
-    classifiers = [
-        'Development Status :: 4 - Beta',
+    classifiers=[
+        'Development Status :: 5 - Production/Stable',
         'Framework :: Django',
         'Intended Audience :: Developers',
         'License :: OSI Approved :: MIT License',
         'Operating System :: OS Independent',
         'Programming Language :: Python',
-        'Programming Language :: Python :: 2.6',
         'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3.3',
     ],
-)
+)

tox.ini

@@ -1,54 +1,14 @@
+[tox]
+envlist = {py27}-{1.4.X,1.5.X,1.6.X,1.7.X},{py33}-{1.5.X,1.6.X,1.7.X}
+
 [testenv]
 downloadcache = {toxworkdir}/_download/
 commands =
     {envpython} setup.py test
 setenv =
     DJANGO_SETTINGS_MODULE = twitter_tag.test_settings
-
-
-[testenv:py26-1.4.X]
-basepython = python2.6
-deps =
-    django>=1.4,<1.5
-
-
-[testenv:py27-1.4.X]
-basepython = python2.7
-deps =
-    django>=1.4,<1.5
-
-
-[testenv:py26-1.5.X]
-basepython = python2.6
-deps =
-    django==1.5
-
-
-[testenv:py27-1.5.X]
-basepython = python2.7
-deps =
-    django==1.5
-
-
-[testenv:py26-1.6.X]
-basepython = python2.6
-deps =
-    django>=1.6,<1.7
-
-
-[testenv:py27-1.6.X]
-basepython = python2.6
-deps =
-    django>=1.6,<1.7
-
-
-[testenv:py33-1.5.X]
-basepython = python3.3
-deps =
-    django>=1.5,<1.6
-
-
-[testenv:py33-1.6.X]
-basepython = python3.3
 deps =
-    django>=1.6,<1.7
+    1.4.X: django>=1.4,<1.5
+    1.5.X: django>=1.5,<1.6
+    1.6.X: django>=1.6,<1.7
+    1.7.X: django>=1.7,<1.8