Merge pull request #43 from matagus/python-3.5-compatibility

Python 3.5 compatibility
matagus · Apr 27, 2015 · c921b55 · c921b55
2 parents 0f63175 + 95c6b79
commit c921b55
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -2,6 +2,8 @@ language: python
 
 python:
     - "2.7"
+    - "3.3"
+    - "3.4"
 
 env:
     - DJANGO="django==1.5.1 --use-mirrors"
@@ -10,11 +12,11 @@ env:
 install:
     - pip install $DJANGO
     - pip install django-tagging
-    - pip install django-pagination
+    - pip install django-pagination-py3
     - pip install feedparser
     - pip install south
     - pip install pinax-theme-bootstrap
-    - pip install BeautifulSoup
+    - pip install beautifulsoup4
     - pip install coverage==3.6
     - pip install python-coveralls==2.4.0
     - pip install factory-boy==2.5.0

diff --git a/tox.ini b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py27d15, py27d16, py33d15, py33d16
+envlist = py27d15, py27d16, py34d15, py34d16
 
 [testenv]
 skipsdist=True
@@ -32,18 +32,18 @@ deps =
 usedevelop = True
 recreate=False
 
-# Python 3.3
+# Python 3.4
 
-[testenv:py33d15]
-basepython = python3.3
+[testenv:py34d15]
+basepython = python3.4
 deps =
   Django>=1.5,<1.6
   {[testenv]deps}
 usedevelop = True
 recreate=False
 
-[testenv:py33d16]
-basepython = python3.3
+[testenv:py34d16]
+basepython = python3.4
 deps =
   Django>=1.6,<1.7
   {[testenv]deps}