Merge pull request #92 from emmanvg/master

Update Travis CI and Tox configuration

Author: gtback

.gitignore

@@ -5,6 +5,7 @@ dist/
 *.egg-info
 .settings/
 .project
+.idea
 .pydevproject
 .tox
 

.travis.yml

@@ -1,26 +1,19 @@
 language: python
 
 python:
-  - 3.5
-
-env:
-  - TOXENV=py26
-  - TOXENV=py27
-  - TOXENV=py33
-  - TOXENV=py34
-  - TOXENV=py35
-  - TOXENV=rhel6
+  - "2.6"
+  - "2.7"
+  - "3.3"
+  - "3.4"
+  - "3.5"
+  - "3.6"
 
 install:
-  - pip install -U tox
+  - pip install -U tox-travis
 
 script:
   - tox
 
-branches:
-  only:
-    - master
-
 notifications:
   email:
     - gback@mitre.org

tox.ini

@@ -1,5 +1,5 @@
 [tox]
-envlist = py26, py27, py33, py34, py35, rhel6
+envlist = py26, py27, py33, py34, py35, py36, rhel6
 
 [testenv]
 commands =
@@ -10,7 +10,6 @@ deps =
     -rrequirements.txt
 
 [testenv:rhel6]
-basepython=python2.6
 commands =
     nosetests maec
 deps =
@@ -19,3 +18,12 @@ deps =
     mixbox>=0.0.13
     python-dateutil==1.4.1
     nose
+
+[travis]
+python =
+  2.6: py26, rhel6
+  2.7: py27
+  3.3: py33
+  3.4: py34
+  3.5: py35
+  3.6: py36