Merge branch 'develop'

fcurella · Aug 13, 2015 · e9dc75b · e9dc75b
2 parents a53e7b9 + e798e74
commit e9dc75b
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 0 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -30,6 +30,7 @@ before_script:
   - "flake8 --exclude=docs,south_migrations --ignore=E501,E123,E124,E126,E127,E128 --statistics .;"
 python:
   - "2.7"
+  - "3.3"
   - "3.4"
 env:
   - DJANGO="Django>=1.7,<1.8",CELERY="celery>=3.0,<4.0"

diff --git a/docs/changelog.rst b/docs/changelog.rst
@@ -2,6 +2,10 @@
 
 Changelog
 =========
+* v0.2.2
+    * Added Python 3.3 Trove classifier to `setup.py`.
+* v0.2.1
+    * Added Python 3.4 Trove classifier to `setup.py`.
 * v0.2.0
     * Added support for Python 3.4
     * Dropped support for Celery 2.x

diff --git a/setup.py b/setup.py
@@ -31,6 +31,7 @@ def read(fname):
         'License :: OSI Approved :: MIT License',
         'Operating System :: OS Independent',
         'Programming Language :: Python :: 2.7',
+        'Programming Language :: Python :: 3.3',
         'Programming Language :: Python :: 3.4',
         'Framework :: Django',
         'Topic :: Scientific/Engineering :: Information Analysis',

diff --git a/test-requirements-py3.3.txt b/test-requirements-py3.3.txt
@@ -0,0 +1 @@
+-r test-requirements.txt