Merge branch 'master' into trms

pinax · Dec 10, 2015 · 534a8e4 · 534a8e4
2 parents 4742a75 + dd5b1c6
commit 534a8e4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 9 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -2,7 +2,6 @@ language: python
 sudo: false
 python:
   - "2.7"
-  - "3.2"
   - "3.3"
   - "3.4"
   - "3.5"
@@ -13,12 +12,8 @@ env:
   - DJANGO=master
 matrix:
   exclude:
-    - python: "3.2"
-      env: DJANGO=1.9
     - python: "3.3"
       env: DJANGO=1.9
-    - python: "3.2"
-      env: DJANGO=master
     - python: "3.3"
       env: DJANGO=master
     - python: "3.5"

diff --git a/tox.ini b/tox.ini
@@ -2,20 +2,18 @@
 ignore = E265,E501
 max-line-length = 100
 max-complexity = 10
-exclude = pinax/stripe/migrations/*,docs/*
+exclude = migrations/*,docs/*
 
 [tox]
 envlist =
     py27-{1.7,1.8,1.9,master},
-    py32-{1.7,1.8},
     py33-{1.7,1.8},
     py34-{1.7,1.8,1.9,master},
     py35-{1.8,1.9,master}
 
 [testenv]
 deps =
-    py{27,33,34,35}: coverage == 4.0.2
-    py32: coverage == 3.7.1
+    coverage == 4.0.2
     flake8 == 2.5.0
     1.7: Django>=1.7,<1.8
     1.8: Django>=1.8,<1.9